Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 1 deletions

diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue
index 8f8712365be..1ccbe0d0d41 100644
--- a/app/assets/javascripts/diffs/components/commit_item.vue
+++ b/app/assets/javascripts/diffs/components/commit_item.vue
@@ -7,6 +7,8 @@ import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
+import initUserPopovers from '../../user_popovers';
+
 /**
  * CommitItem
  *
@@ -80,6 +82,11 @@ export default {
       return this.commit.description_html.replace(/^
/, '');
     },
   },
+  created() {
+    this.$nextTick(() => {
+      initUserPopovers(this.$el.querySelectorAll('.js-user-link'));
+    });
+  },
   safeHtmlConfig: {
     ADD_TAGS: ['gl-emoji'],
   },
diff --git a/app/assets/javascripts/diffs/components/no_changes.vue b/app/assets/javascripts/diffs/components/no_changes.vue
index ab518fcfb16..42af2ab7880 100644
--- a/app/assets/javascripts/diffs/components/no_changes.vue
+++ b/app/assets/javascripts/diffs/components/no_changes.vue
@@ -61,7 +61,7 @@ export default {
           </gl-sprintf>
         </div>
         <div class="text-center">
-          <gl-button :href="getNoteableData.new_blob_path" variant="success" category="primary">{{
+          <gl-button :href="getNoteableData.new_blob_path" variant="confirm" category="primary">{{
             __('Create commit')
           }}</gl-button>
         </div>