Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
index 012a4f4ad89..728f655d33d 100644
--- a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
+++ b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
@@ -106,17 +106,17 @@ export default {
 
     <div class="title hide-collapsed">
       {{ sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName }) }}
-      <button
+      <a
         v-if="isEditable"
         class="float-right lock-edit"
-        type="button"
+        href="#"
         data-track-event="click_edit_button"
         data-track-label="right_sidebar"
         data-track-property="lock_issue"
         @click.prevent="toggleForm"
       >
         {{ __('Edit') }}
-      </button>
+      </a>
     </div>
 
     <div class="value sidebar-item-value hide-collapsed">
diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue
index f2ef7a2268e..db2e51c3aca 100644
--- a/app/assets/javascripts/sidebar/components/participants/participants.vue
+++ b/app/assets/javascripts/sidebar/components/participants/participants.vue
@@ -127,7 +127,7 @@ export default {
     <div v-if="hasMoreParticipants" class="participants-more hide-collapsed">
       <button
         type="button"
-        class="btn-transparent btn-blank js-toggle-participants-button"
+        class="btn-transparent btn-link js-toggle-participants-button"
         @click="toggleMoreParticipants"
       >
         {{ toggleLabel }}