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
fda84405
Commit
fda84405
authored
Jan 31, 2021
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab master
parents
b9ffad08
87abe64d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
12 deletions
+16
-12
app/views/projects/_activity.html.haml
app/views/projects/_activity.html.haml
+11
-12
changelogs/unreleased/yo-remove-activity-container.yml
changelogs/unreleased/yo-remove-activity-container.yml
+5
-0
No files found.
app/views/projects/_activity.html.haml
View file @
fda84405
-
is_project_overview
=
local_assigns
.
fetch
(
:is_project_overview
,
false
)
%div
{
class:
container_class
}
.nav-block.d-none.d-sm-flex.activities.gl-static
.nav-block.d-none.d-sm-flex.activities.gl-static
=
render
'shared/event_filter'
.controls.gl-display-flex
=
link_to
project_path
(
@project
,
rss_url_options
),
title:
s_
(
"ProjectActivityRSS|Subscribe"
),
class:
'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip'
do
...
...
@@ -10,6 +9,6 @@
.project-clone-holder.d-none.d-md-inline-flex.gl-ml-2
=
render
"projects/buttons/clone"
,
dropdown_class:
'dropdown-menu-right'
.content_list.project-activity
{
:"data-href"
=>
activity_project_path
(
@project
)
}
.loading
.content_list.project-activity
{
:"data-href"
=>
activity_project_path
(
@project
)
}
.loading
.spinner.spinner-md
changelogs/unreleased/yo-remove-activity-container.yml
0 → 100644
View file @
fda84405
---
title
:
Remove container_class in project activity which removes extra padding
merge_request
:
51878
author
:
Yogi (@yo)
type
:
fixed
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