Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0b34cac1
Commit
0b34cac1
authored
Jun 23, 2016
by
Drew Blessing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show last push widget in upstream after push to fork
parent
71448673
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
CHANGELOG
CHANGELOG
+1
-0
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+5
-1
app/views/projects/_last_push.html.haml
app/views/projects/_last_push.html.haml
+3
-1
No files found.
CHANGELOG
View file @
0b34cac1
...
@@ -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
...
...
app/helpers/projects_helper.rb
View file @
0b34cac1
...
@@ -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
...
...
app/views/projects/_last_push.html.haml
View file @
0b34cac1
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment