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
fa079e38
Commit
fa079e38
authored
Jul 04, 2016
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide namespace and project name on project activity page (!5068)
parent
7458892c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
20 deletions
+27
-20
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+8
-0
app/views/events/_event_scope.html.haml
app/views/events/_event_scope.html.haml
+7
-0
app/views/events/event/_common.html.haml
app/views/events/event/_common.html.haml
+2
-7
app/views/events/event/_created_project.html.haml
app/views/events/event/_created_project.html.haml
+1
-1
app/views/events/event/_note.html.haml
app/views/events/event/_note.html.haml
+3
-8
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+3
-3
app/views/projects/_activity.html.haml
app/views/projects/_activity.html.haml
+2
-1
No files found.
CHANGELOG
View file @
fa079e38
...
...
@@ -61,6 +61,7 @@ v 8.10.0 (unreleased)
- ObjectRenderer retrieve renderer content using Rails.cache.read_multi
- Better caching of git calls on ProjectsController#show.
- Avoid to retrieve MR closes_issues as much as possible.
- Hide project name in project activities !5068 (winniehell)
- Add API endpoint for a group issues !4520 (mahcsig)
- Add Bugzilla integration !4930 (iamtjg)
- Instrument Rinku usage
...
...
app/assets/stylesheets/pages/events.scss
View file @
fa079e38
...
...
@@ -176,3 +176,11 @@
}
}
}
// hide event scope (namespace + project) where it is not necessary
.project-activity
{
.event-scope
{
display
:
none
;
}
}
app/views/events/_event_scope.html.haml
0 → 100644
View file @
fa079e38
%span
.event-scope
=
event_preposition
(
event
)
-
if
event
.
project
=
link_to_project
event
.
project
-
else
=
event
.
project_name
app/views/events/event/_common.html.haml
View file @
fa079e38
.event-title
%span
.author_name
=
link_to_author
event
%span
.event_label
{
class:
event
.
action_name
}
%span
{
class:
event
.
action_name
}
-
if
event
.
target
=
event
.
action_name
%strong
...
...
@@ -10,12 +10,7 @@
-
else
=
event_action_name
(
event
)
=
event_preposition
(
event
)
-
if
event
.
project
=
link_to_project
event
.
project
-
else
=
event
.
project_name
=
render
"events/event_scope"
,
event:
event
-
if
event
.
target
.
respond_to?
(
:title
)
.event-body
...
...
app/views/events/event/_created_project.html.haml
View file @
fa079e38
.event-title
%span
.author_name
=
link_to_author
event
%span
.event_label
{
class:
event
.
action_name
}
%span
{
class:
event
.
action_name
}
=
event_action_name
(
event
)
-
if
event
.
project
...
...
app/views/events/event/_note.html.haml
View file @
fa079e38
.event-title
%span
.author_name
=
link_to_author
event
%span
.event_label
=
event
.
action_name
=
event_note_title_html
(
event
)
at
=
event
.
action_name
=
event_note_title_html
(
event
)
-
if
event
.
project
=
link_to_project
event
.
project
-
else
=
event
.
project_name
=
render
"events/event_scope"
,
event:
event
.event-body
.event-note
...
...
app/views/events/event/_push.html.haml
View file @
fa079e38
...
...
@@ -2,14 +2,14 @@
.event-title
%span
.author_name
=
link_to_author
event
%span
.
event_label.
pushed
#{
event
.
action_name
}
#{
event
.
ref_type
}
%span
.pushed
#{
event
.
action_name
}
#{
event
.
ref_type
}
-
if
event
.
rm_ref?
%strong
=
event
.
ref_name
-
else
%strong
=
link_to
event
.
ref_name
,
namespace_project_commits_path
(
project
.
namespace
,
project
,
event
.
ref_name
),
title:
h
(
event
.
target_title
)
at
=
link_to_project
projec
t
=
render
"events/event_scope"
,
event:
even
t
-
if
event
.
push_with_commits?
.event-body
...
...
app/views/projects/_activity.html.haml
View file @
fa079e38
...
...
@@ -5,7 +5,8 @@
%i
.fa.fa-rss
=
render
'shared/event_filter'
.content_list
{
:"data-href"
=>
activity_project_path
(
@project
)}
.content_list.project-activity
{
:"data-href"
=>
activity_project_path
(
@project
)}
=
spinner
:javascript
...
...
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