diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-04-02 15:56:40 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-04-02 15:56:40 +0300 |
| commit | 4b9dbec33ce446362d617f481b35628890763bd7 (patch) | |
| tree | 9dceae8f3b1a4526c5a20ad23fa0df1874cab90c /app/views | |
| parent | 784b1756020ba564b45cb539a538f79c138f92dd (diff) | |
| parent | 69b65a6b745e74bba290787420a0017395fd7c25 (diff) | |
Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'
Jarv/dev to gitlab 2019 04 02
Closes #2810
See merge request gitlab-org/gitlab-ce!26846
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_submit_form.html.haml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 00fbfd80ce5..f8969fbb5a2 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -80,8 +80,9 @@ #merge-requests{ data: { url: referenced_merge_requests_project_issue_path(@project, @issue) } } // This element is filled in using JavaScript. - #related-branches{ data: { url: related_branches_project_issue_path(@project, @issue) } } - // This element is filled in using JavaScript. + - if can?(current_user, :download_code, @project) + #related-branches{ data: { url: related_branches_project_issue_path(@project, @issue) } } + // This element is filled in using JavaScript. .content-block.emoji-block.emoji-block-sticky .row diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml index 8181267184a..55c89f137c5 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -6,7 +6,7 @@ .form-group.row .col-md-4 %h4= _('Resolve conflicts on source branch') - .resolve-info + .resolve-info{ "v-pre": true } = translation.html_safe .col-md-8 %label.label-bold{ "for" => "commit-message" } |