Merge branch '28328-lock-button-fix' into 'master'

Unlock button changed from Icon to String

Closes #28328

See merge request gitlab-org/gitlab!20307

changelogs/unreleased/28328-lock-button-fix.yml

+---
+title: Unlock button changed from Icon to String
+merge_request: 20307
+author:
+type: changed

ee/app/views/projects/path_locks/_path_lock.html.haml

@@ -6,7 +6,7 @@
 
     .controls
       - if can_unlock?(path_lock)
-        = link_to project_path_lock_path(@project, path_lock), class: 'btn btn-grouped btn-sm btn-remove remove-row has-tooltip', title: _("Unlock"), method: :delete, data: { confirm: _("Are you sure you want to unlock %{path_lock_path}?") % { path_lock_path: path_lock.path }, container: 'body', qa_selector: 'unlock_button' }, remote: true do
-          = icon("trash-o")
+        = link_to project_path_lock_path(@project, path_lock), class: 'btn', title: _("Unlock"), method: :delete, data: { confirm: _("Are you sure you want to unlock %{path_lock_path}?") % { path_lock_path: path_lock.path }, container: 'body', qa_selector: 'unlock_button' }, remote: true do
+          = _('Unlock')
 
   = _("locked by %{path_lock_user_name} %{created_at}").html_safe % { path_lock_user_name: path_lock.user.name, created_at: time_ago_with_tooltip(path_lock.created_at) }

ee/spec/features/projects/path_locks_spec.rb

@@ -67,7 +67,7 @@ describe 'Path Locks', :js do
     within '.locks' do
       expect(page).to have_content('encoding')
 
-      accept_confirm { find('.btn-remove').click }
+      accept_confirm { click_link "Unlock" }
 
       expect(page).not_to have_content('encoding')
     end