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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
72b090b8
Commit
72b090b8
authored
Apr 21, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move activity feed buttons out of event_filter into actual show views.
parent
cba86eed
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
14 deletions
+20
-14
app/views/dashboard/_activities.html.haml
app/views/dashboard/_activities.html.haml
+9
-0
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+10
-0
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-0
app/views/shared/_event_filter.html.haml
app/views/shared/_event_filter.html.haml
+0
-14
No files found.
app/views/dashboard/_activities.html.haml
View file @
72b090b8
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
-
if
current_user
%ul
.nav.nav-pills.event_filter.pull-right
%li
.pull-right
=
link_to
dashboard_path
(
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'rss-btn'
do
%i
.fa.fa-rss
News Feed
=
render
'shared/event_filter'
=
render
'shared/event_filter'
%hr
.content_list
.content_list
=
spinner
=
spinner
app/views/groups/show.html.haml
View file @
72b090b8
...
@@ -17,7 +17,17 @@
...
@@ -17,7 +17,17 @@
%section
.activities.col-md-8
%section
.activities.col-md-8
-
if
current_user
-
if
current_user
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
-
if
current_user
%ul
.nav.nav-pills.event_filter.pull-right
%li
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'rss-btn'
do
%i
.fa.fa-rss
News Feed
=
render
'shared/event_filter'
=
render
'shared/event_filter'
%hr
.content_list
.content_list
=
spinner
=
spinner
%aside
.side.col-md-4
%aside
.side.col-md-4
...
...
app/views/projects/show.html.haml
View file @
72b090b8
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
%section
.col-md-9
%section
.col-md-9
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
=
render
'shared/event_filter'
=
render
'shared/event_filter'
%hr
.content_list
.content_list
=
spinner
=
spinner
%aside
.col-md-3.project-side
%aside
.col-md-3.project-side
...
...
app/views/shared/_event_filter.html.haml
View file @
72b090b8
...
@@ -3,17 +3,3 @@
...
@@ -3,17 +3,3 @@
=
event_filter_link
EventFilter
.
merged
,
'Merge events'
=
event_filter_link
EventFilter
.
merged
,
'Merge events'
=
event_filter_link
EventFilter
.
comments
,
'Comments'
=
event_filter_link
EventFilter
.
comments
,
'Comments'
=
event_filter_link
EventFilter
.
team
,
'Team'
=
event_filter_link
EventFilter
.
team
,
'Team'
-
if
current_user
-
if
current_controller?
(
:dashboard
)
%li
.pull-right
=
link_to
dashboard_path
(
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'rss-btn'
do
%i
.fa.fa-rss
News Feed
-
if
current_controller?
(
:groups
)
%li
.pull-right
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'rss-btn'
do
%i
.fa.fa-rss
News Feed
%hr
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