diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-03-06 11:25:01 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-03-06 11:25:01 -0700 |
| commit | 6c9262e2666dd6e56b7b34f759104f3b030c970e (patch) | |
| tree | 40493b9012da65bbc1792f37c0f628987c37366c /app/views/projects | |
| parent | 812acfc47f8555e5ecf513f9872fed12b235a2e4 (diff) | |
| download | gitlab-ce-6c9262e2666dd6e56b7b34f759104f3b030c970e.tar.gz | |
structure html to handle single or double merge states with new style changes
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_merged.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml index be62842fecd..adc3bbc37f3 100644 --- a/app/views/projects/merge_requests/widget/_merged.html.haml +++ b/app/views/projects/merge_requests/widget/_merged.html.haml @@ -49,4 +49,4 @@ %span The changes were merged into #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}. - = render 'projects/merge_requests/widget/merged_buttons' + = render 'projects/merge_requests/widget/merged_buttons' diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml index e897a5a8581..6f50c517a6c 100644 --- a/app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml +++ b/app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml @@ -9,7 +9,7 @@ %li %span = succeed '.' do - The changes will be merged into <b>#{@merge_request.target_branch}</b> + The changes will be merged into #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}. - if @merge_request.remove_source_branch? %li %span |