Add latest changes from gitlab-org/gitlab@master

8 files changed, 41 insertions, 5 deletions

diff --git a/app/assets/javascripts/diffs/store/mutation_types.js b/app/assets/javascripts/diffs/store/mutation_types.js
index 4436935c1ec..699c61b3ddd 100644
--- a/app/assets/javascripts/diffs/store/mutation_types.js
+++ b/app/assets/javascripts/diffs/store/mutation_types.js
@@ -2,8 +2,11 @@ export const SET_BASE_CONFIG = 'SET_BASE_CONFIG';
 export const SET_LOADING = 'SET_LOADING';
 export const SET_BATCH_LOADING = 'SET_BATCH_LOADING';
 export const SET_RETRIEVING_BATCHES = 'SET_RETRIEVING_BATCHES';
+
 export const SET_DIFF_DATA = 'SET_DIFF_DATA';
 export const SET_DIFF_DATA_BATCH = 'SET_DIFF_DATA_BATCH';
+export const SET_DIFF_FILES = 'SET_DIFF_FILES';
+
 export const SET_DIFF_VIEW_TYPE = 'SET_DIFF_VIEW_TYPE';
 export const SET_COVERAGE_DATA = 'SET_COVERAGE_DATA';
 export const SET_MERGE_REQUEST_DIFFS = 'SET_MERGE_REQUEST_DIFFS';
diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js
index bb4c80b5759..3c00ae98e75 100644
--- a/app/assets/javascripts/diffs/store/mutations.js
+++ b/app/assets/javascripts/diffs/store/mutations.js
@@ -10,6 +10,10 @@ import {
 } from './utils';
 import * as types from './mutation_types';
 
+function updateDiffFilesInState(state, files) {
+  return Object.assign(state, { diffFiles: files });
+}
+
 export default {
   [types.SET_BASE_CONFIG](state, options) {
     const {
@@ -46,6 +50,10 @@ export default {
     Object.assign(state, { retrievingBatches });
   },
 
+  [types.SET_DIFF_FILES](state, files) {
+    updateDiffFilesInState(state, files);
+  },
+
   [types.SET_DIFF_DATA](state, data) {
     let files = state.diffFiles;
 
@@ -58,8 +66,8 @@ export default {
 
     Object.assign(state, {
       ...convertObjectPropsToCamelCase(data),
-      diffFiles: files,
     });
+    updateDiffFilesInState(state, files);
   },
 
   [types.SET_DIFF_DATA_BATCH](state, data) {
@@ -67,8 +75,8 @@ export default {
 
     Object.assign(state, {
       ...convertObjectPropsToCamelCase(data),
-      diffFiles: files,
     });
+    updateDiffFilesInState(state, files);
   },
 
   [types.SET_COVERAGE_DATA](state, coverageFiles) {
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index c28ac94b3ed..07952f9edd9 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -98,7 +98,7 @@ export default {
           <icon name="comment-next" />
         </button>
       </div>
-      <div v-if="isLoggedIn" class="btn-group btn-group-sm" role="group">
+      <div class="btn-group btn-group-sm" role="group">
         <button
           v-gl-tooltip
           :title="__('Toggle all threads')"
diff --git a/app/assets/javascripts/releases/components/app_edit.vue b/app/assets/javascripts/releases/components/app_edit.vue
index e90adcd0e25..06e388002e4 100644
--- a/app/assets/javascripts/releases/components/app_edit.vue
+++ b/app/assets/javascripts/releases/components/app_edit.vue
@@ -39,7 +39,7 @@ export default {
     subtitleText() {
       return sprintf(
         __(
-          'Releases are based on Git tags. We recommend naming tags that fit within semantic versioning, for example %{codeStart}v1.0%{codeEnd}, %{codeStart}v2.0-pre%{codeEnd}.',
+          'Releases are based on Git tags. We recommend tags that use semantic versioning, for example %{codeStart}v1.0%{codeEnd}, %{codeStart}v2.0-pre%{codeEnd}.',
         ),
         {
           codeStart: '<code>',
diff --git a/app/controllers/repositories/git_http_controller.rb b/app/controllers/repositories/git_http_controller.rb
index 29bff3ef1e9..9e134ba9526 100644
--- a/app/controllers/repositories/git_http_controller.rb
+++ b/app/controllers/repositories/git_http_controller.rb
@@ -121,7 +121,7 @@ module Repositories
     def snippet_request_allowed?
       if repo_type.snippet? && Feature.disabled?(:version_snippets, user)
         Gitlab::AppLogger.info('Snippet access attempt with feature disabled')
-        render plain: 'The project you were looking for could not be found.', status: :not_found
+        render plain: 'Snippet git access is disabled.', status: :forbidden
       end
     end
   end
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index acfd972bb83..7e0cc591308 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -196,6 +196,8 @@ module IssuablesHelper
       author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "d-none d-sm-inline")
       author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-inline d-sm-none")
 
+      author_output << gitlab_team_member_badge(issuable.author, css_class: 'ml-1')
+
       if status = user_status(issuable.author)
         author_output << "#{status}".html_safe
       end
@@ -240,6 +242,27 @@ module IssuablesHelper
     html.html_safe
   end
 
+  def gitlab_team_member_badge(author, css_class: nil)
+    return unless author.gitlab_employee?
+
+    default_css_class = 'd-inline-block align-middle'
+    gitlab_team_member = _('GitLab Team Member')
+
+    content_tag(
+      :span,
+      class: css_class ? "#{default_css_class} #{css_class}" : default_css_class,
+      data: { toggle: 'tooltip', title: gitlab_team_member, container: 'body' },
+      role: 'img',
+      aria: { label: gitlab_team_member }
+    ) do
+      sprite_icon(
+        'tanuki-verified',
+        size: 16,
+        css_class: 'gl-text-purple d-block'
+      )
+    end
+  end
+
   def issuable_first_contribution_icon
     content_tag(:span, class: 'fa-stack') do
       concat(icon('certificate', class: "fa-stack-2x"))
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index a6c6b77c9dd..54002b9ca2e 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -24,6 +24,7 @@
             &middot;
             opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
             by #{link_to_member(@project, issue.author, avatar: false)}
+            = gitlab_team_member_badge(issue.author)
           - if issue.milestone
             %span.issuable-milestone.d-none.d-sm-inline-block
               &nbsp;
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 744dca1c462..1bde1a41975 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -20,6 +20,7 @@
           &middot;
           opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
           by #{link_to_member(@project, merge_request.author, avatar: false)}
+          = gitlab_team_member_badge(merge_request.author)
         - if merge_request.milestone
           %span.issuable-milestone.d-none.d-sm-inline-block
             &nbsp;