diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-05 07:39:59 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-05 07:39:59 +0000 |
| commit | 809a50fcbf5ecfbf5ec02671f1ca2710a96f58d3 (patch) | |
| tree | 0b77ad7a705f6477b03d0f83634a73e3cf36f7d1 /app/views/projects/issues/_nav_btns.html.haml | |
| parent | 114c26ccf0f10788271c6108774e72809a7f93e1 (diff) | |
| parent | 04236363bce399fbde36f396fdcf51d61735e1b0 (diff) | |
| download | gitlab-ce-backstage/gb/use-persisted-stages-to-improve-pipelines-table.tar.gz | |
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'backstage/gb/use-persisted-stages-to-improve-pipelines-table
Conflicts:
app/models/ci/pipeline.rb
Diffstat (limited to 'app/views/projects/issues/_nav_btns.html.haml')
| -rw-r--r-- | app/views/projects/issues/_nav_btns.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/_nav_btns.html.haml b/app/views/projects/issues/_nav_btns.html.haml index 297b928f020..0dd2d2e6c5d 100644 --- a/app/views/projects/issues/_nav_btns.html.haml +++ b/app/views/projects/issues/_nav_btns.html.haml @@ -1,5 +1,5 @@ -= link_to safe_params.merge(rss_url_options), class: 'btn btn-default append-right-10 has-tooltip', title: 'Subscribe' do - = icon('rss') += render 'shared/issuable/feed_buttons' + - if @can_bulk_update = button_tag "Edit issues", class: "btn btn-default append-right-10 js-bulk-update-toggle" - if show_new_issue_link?(@project) |