diff options
| author | Felipe Artur <felipefac@gmail.com> | 2018-01-11 18:18:01 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-01-15 11:53:40 -0200 |
| commit | ca4a59e3df2a8cd64c4055528dde9cb8dd58a369 (patch) | |
| tree | ed3ea6228c8bf17cf1197dedba31feb3dcd7c849 /app/views/projects/merge_requests | |
| parent | 34760245bcb4156e21ca463b82b1fab84508b842 (diff) | |
| download | gitlab-ce-ca4a59e3df2a8cd64c4055528dde9cb8dd58a369.tar.gz | |
Fix error on changes tab when merge request cannot be createdissue_41460
Diffstat (limited to 'app/views/projects/merge_requests')
| -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. |