summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2016-06-23 09:36:24 -0500
committerDrew Blessing <drew@gitlab.com>2016-07-06 12:58:57 -0500
commit0b34cac1c5f0115b7ea6ed0e1e08b57ee22671cd (patch)
tree994799b4a45124cdb978ee09cb754cf29e50cc8a /app/helpers
parent71448673264efc8c6e74267295eff81331fd7f0e (diff)
downloadgitlab-ce-0b34cac1c5f0115b7ea6ed0e1e08b57ee22671cd.tar.gz
Show last push widget in upstream after push to fork
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/projects_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 88787576dd3..3bbbb26cff2 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -293,7 +293,11 @@ module ProjectsHelper
end
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)
end
end