Commit be12ee33 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 8fa80713 dc65a779
%div{ class: container_class } %div{ class: container_class }
.nav-block.d-none.d-sm-block.activities .nav-block.d-none.d-sm-flex.activities
= render 'shared/event_filter' = render 'shared/event_filter'
.controls .controls
= link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn d-none d-sm-inline-block has-tooltip' do = link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn d-none d-sm-inline-block has-tooltip' do
......
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