Commit 0b34cac1 authored by Drew Blessing's avatar Drew Blessing

Show last push widget in upstream after push to fork

parent 71448673
...@@ -28,6 +28,7 @@ v 8.10.0 (unreleased) ...@@ -28,6 +28,7 @@ v 8.10.0 (unreleased)
- PipelinesFinder uses git cache data - PipelinesFinder uses git cache data
- Throttle the update of `project.pushes_since_gc` to 1 minute. - Throttle the update of `project.pushes_since_gc` to 1 minute.
- Check for conflicts with existing Project's wiki path when creating a new project. - Check for conflicts with existing Project's wiki path when creating a new project.
- Show last push widget in upstream after push to fork
- Don't instantiate a git tree on Projects show default view - Don't instantiate a git tree on Projects show default view
- Bump Rinku to 2.0.0 - Bump Rinku to 2.0.0
- Remove unused front-end variable -> default_issues_tracker - Remove unused front-end variable -> default_issues_tracker
......
...@@ -293,7 +293,11 @@ module ProjectsHelper ...@@ -293,7 +293,11 @@ module ProjectsHelper
end end
def last_push_event def last_push_event
if current_user return unless current_user
if fork = current_user.fork_of(@project)
current_user.recent_push(fork.id)
else
current_user.recent_push(@project.id) current_user.recent_push(@project.id)
end end
end end
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
%span You pushed to %span You pushed to
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
%strong= event.ref_name %strong= event.ref_name
branch - if @project && event.project != @project
%span at
%strong= link_to_project event.project
#{time_ago_with_tooltip(event.created_at)} #{time_ago_with_tooltip(event.created_at)}
.pull-right .pull-right
......
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