diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-16 15:07:35 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-16 15:07:35 +0300 |
| commit | be353219d1eec05a7b04e9c2e94f61573889549d (patch) | |
| tree | e5f454922a4cab9191e8200fc8781c6aef220917 /app/views | |
| parent | 7a9c32648ef6d312f869d707b183e51db1308cad (diff) | |
| parent | ca4a59e3df2a8cd64c4055528dde9cb8dd58a369 (diff) | |
Merge branch 'issue_41460' into 'master'
Fix error on changes tab when merge request cannot be created
Closes #41460
See merge request gitlab-org/gitlab-ce!16409
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/creations/_diffs.html.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/creations/_diffs.html.haml b/app/views/projects/merge_requests/creations/_diffs.html.haml index 627fc4e9671..5b70e894b39 100644 --- a/app/views/projects/merge_requests/creations/_diffs.html.haml +++ b/app/views/projects/merge_requests/creations/_diffs.html.haml @@ -1 +1,5 @@ -= render "projects/diffs/diffs", diffs: @diffs, environment: @environment, show_whitespace_toggle: false +- if @merge_request.can_be_created + = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, show_whitespace_toggle: false +- else + .nothing-here-block + This merge request cannot be created. |