Skip to content
Snippets Groups Projects
Unverified Commit f0e1da04 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Show last push widget on several project pages

parent a0b9fe12
No related branches found
No related tags found
1 merge request!946Last push widget
Loading
@@ -81,7 +81,6 @@ class ProjectsController < ApplicationController
Loading
@@ -81,7 +81,6 @@ class ProjectsController < ApplicationController
if @project.empty_repo? if @project.empty_repo?
render 'projects/empty' render 'projects/empty'
else else
@last_push = current_user.recent_push(@project.id) if current_user
render :show render :show
end end
else else
Loading
Loading
Loading
@@ -266,4 +266,10 @@ module ProjectsHelper
Loading
@@ -266,4 +266,10 @@ module ProjectsHelper
   
namespace_project_new_blob_path(@project.namespace, @project, tree_join(ref), file_name: 'README.md') namespace_project_new_blob_path(@project.namespace, @project, tree_join(ref), file_name: 'README.md')
end end
def last_push_event
if current_user
current_user.recent_push(@project.id)
end
end
end end
- if event = last_push_event
- if show_last_push_widget?(event)
.hidden-xs.center
.slead
%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
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
Create Merge Request
%hr
= render 'projects/last_push'
.hidden-xs .hidden-xs
= render "events/event_last_push", event: @last_push
- if current_user - if current_user
%ul.nav.nav-pills.event_filter.pull-right %ul.nav.nav-pills.event_filter.pull-right
%li %li
Loading
Loading
- page_title @blob.path, @ref - page_title @blob.path, @ref
= render 'projects/last_push'
%div.tree-ref-holder %div.tree-ref-holder
= render 'shared/ref_switcher', destination: 'blob', path: @path = render 'shared/ref_switcher', destination: 'blob', path: @path
   
Loading
Loading
- page_title "Merge Requests" - page_title "Merge Requests"
= render 'projects/last_push'
.append-bottom-10 .append-bottom-10
.pull-right .pull-right
= render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project) = render 'shared/issuable/search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
Loading
Loading
Loading
@@ -6,6 +6,7 @@
Loading
@@ -6,6 +6,7 @@
= render 'shared/no_ssh' = render 'shared/no_ssh'
= render 'shared/no_password' = render 'shared/no_password'
   
= render 'projects/last_push'
= render "home_panel" = render "home_panel"
   
.project-stats .project-stats
Loading
Loading
Loading
@@ -3,6 +3,8 @@
Loading
@@ -3,6 +3,8 @@
- if current_user - if current_user
= auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits") = auto_discovery_link_tag(:atom, namespace_project_commits_url(@project.namespace, @project, @ref, format: :atom, private_token: current_user.private_token), title: "#{@project.name}:#{@ref} commits")
   
= render 'projects/last_push'
.tree-ref-holder .tree-ref-holder
= render 'shared/ref_switcher', destination: 'tree', path: @path = render 'shared/ref_switcher', destination: 'tree', path: @path
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment