diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-06-02 17:00:42 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-06-02 17:00:42 +0100 |
| commit | 4f726683cb59da54f47302880d5c0c447638402a (patch) | |
| tree | 8b53be921067fea2c4b92886de27aaff14202a0a /app | |
| parent | 04fdf4b9a926129d63d0483ad8cd7e748f3a4e07 (diff) | |
| download | gitlab-ce-4f726683cb59da54f47302880d5c0c447638402a.tar.gz | |
fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-api
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml b/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml index a78583b7c61..499624f8dd8 100644 --- a/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml +++ b/app/views/projects/merge_requests/widget/open/_sha_mismatch.html.haml @@ -1,6 +1,6 @@ %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. |