Merge branch 'danger-buttons-the-sequel' into 'master'

Updated all the 'remove' buttons to 'danger'

See merge request gitlab-org/gitlab!44432

app/views/admin/abuse_reports/_abuse_report.html.haml

@@ -22,7 +22,7 @@
   %td
     - if user
       = link_to _('Remove user & report'), admin_abuse_report_path(abuse_report, remove_user: true),
-        data: { confirm: _("USER %{user} WILL BE REMOVED! Are you sure?") % { user: user.name } }, remote: true, method: :delete, class: "btn btn-sm btn-block btn-remove js-remove-tr"
+        data: { confirm: _("USER %{user} WILL BE REMOVED! Are you sure?") % { user: user.name } }, remote: true, method: :delete, class: "gl-button btn btn-sm btn-block btn-danger js-remove-tr"
     - if user && !user.blocked?
       = link_to _('Block user'), block_admin_user_path(user), data: {confirm: _('USER WILL BE BLOCKED! Are you sure?')}, method: :put, class: "btn btn-sm btn-block"
     - else

app/views/admin/application_settings/_repository_check.html.haml

@@ -18,7 +18,7 @@
           If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
           - clear_repository_checks_link = _('Clear all repository checks')
           - clear_repository_checks_message = _('This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?')
-        = link_to clear_repository_checks_link, clear_repository_check_states_admin_application_settings_path, data: { confirm: clear_repository_checks_message }, method: :put, class: "btn btn-sm btn-remove"
+        = link_to clear_repository_checks_link, clear_repository_check_states_admin_application_settings_path, data: { confirm: clear_repository_checks_message }, method: :put, class: "gl-button btn btn-sm btn-danger"
 
     .sub-section
       %h4 Housekeeping

app/views/admin/applications/_delete_form.html.haml

-- submit_btn_css ||= 'btn btn-link btn-remove btn-sm'
+- submit_btn_css ||= 'gl-button btn btn-danger btn-sm'
 = form_tag admin_application_path(application) do
   %input{ :name => "_method", :type => "hidden", :value => "delete" }/
   = submit_tag 'Destroy', class: submit_btn_css, data: { confirm: _('Are you sure?') }

app/views/admin/deploy_keys/index.html.haml

@@ -28,6 +28,6 @@
             %td
               .float-right
                 = link_to _('Edit'), edit_admin_deploy_key_path(deploy_key), class: 'btn gl-button btn-sm'
-                = link_to _('Remove'), admin_deploy_key_path(deploy_key), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn gl-button btn-sm btn-remove delete-key'
+                = link_to _('Remove'), admin_deploy_key_path(deploy_key), data: { confirm: _('Are you sure?') }, method: :delete, class: 'gl-button btn btn-sm btn-danger delete-key'
 - else
   = render 'shared/empty_states/deploy_keys'

app/views/admin/groups/_group.html.haml

@@ -34,4 +34,4 @@
 
   .controls.gl-flex-shrink-0.gl-ml-5
     = link_to _('Edit'), admin_group_edit_path(group), id: "edit_#{dom_id(group)}", class: 'btn'
-    = link_to _('Delete'), [:admin, group], data: { confirm: _("Are you sure you want to remove %{group_name}?") % { group_name: group.name } }, method: :delete, class: 'btn btn-remove'
+    = link_to _('Delete'), [:admin, group], data: { confirm: _("Are you sure you want to remove %{group_name}?") % { group_name: group.name } }, method: :delete, class: 'gl-button btn btn-danger'

app/views/admin/hooks/edit.html.haml

@@ -11,7 +11,7 @@
       .form-actions
         %span>= f.submit _('Save changes'), class: 'btn gl-button btn-success gl-mr-3'
         = render 'shared/web_hooks/test_button', hook: @hook
-        = link_to _('Delete'), admin_hook_path(@hook), method: :delete, class: 'btn gl-button btn-remove float-right', data: { confirm: _('Are you sure?') }
+        = link_to _('Delete'), admin_hook_path(@hook), method: :delete, class: 'btn gl-button btn-danger float-right', data: { confirm: _('Are you sure?') }
 
     %hr
 

app/views/admin/serverless/domains/_form.html.haml

@@ -50,7 +50,7 @@
         .d-flex.justify-content-between.align-items-center.p-3
           %span
             = @domain.subject || _('missing')
-          %button.btn.btn-remove.btn-sm.js-domain-cert-replace-btn{ type: 'button' }
+          %button.gl-button.btn.btn-danger.btn-sm.js-domain-cert-replace-btn{ type: 'button' }
             = _('Replace')
 
     .js-domain-cert-inputs{ class: ('hidden' if show_certificate_card) }
@@ -67,7 +67,7 @@
 
   = f.submit @domain.persisted? ? _('Save changes') : _('Add domain'), class: "btn btn-success js-serverless-domain-submit", disabled: @domain.persisted?
   - if @domain.persisted?
-    %button.btn.btn-remove{ type: 'button', data: { toggle: 'modal', target: "#modal-delete-domain" } }
+    %button.gl-button.btn.btn-danger{ type: 'button', data: { toggle: 'modal', target: "#modal-delete-domain" } }
       = _('Delete domain')
 
 -# haml-lint:disable NoPlainNodes
@@ -95,5 +95,5 @@
             admin_serverless_domain_path(@domain.id),
             title: _('Delete'),
             method: :delete,
-            class: "btn btn-remove",
+            class: "gl-button btn btn-danger",
             disabled: domain_attached

app/views/admin/spam_logs/_spam_log.html.haml

@@ -24,7 +24,7 @@
   %td
     - if user
       = link_to 'Remove user', admin_spam_log_path(spam_log, remove_user: true),
-        data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-sm btn-remove"
+        data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "gl-button btn btn-sm btn-danger"
   %td
     - if spam_log.submitted_as_ham?
       .btn.btn-sm.disabled

app/views/admin/users/show.html.haml

@@ -54,7 +54,7 @@
           %strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'cred' }
             - if @user.two_factor_enabled?
               Enabled
-              = link_to 'Disable', disable_two_factor_admin_user_path(@user), data: {confirm: 'Are you sure?'}, method: :patch, class: 'btn gl-button btn-sm btn-remove float-right', title: 'Disable Two-factor Authentication'
+              = link_to 'Disable', disable_two_factor_admin_user_path(@user), data: {confirm: 'Are you sure?'}, method: :patch, class: 'btn gl-button btn-sm btn-danger float-right', title: 'Disable Two-factor Authentication'
             - else
               Disabled
 

app/views/doorkeeper/applications/_delete_form.html.haml

-- submit_btn_css ||= 'btn btn-link btn-remove btn-sm'
+- submit_btn_css ||= 'gl-button btn btn-danger btn-sm'
 = form_tag oauth_application_path(application) do
   %input{ :name => "_method", :type => "hidden", :value => "delete" }/
   - if defined? small

app/views/doorkeeper/authorized_applications/_delete_form.html.haml

@@ -5,4 +5,4 @@
 
 = form_tag path do
   %input{ :name => "_method", :type => "hidden", :value => "delete" }/
-  = submit_tag _('Revoke'), class: 'btn btn-remove btn-sm', data: { confirm: _('Are you sure?') }
+  = submit_tag _('Revoke'), class: 'gl-button btn btn-danger btn-sm', data: { confirm: _('Are you sure?') }

app/views/groups/projects.html.haml

@@ -15,7 +15,7 @@
         .controls
           = link_to _('Members'), project_project_members_path(project), id: "edit_#{dom_id(project)}", class: "btn"
           = link_to _('Edit'), edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn"
-          = link_to _('Delete'), project, data: { confirm: remove_project_message(project)}, method: :delete, class: "btn btn-remove"
+          = link_to _('Delete'), project, data: { confirm: remove_project_message(project)}, method: :delete, class: "gl-button btn btn-danger"
 
         .stats
           %span.badge.badge-pill

app/views/groups/settings/_permanent_deletion.html.haml

@@ -5,4 +5,4 @@
       = _('Removing this group also removes all child projects, including archived projects, and their resources.')
       %br
       %strong= _('Removed group can not be restored!')
-    = button_to _('Remove group'), '#', class: 'btn btn-remove js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) }
+    = button_to _('Remove group'), '#', class: 'gl-button btn btn-danger js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) }

app/views/projects/artifacts/_artifact.html.haml

@@ -57,5 +57,5 @@
             = sprite_icon('folder-open')
 
         - if can?(current_user, :destroy_artifacts, @project)
-          = link_to project_artifact_path(@project, artifact), data: { placement: 'top', container: 'body', confirm: _('Are you sure you want to delete these artifacts?') }, method: :delete, title: _('Delete artifacts'), ref: 'tooltip', aria: { label: _('Delete artifacts') }, class: 'btn btn-remove has-tooltip' do
+          = link_to project_artifact_path(@project, artifact), data: { placement: 'top', container: 'body', confirm: _('Are you sure you want to delete these artifacts?') }, method: :delete, title: _('Delete artifacts'), ref: 'tooltip', aria: { label: _('Delete artifacts') }, class: 'gl-button btn btn-danger has-tooltip' do
             = sprite_icon('remove')

app/views/projects/branches/_branch.html.haml

@@ -50,13 +50,13 @@
 
     - if can?(current_user, :push_code, @project)
       - if branch.name == @project.repository.root_ref
-        %button{ class: "btn btn-remove remove-row has-tooltip disabled",
+        %button{ class: "gl-button btn btn-danger remove-row has-tooltip disabled",
           disabled: true,
           title: s_('Branches|The default branch cannot be deleted') }
           = sprite_icon("remove")
       - elsif protected_branch?(@project, branch)
         - if can?(current_user, :push_to_delete_protected_branch, @project)
-          %button{ class: "btn btn-remove remove-row has-tooltip",
+          %button{ class: "gl-button btn btn-danger remove-row has-tooltip",
             title: s_('Branches|Delete protected branch'),
             data: { toggle: "modal",
               target: "#modal-delete-branch",
@@ -65,13 +65,13 @@
               is_merged: ("true" if merged) } }
             = sprite_icon("remove")
         - else
-          %button{ class: "btn btn-remove remove-row has-tooltip disabled",
+          %button{ class: "gl-button btn btn-danger remove-row has-tooltip disabled",
             disabled: true,
             title: s_('Branches|Only a project maintainer or owner can delete a protected branch') }
             = sprite_icon("remove")
       - else
         = link_to project_branch_path(@project, branch.name),
-          class: "btn btn-remove remove-row qa-remove-btn js-ajax-loading-spinner has-tooltip",
+          class: "gl-button btn btn-danger remove-row qa-remove-btn js-ajax-loading-spinner has-tooltip",
           title: s_('Branches|Delete branch'),
           method: :delete,
           data: { confirm: s_("Branches|Deleting the '%{branch_name}' branch cannot be undone. Are you sure?") % { branch_name: branch.name } },

app/views/projects/branches/index.html.haml

@@ -34,7 +34,7 @@
 
     - if can? current_user, :push_code, @project
       = link_to project_merged_branches_path(@project),
-        class: 'btn btn-inverted btn-remove has-tooltip qa-delete-merged-branches',
+        class: 'gl-button btn btn-danger btn-danger-secondary has-tooltip qa-delete-merged-branches',
         title: s_("Branches|Delete all branches that are merged into '%{default_branch}'") % { default_branch: @project.repository.root_ref },
         method: :delete,
         data: { confirm: s_('Branches|Deleting the merged branches cannot be undone. Are you sure?'),

app/views/projects/buttons/_remove_tag.html.haml

@@ -2,5 +2,5 @@
 - tag = local_assigns.fetch(:tag, nil)
 - return unless project && tag
 
-%button{ type: "button", class: "js-remove-tag js-confirm-modal-button gl-button btn btn-remove remove-row has-tooltip gl-ml-3 #{protected_tag?(project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), data: { container: 'body', path: project_tag_path(@project, tag.name), modal_attributes: delete_tag_modal_attributes(tag.name) } }
+%button{ type: "button", class: "js-remove-tag js-confirm-modal-button gl-button btn btn-danger remove-row has-tooltip gl-ml-3 #{protected_tag?(project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), data: { container: 'body', path: project_tag_path(@project, tag.name), modal_attributes: delete_tag_modal_attributes(tag.name) } }
   = sprite_icon("remove")

app/views/projects/edit.html.haml

@@ -107,7 +107,7 @@
               %li= _('You can only transfer the project to namespaces you manage.')
               %li= _('You will need to update your local repositories to point to the new location.')
               %li= _('Project visibility level will be changed to match namespace rules when transferring to a group.')
-          = f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger qa-transfer-button", data: { "confirm-danger-message" => transfer_project_message(@project) }
+          = f.submit 'Transfer project', class: "gl-button btn btn-danger js-confirm-danger qa-transfer-button", data: { "confirm-danger-message" => transfer_project_message(@project) }
 
     - if @project.forked? && can?(current_user, :remove_fork_project, @project)
       .sub-section
@@ -117,7 +117,7 @@
         = form_for @project, url: remove_fork_project_path(@project), method: :delete, remote: true, html: { class: 'transfer-project' } do |f|
           %p
             %strong= _('Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source.')
-          = button_to _('Remove fork relationship'), '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_warning_message(@project) }
+          = button_to _('Remove fork relationship'), '#', class: "gl-button btn btn-danger js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_warning_message(@project) }
 
     = render 'remove', project: @project
 

app/views/projects/no_repo.html.haml

@@ -22,4 +22,4 @@
 
 - if can? current_user, :remove_project, @project
   .prepend-top-20
-    = link_to _('Delete project'), project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-inverted btn-remove float-right"
+    = link_to _('Delete project'), project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "gl-button btn btn-danger btn-danger-secondary float-right"

app/views/projects/pages/_destroy.haml

@@ -8,7 +8,7 @@
         %p
           = s_('GitLabPages|Removing pages will prevent them from being exposed to the outside world.')
         .form-actions
-          = link_to s_('GitLabPages|Remove pages'), project_pages_path(@project), data: { confirm: s_('GitLabPages|Are you sure?')}, method: :delete, class: "btn gl-button btn-remove"
+          = link_to s_('GitLabPages|Remove pages'), project_pages_path(@project), data: { confirm: s_('GitLabPages|Are you sure?')}, method: :delete, class: "btn gl-button btn-danger"
   - else
     .nothing-here-block
       = s_('GitLabPages|Only project maintainers can remove pages')

app/views/projects/pages/_list.html.haml

@@ -22,7 +22,7 @@
                     = s_('GitLabPages|Expired')
           %div
             = link_to s_('GitLabPages|Edit'), project_pages_domain_path(@project, domain), class: "btn gl-button btn-sm btn-grouped btn-success btn-inverted"
-            = link_to s_('GitLabPages|Remove'), project_pages_domain_path(@project, domain), data: { confirm: s_('GitLabPages|Are you sure?')}, method: :delete, class: "btn gl-button btn-remove btn-sm btn-grouped"
+            = link_to s_('GitLabPages|Remove'), project_pages_domain_path(@project, domain), data: { confirm: s_('GitLabPages|Are you sure?')}, method: :delete, class: "btn gl-button btn-danger btn-sm btn-grouped"
         - if domain.needs_verification?
           %li.list-group-item.bs-callout-warning
             - details_link_start = "<a href='#{project_pages_domain_path(@project, domain)}'>".html_safe

app/views/projects/pages_domains/_certificate.html.haml

@@ -40,7 +40,7 @@
             = link_to _('Remove'),
               clean_certificate_project_pages_domain_path(@project, domain_presenter),
               data: { confirm: _('Are you sure?') },
-              class: 'btn btn-remove btn-sm',
+              class: 'gl-button btn btn-danger btn-sm',
               method: :delete
   - else
     .row

app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml

@@ -36,5 +36,5 @@
           = link_to edit_pipeline_schedule_path(pipeline_schedule), title: _('Edit'), class: 'btn gl-display-flex' do
             = sprite_icon('pencil')
         - if can?(current_user, :admin_pipeline_schedule, pipeline_schedule)
-          = link_to pipeline_schedule_path(pipeline_schedule), title: _('Delete'), method: :delete, class: 'btn btn-remove', data: { confirm: _("Are you sure you want to delete this pipeline schedule?") } do
+          = link_to pipeline_schedule_path(pipeline_schedule), title: _('Delete'), method: :delete, class: 'gl-button btn btn-danger', data: { confirm: _("Are you sure you want to delete this pipeline schedule?") } do
             = sprite_icon('remove')

app/views/shared/_delete_label_modal.html.haml

@@ -17,4 +17,4 @@
           label.destroy_path,
           title: _('Delete'),
           method: :delete,
-          class: 'btn btn-remove'
+          class: 'gl-button btn btn-danger'

app/views/shared/members/_group.html.haml

@@ -44,7 +44,7 @@
       = link_to group_link_path,
         method: :delete,
         data: { confirm: _("Are you sure you want to remove %{group_name}?") % { group_name: group.name }, qa_selector: 'delete_group_access_link' },
-        class: 'btn btn-remove m-0 ml-sm-2 align-self-center' do
+        class: 'gl-button btn btn-danger m-0 ml-sm-2 align-self-center' do
         %span.d-block.d-sm-none
           = _("Delete")
         = sprite_icon('remove', css_class: 'd-none d-sm-block')

ee/app/views/admin/licenses/_info.html.haml

@@ -60,4 +60,4 @@
         %p= _('If you remove this license, GitLab will fall back on the previous license, if any.')
         %p= _('If there is no previous license or if the previous license has expired, some GitLab functionality will be blocked until a new, valid license is uploaded.')
         %br
-        = link_to _('Remove license'), admin_license_path, data: { confirm: _('Are you sure you want to remove the license?'), qa_selector: 'remove_license_link' }, method: :delete, class: 'btn btn-remove'
+        = link_to _('Remove license'), admin_license_path, data: { confirm: _('Are you sure you want to remove the license?'), qa_selector: 'remove_license_link' }, method: :delete, class: 'gl-button btn btn-danger'

ee/app/views/groups/hooks/edit.html.haml

@@ -11,4 +11,4 @@
 
       %span>= f.submit _('Save changes'), class: 'btn btn-success gl-mr-3'
       = render 'shared/web_hooks/test_button', hook: @hook
-      = link_to _('Delete'), group_hook_path(@group, @hook), method: :delete, class: 'btn btn-remove float-right', data: { confirm: _('Are you sure?') }
+      = link_to _('Delete'), group_hook_path(@group, @hook), method: :delete, class: 'gl-button btn btn-danger float-right', data: { confirm: _('Are you sure?') }

ee/app/views/groups/settings/_adjourned_deletion.html.haml

@@ -10,4 +10,4 @@
       %li= _("The group will be placed in 'pending removal' state")
       %li= _("The group can be fully restored")
 
-    = button_to _('Remove group'), '#', class: 'btn btn-remove js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) }
+    = button_to _('Remove group'), '#', class: 'gl-button btn btn-danger js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) }

ee/app/views/groups/sso/_authorize_pane.html.haml

@@ -14,5 +14,5 @@
           = _("Only proceed if you trust %{idp_url} to control your GitLab account sign in.") % { idp_url: @unauthenticated_group.saml_provider.sso_url }
 
       .submit-container
-        = button_to _("Transfer ownership"), '#', class: 'btn btn-remove js-confirm-danger', data: { 'confirm-danger-message' => transfer_ownership_message(@group_name), qa_selector: 'transfer_ownership_button' }
+        = button_to _("Transfer ownership"), '#', class: 'gl-button btn btn-danger js-confirm-danger', data: { 'confirm-danger-message' => transfer_ownership_message(@group_name), qa_selector: 'transfer_ownership_button' }
 = render 'shared/confirm_modal', phrase: current_user.username

ee/app/views/projects/settings/_restore.html.haml

@@ -10,4 +10,4 @@
     = _("The repository can be committed to, and issues, comments and other entities can be created.")
     %strong= _('Only active this projects shows up in the search and on the dashboard.')
   = link_to _('Restore project'), namespace_project_restore_path(project.namespace, project),
-      method: :post, class: "btn btn-remove"
+      method: :post, class: "gl-button btn btn-danger"

ee/spec/views/shared/issuable/_approvals.html.haml_spec.rb

@@ -76,7 +76,7 @@ RSpec.describe 'shared/issuable/_approvals.html.haml' do
 
         render 'shared/issuable/approvals', form: form, issuable: merge_request, presenter: presenter
 
-        expect(rendered).not_to have_css('.btn-remove')
+        expect(rendered).not_to have_css('.btn-danger')
       end
     end
   end

spec/features/admin/admin_groups_spec.rb

@@ -194,7 +194,7 @@ RSpec.describe 'Admin Groups' do
         expect(page).to have_content('Developer')
       end
 
-      accept_confirm { find(:css, 'li', text: current_user.name).find(:css, 'a.btn-remove').click }
+      accept_confirm { find(:css, 'li', text: current_user.name).find(:css, 'a.btn-danger').click }
 
       visit group_group_members_path(group)
 

spec/features/groups/members/leave_group_spec.rb

@@ -70,7 +70,7 @@ RSpec.describe 'Groups > Members > Leave group' do
 
     visit group_group_members_path(group)
 
-    expect(find(:css, '.project-members-page li', text: user.name)).not_to have_selector(:css, 'a.btn-remove')
+    expect(find(:css, '.project-members-page li', text: user.name)).to have_no_selector(:css, 'a.btn-danger')
   end
 
   it 'owner can not leave the group by url param if they are the last owner', :js do

spec/features/groups/members/manage_groups_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe 'Groups > Members > Manage groups', :js do
       expect(page).to have_content(shared_with_group.name)
 
       accept_confirm do
-        find(:css, '#tab-groups li', text: shared_with_group.name).find(:css, 'a.btn-remove').click
+        find(:css, '#tab-groups li', text: shared_with_group.name).find(:css, 'a.btn-danger').click
       end
 
       expect(page).not_to have_content(shared_with_group.name)

spec/features/projects/branches/user_deletes_branch_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe "User deletes branch", :js do
     fill_in("branch-search", with: "improve/awesome").native.send_keys(:enter)
 
     page.within(".js-branch-improve\\/awesome") do
-      accept_alert { find(".btn-remove").click }
+      accept_alert { find(".btn-danger").click }
     end
 
     wait_for_requests

spec/features/projects/branches_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe 'Branches' do
         visit project_branches_filtered_path(project, state: 'all')
 
         expect(all('.all-branches').last).to have_selector('li', count: 20)
-        accept_confirm { first('.js-branch-item .btn-remove').click }
+        accept_confirm { first('.js-branch-item .btn-danger').click }
 
         expect(all('.all-branches').last).to have_selector('li', count: 19)
       end
@@ -163,7 +163,7 @@ RSpec.describe 'Branches' do
 
         expect(page).to have_content('fix')
         expect(find('.all-branches')).to have_selector('li', count: 1)
-        accept_confirm { find('.js-branch-fix .btn-remove').click }
+        accept_confirm { find('.js-branch-fix .btn-danger').click }
 
         expect(page).not_to have_content('fix')
         expect(find('.all-branches')).to have_selector('li', count: 0)

spec/features/projects/environments/environment_spec.rb

@@ -333,7 +333,7 @@ RSpec.describe 'Environment' do
       visit project_branches_filtered_path(project, state: 'all', search: 'feature')
 
       remove_branch_with_hooks(project, user, 'feature') do
-        page.within('.js-branch-feature') { find('a.btn-remove').click }
+        page.within('.js-branch-feature') { find('a.btn-danger').click }
       end
 
       visit_environment(environment)

spec/features/projects/members/groups_with_access_list_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe 'Projects > Members > Groups with access list', :js do
 
   it 'deletes group link' do
     page.within(first('.group_member')) do
-      accept_confirm { find('.btn-remove').click }
+      accept_confirm { find('.btn-danger').click }
     end
     wait_for_requests
 

spec/features/projects/members/list_spec.rb

@@ -102,7 +102,7 @@ RSpec.describe 'Project members list' do
       visit_members_page
 
       expect(page).not_to have_selector("#edit_project_member_#{project_member.id}")
-      expect(page).not_to have_selector("#project_member_#{project_member.id} .btn-remove")
+      expect(page).to have_no_selector("#project_member_#{project_member.id} .btn-danger")
     end
   end
 

spec/features/protected_branches_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe 'Protected Branches', :js do
         fill_in 'branch-search', with: 'fix'
         find('#branch-search').native.send_keys(:enter)
 
-        expect(page).to have_css('.btn-remove.disabled')
+        expect(page).to have_css('.btn-danger.disabled')
       end
     end
   end