Commit 36f47103 authored by Clement Ho's avatar Clement Ho

Merge branch 'fix/last-push-event-widget-layout' into 'master'

Last push event widget width for fixed layout #40268

See merge request gitlab-org/gitlab-ce!15862
parents 82e31ee4 d4e2805e
- event = last_push_event - event = last_push_event
- if event && show_last_push_widget?(event) - if event && show_last_push_widget?(event)
.row-content-block.top-block.hidden-xs.white %div{ class: container_class }
.event-last-push .row-content-block.top-block.hidden-xs.white
.event-last-push-text .event-last-push
%span= s_("LastPushEvent|You pushed to") .event-last-push-text
%strong %span= s_("LastPushEvent|You pushed to")
= link_to event.ref_name, project_commits_path(event.project, event.ref_name), class: 'ref-name' %strong
= link_to event.ref_name, project_commits_path(event.project, event.ref_name), class: 'ref-name'
- if event.project != @project - if event.project != @project
%span= s_("LastPushEvent|at") %span= s_("LastPushEvent|at")
%strong= link_to_project event.project %strong= link_to_project event.project
#{time_ago_with_tooltip(event.created_at)} #{time_ago_with_tooltip(event.created_at)}
.pull-right .pull-right
= link_to new_mr_path_from_push_event(event), title: _("New merge request"), class: "btn btn-info btn-sm" do = link_to new_mr_path_from_push_event(event), title: _("New merge request"), class: "btn btn-info btn-sm" do
#{ _('Create merge request') } #{ _('Create merge request') }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits") = auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
= render 'projects/last_push'
%div{ class: [(container_class), ("limit-container-width" unless fluid_layout)] } %div{ class: [(container_class), ("limit-container-width" unless fluid_layout)] }
= render 'projects/last_push'
= render 'projects/files', commit: @last_commit, project: @project, ref: @ref, content_url: project_tree_path(@project, @id) = render 'projects/files', commit: @last_commit, project: @project, ref: @ref, content_url: project_tree_path(@project, @id)
---
title: Last push event widget width for fixed layout
merge_request: 15862
author: George Tsiolis
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment