diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-04 02:52:21 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-04 03:02:46 +0300 |
| commit | b9e9b11b7d7a77eff6be4171e3390033881bb80e (patch) | |
| tree | 74a1131318cb37d09f637bbc2fb4330b16b01408 /app/views/projects/merge_requests | |
| parent | 578b2b2fc6e1dd4f1cef02ce96ef71efd0d0e365 (diff) | |
Improve CSS for treeview with pipelines to make it responsible
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_merged.html.haml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml index ad457cb2717..be62842fecd 100644 --- a/app/views/projects/merge_requests/widget/_merged.html.haml +++ b/app/views/projects/merge_requests/widget/_merged.html.haml @@ -11,12 +11,10 @@ %ul %li %span - %p 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"}. %li %span - %p The source branch has been removed. = render 'projects/merge_requests/widget/merged_buttons' - elsif @merge_request.can_remove_source_branch?(current_user) @@ -24,37 +22,31 @@ %ul %li %span - %p 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"}. %li %span - %p You can remove the source branch now. = render 'projects/merge_requests/widget/merged_buttons', source_branch_exists: true .remove_source_branch_widget.failed.remove-message-pipes.hide %ul %li %span - %p Failed to remove source branch '#{@merge_request.source_branch}'. .remove_source_branch_in_progress.remove-message-pipes.hide %ul %li %span - %p = icon('spinner spin') Removing source branch '#{@merge_request.source_branch}'. %li %span - %p Please wait, this page will be automatically reloaded. - else .remove-message-pipes %ul %li %span - %p 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' |