fixup! Don't allow merges with new commits

4f726683 · Sean McGivern · 04fdf4b9 · 4f726683
Commit 4f726683 authored Jun 02, 2016 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

_sha_mismatch.html.haml ...ojects/merge_requests/widget/open/_sha_mismatch.html.haml +2 -2

No files found.
--- a/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml
 %h4
  = icon("exclamation-triangle")
-  This merge request has new commits since the page was loaded.
+  This merge request has received new commits since the page was loaded.

 %p
-  Please review the new commits before merging.
+  Please reload the page to review the new commits before merging.