diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-16 20:58:57 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-17 01:15:58 +0300 |
| commit | 4856d0af0fb1ea044dda96f4619b7d3953a7bd75 (patch) | |
| tree | 98f980d48af1fe66d4fd0c2ede0111d173379b18 /app/views/projects | |
| parent | 90765f973e817f2a464ed7d94f41c6b273ee76f3 (diff) | |
Merge branch 'push-event-banner-container' into 'master'
Fixed last push event banner not being in container
## What does this MR do?
Adds the last push event content into a container with the correct class.
## What are the relevant issue numbers?
Closes #18567
## Screenshots (if relevant)
See merge request !4644
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/_last_push.html.haml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/views/projects/_last_push.html.haml b/app/views/projects/_last_push.html.haml index 7c2b8d01508..e0ca2a3109c 100644 --- a/app/views/projects/_last_push.html.haml +++ b/app/views/projects/_last_push.html.haml @@ -1,15 +1,15 @@ - if event = last_push_event - if show_last_push_widget?(event) - .row-content-block.top-block.clear-block.hidden-xs - .event-last-push - .event-last-push-text - %span You pushed to - = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do - %strong= event.ref_name - branch - #{time_ago_with_tooltip(event.created_at)} + %div{ class: (container_class) } + .event-last-push + .event-last-push-text + %span You pushed to + = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do + %strong= event.ref_name + branch + #{time_ago_with_tooltip(event.created_at)} - .pull-right - = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do - Create Merge Request + .pull-right + = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do + Create Merge Request |