diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-06 15:02:35 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-06 15:02:35 +0000 |
| commit | 2f02843fe9fbcbef09ef8f122e9a84d809f2c29a (patch) | |
| tree | b2b94404ac990ae8db3ff108e98463232e4f2203 /app/views/projects/issues/index.html.haml | |
| parent | a2a105f514e9196bdece1eebc4ea0610c7c71892 (diff) | |
| parent | c9a67266d2a79bd55f944516716a59300c1844f6 (diff) | |
| download | gitlab-ce-2f02843fe9fbcbef09ef8f122e9a84d809f2c29a.tar.gz | |
Merge branch '28340-mass-edit-issues-and-mrs-from-sidebar' into 'master'
Move issuable bulk edit form into a sidebar
Closes #28340
See merge request !11351
Diffstat (limited to 'app/views/projects/issues/index.html.haml')
| -rw-r--r-- | app/views/projects/issues/index.html.haml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 60900e9d660..7183794ce72 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- @bulk_edit = can?(current_user, :admin_issue, @project) +- @can_bulk_update = can?(current_user, :admin_issue, @project) - page_title "Issues" - new_issue_email = @project.new_issue_address(current_user) @@ -20,6 +20,8 @@ .nav-controls = link_to params.merge(rss_url_options), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do = icon('rss') + - if @can_bulk_update + = button_tag "Edit Issues", class: "btn btn-default js-bulk-update-toggle" = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: issues_finder.assignee.try(:id), @@ -30,6 +32,9 @@ New issue = render 'shared/issuable/search_bar', type: :issues + - if @can_bulk_update + = render 'shared/issuable/bulk_update_sidebar', type: :issues + .issues-holder = render 'issues' - if new_issue_email |