diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2019-01-21 21:01:08 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-05 21:25:46 +0300 |
| commit | c64e61fa574ccfbf2f3a4443b2e095da9c44c5a3 (patch) | |
| tree | fa07c983c97e87eca495c393753a1fb3dc9cc012 /app | |
| parent | 6e7c13a8070dc9cdf7699cdd9de0e1886ef33f3f (diff) | |
Merge branch 'sh-fix-issue-56225' into 'master'
Fix excessive blank space in project activity view
Closes #56225
See merge request gitlab-org/gitlab-ce!24510
(cherry picked from commit dc65a77992f7e965fa4cd843a21eaa59b7a7e6c1)
7ea53e38 Fix excessive blank space in project activity view
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/_activity.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index 31f1cf560e2..12da62f4c64 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -1,5 +1,5 @@ %div{ class: container_class } - .nav-block.d-none.d-sm-block.activities + .nav-block.d-none.d-sm-flex.activities = render 'shared/event_filter' .controls = link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn d-none d-sm-inline-block has-tooltip' do |