diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-11 19:18:28 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:41 +0300 |
| commit | d438230a24712873204a2d6b334ae53e6e83f66e (patch) | |
| tree | 3941034bb2dd3a5127f98275f340f5897d3b023b /app/views/projects/merge_requests/widget/open | |
| parent | 1fbd6a967c1ada9f1301c9d8106de5773d060682 (diff) | |
| download | gitlab-ce-d438230a24712873204a2d6b334ae53e6e83f66e.tar.gz | |
Make resolve these conflicts text a link to conflicts tab.
Diffstat (limited to 'app/views/projects/merge_requests/widget/open')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index f000cc38a65..6bdbbb94f09 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -3,7 +3,10 @@ This merge request contains merge conflicts %p - Please resolve these conflicts or + Please + = link_to conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) do + resolve these conflicts + or - if @merge_request.can_be_merged_via_command_line_by?(current_user) #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}. - else |