Commit 87abe64d authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'yo-remove-activity-container' into 'master'

Remove container_class in project activity which removes extra padding

See merge request gitlab-org/gitlab!51878
parents 349c01ca 5327b27d
- is_project_overview = local_assigns.fetch(:is_project_overview, false) - 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'
= render 'shared/event_filter' .controls.gl-display-flex
.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
= 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 = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon')
= sprite_icon('rss', css_class: 'qa-rss-icon gl-icon') - if is_project_overview && can?(current_user, :download_code, @project)
- if is_project_overview && can?(current_user, :download_code, @project) .project-clone-holder.d-none.d-md-inline-flex.gl-ml-2
.project-clone-holder.d-none.d-md-inline-flex.gl-ml-2 = render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right'
= render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right'
.content_list.project-activity{ :"data-href" => activity_project_path(@project) } .content_list.project-activity{ :"data-href" => activity_project_path(@project) }
.loading .loading
.spinner.spinner-md .spinner.spinner-md
---
title: Remove container_class in project activity which removes extra padding
merge_request: 51878
author: Yogi (@yo)
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment