Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-23

# Conflicts:
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]

CONTRIBUTING.md

@@ -376,8 +376,14 @@ on those issues. Please select someone with relevant experience from the
 [GitLab team][team]. If there is nobody mentioned with that expertise look in
 the commit history for the affected files to find someone.
 
+We also use [GitLab Triage] to automate some triaging policies. This is
+currently setup as a [scheduled pipeline] running on the [`gl-triage`] branch.
+
 [described in our handbook]: https://about.gitlab.com/handbook/engineering/issue-triage/
 [issue bash events]: https://gitlab.com/gitlab-org/gitlab-ce/issues/17815
+[GitLab Triage]: https://gitlab.com/gitlab-org/gitlab-triage
+[scheduled pipeline]: https://gitlab.com/gitlab-org/gitlab-ce/pipeline_schedules/3732/edit
+[`gl-triage`]: https://gitlab.com/gitlab-org/gitlab-ce/tree/gl-triage
 
 ### Feature proposals
 

app/assets/javascripts/diffs/components/diff_line_gutter_content.vue

@@ -71,6 +71,11 @@ export default {
       required: false,
       default: false,
     },
+    discussions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
   },
   computed: {
     ...mapState({
@@ -78,7 +83,6 @@ export default {
       diffFiles: state => state.diffs.diffFiles,
     }),
     ...mapGetters(['isLoggedIn']),
-    ...mapGetters('diffs', ['discussionsByLineCode']),
     lineHref() {
       return this.lineCode ? `#${this.lineCode}` : '#';
     },
@@ -88,24 +92,19 @@ export default {
         this.showCommentButton &&
         !this.isMatchLine &&
         !this.isContextLine &&
-        !this.hasDiscussions &&
-        !this.isMetaLine
+        !this.isMetaLine &&
+        !this.hasDiscussions
       );
     },
-    discussions() {
-      return this.discussionsByLineCode[this.lineCode] || [];
-    },
     hasDiscussions() {
       return this.discussions.length > 0;
     },
     shouldShowAvatarsOnGutter() {
-      let render = this.hasDiscussions && this.showCommentButton;
-
       if (!this.lineType && this.linePosition === LINE_POSITION_RIGHT) {
-        render = false;
+        return false;
       }
 
-      return render;
+      return this.hasDiscussions && this.showCommentButton;
     },
   },
   methods: {

app/assets/javascripts/diffs/components/diff_table_cell.vue

@@ -67,6 +67,11 @@ export default {
       required: false,
       default: false,
     },
+    discussions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
   },
   computed: {
     ...mapGetters(['isLoggedIn']),
@@ -136,6 +141,7 @@ export default {
       :is-match-line="isMatchLine"
       :is-context-line="isContentLine"
       :is-meta-line="isMetaLine"
+      :discussions="discussions"
     />
   </td>
 </template>

app/assets/javascripts/diffs/components/inline_diff_comment_row.vue

 <script>
-import { mapState, mapGetters } from 'vuex';
+import { mapState } from 'vuex';
 import diffDiscussions from './diff_discussions.vue';
 import diffLineNoteForm from './diff_line_note_form.vue';
 
@@ -21,15 +21,16 @@ export default {
       type: Number,
       required: true,
     },
+    discussions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
   },
   computed: {
     ...mapState({
       diffLineCommentForms: state => state.diffs.diffLineCommentForms,
     }),
-    ...mapGetters('diffs', ['discussionsByLineCode']),
-    discussions() {
-      return this.discussionsByLineCode[this.line.lineCode] || [];
-    },
     className() {
       return this.discussions.length ? '' : 'js-temp-notes-holder';
     },

app/assets/javascripts/diffs/components/inline_diff_table_row.vue

@@ -33,6 +33,11 @@ export default {
       required: false,
       default: false,
     },
+    discussions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
   },
   data() {
     return {
@@ -89,6 +94,7 @@ export default {
       :is-bottom="isBottom"
       :is-hover="isHover"
       :show-comment-button="true"
+      :discussions="discussions"
       class="diff-line-num old_line"
     />
     <diff-table-cell
@@ -98,6 +104,7 @@ export default {
       :line-type="newLineType"
       :is-bottom="isBottom"
       :is-hover="isHover"
+      :discussions="discussions"
       class="diff-line-num new_line"
     />
     <td

app/assets/javascripts/diffs/components/inline_diff_view.vue

@@ -20,7 +20,11 @@ export default {
     },
   },
   computed: {
-    ...mapGetters('diffs', ['commitId', 'discussionsByLineCode']),
+    ...mapGetters('diffs', [
+      'commitId',
+      'shouldRenderInlineCommentRow',
+      'singleDiscussionByLineCode',
+    ]),
     ...mapState({
       diffLineCommentForms: state => state.diffs.diffLineCommentForms,
     }),
@@ -34,18 +38,7 @@ export default {
       return window.gon.user_color_scheme;
     },
   },
-  methods: {
-    shouldRenderCommentRow(line) {
-      if (this.diffLineCommentForms[line.lineCode]) return true;
-
-      const lineDiscussions = this.discussionsByLineCode[line.lineCode];
-      if (lineDiscussions === undefined) {
-        return false;
-      }
-
-      return lineDiscussions.every(discussion => discussion.expanded);
-    },
-  },
+  methods: {},
 };
 </script>
 
@@ -64,13 +57,15 @@ export default {
           :line="line"
           :is-bottom="index + 1 === diffLinesLength"
           :key="line.lineCode"
+          :discussions="singleDiscussionByLineCode(line.lineCode)"
         />
         <inline-diff-comment-row
-          v-if="shouldRenderCommentRow(line)"
+          v-if="shouldRenderInlineCommentRow(line)"
           :diff-file-hash="diffFile.fileHash"
           :line="line"
           :line-index="index"
           :key="index"
+          :discussions="singleDiscussionByLineCode(line.lineCode)"
         />
       </template>
     </tbody>

app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue

 <script>
-import { mapState, mapGetters } from 'vuex';
+import { mapState } from 'vuex';
 import diffDiscussions from './diff_discussions.vue';
 import diffLineNoteForm from './diff_line_note_form.vue';
 
@@ -21,48 +21,51 @@ export default {
       type: Number,
       required: true,
     },
+    leftDiscussions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    rightDiscussions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
   },
   computed: {
     ...mapState({
       diffLineCommentForms: state => state.diffs.diffLineCommentForms,
     }),
-    ...mapGetters('diffs', ['discussionsByLineCode']),
     leftLineCode() {
       return this.line.left.lineCode;
     },
     rightLineCode() {
       return this.line.right.lineCode;
     },
-    hasDiscussion() {
-      const discussions = this.discussionsByLineCode;
-
-      return discussions[this.leftLineCode] || discussions[this.rightLineCode];
-    },
     hasExpandedDiscussionOnLeft() {
-      const discussions = this.discussionsByLineCode[this.leftLineCode];
-
+      const discussions = this.leftDiscussions;
       return discussions ? discussions.every(discussion => discussion.expanded) : false;
     },
     hasExpandedDiscussionOnRight() {
-      const discussions = this.discussionsByLineCode[this.rightLineCode];
-
+      const discussions = this.rightDiscussions;
       return discussions ? discussions.every(discussion => discussion.expanded) : false;
     },
     hasAnyExpandedDiscussion() {
       return this.hasExpandedDiscussionOnLeft || this.hasExpandedDiscussionOnRight;
     },
     shouldRenderDiscussionsOnLeft() {
-      return this.discussionsByLineCode[this.leftLineCode] && this.hasExpandedDiscussionOnLeft;
+      return this.leftDiscussions && this.hasExpandedDiscussionOnLeft;
     },
     shouldRenderDiscussionsOnRight() {
-      return (
-        this.discussionsByLineCode[this.rightLineCode] &&
-        this.hasExpandedDiscussionOnRight &&
-        this.line.right.type
-      );
+      return this.rightDiscussions && this.hasExpandedDiscussionOnRight && this.line.right.type;
+    },
+    showRightSideCommentForm() {
+      return this.line.right.type && this.diffLineCommentForms[this.rightLineCode];
     },
     className() {
-      return this.hasDiscussion ? '' : 'js-temp-notes-holder';
+      return this.leftDiscussions.length > 0 || this.rightDiscussions.length > 0
+        ? ''
+        : 'js-temp-notes-holder';
     },
   },
 };
@@ -80,13 +83,12 @@ export default {
         class="content"
       >
         <diff-discussions
-          v-if="discussionsByLineCode[leftLineCode].length"
-          :discussions="discussionsByLineCode[leftLineCode]"
+          v-if="leftDiscussions.length"
+          :discussions="leftDiscussions"
         />
       </div>
       <diff-line-note-form
-        v-if="diffLineCommentForms[leftLineCode] &&
-        diffLineCommentForms[leftLineCode]"
+        v-if="diffLineCommentForms[leftLineCode]"
         :diff-file-hash="diffFileHash"
         :line="line.left"
         :note-target-line="line.left"
@@ -100,13 +102,12 @@ export default {
         class="content"
       >
         <diff-discussions
-          v-if="discussionsByLineCode[rightLineCode].length"
-          :discussions="discussionsByLineCode[rightLineCode]"
+          v-if="rightDiscussions.length"
+          :discussions="rightDiscussions"
         />
       </div>
       <diff-line-note-form
-        v-if="diffLineCommentForms[rightLineCode] &&
-        diffLineCommentForms[rightLineCode] && line.right.type"
+        v-if="showRightSideCommentForm"
         :diff-file-hash="diffFileHash"
         :line="line.right"
         :note-target-line="line.right"

app/assets/javascripts/diffs/components/parallel_diff_table_row.vue

@@ -36,6 +36,16 @@ export default {
       required: false,
       default: false,
     },
+    leftDiscussions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    rightDiscussions: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
   },
   data() {
     return {
@@ -116,6 +126,7 @@ export default {
       :is-hover="isLeftHover"
       :show-comment-button="true"
       :diff-view-type="parallelDiffViewType"
+      :discussions="leftDiscussions"
       class="diff-line-num old_line"
     />
     <td
@@ -136,6 +147,7 @@ export default {
       :is-hover="isRightHover"
       :show-comment-button="true"
       :diff-view-type="parallelDiffViewType"
+      :discussions="rightDiscussions"
       class="diff-line-num new_line"
     />
     <td

app/assets/javascripts/diffs/components/parallel_diff_view.vue

@@ -21,7 +21,11 @@ export default {
     },
   },
   computed: {
-    ...mapGetters('diffs', ['commitId', 'discussionsByLineCode']),
+    ...mapGetters('diffs', [
+      'commitId',
+      'singleDiscussionByLineCode',
+      'shouldRenderParallelCommentRow',
+    ]),
     ...mapState({
       diffLineCommentForms: state => state.diffs.diffLineCommentForms,
     }),
@@ -51,32 +55,6 @@ export default {
       return window.gon.user_color_scheme;
     },
   },
-  methods: {
-    shouldRenderCommentRow(line) {
-      const leftLineCode = line.left.lineCode;
-      const rightLineCode = line.right.lineCode;
-      const discussions = this.discussionsByLineCode;
-      const leftDiscussions = discussions[leftLineCode];
-      const rightDiscussions = discussions[rightLineCode];
-      const hasDiscussion = leftDiscussions || rightDiscussions;
-
-      const hasExpandedDiscussionOnLeft = leftDiscussions
-        ? leftDiscussions.every(discussion => discussion.expanded)
-        : false;
-      const hasExpandedDiscussionOnRight = rightDiscussions
-        ? rightDiscussions.every(discussion => discussion.expanded)
-        : false;
-
-      if (hasDiscussion && (hasExpandedDiscussionOnLeft || hasExpandedDiscussionOnRight)) {
-        return true;
-      }
-
-      const hasCommentFormOnLeft = this.diffLineCommentForms[leftLineCode];
-      const hasCommentFormOnRight = this.diffLineCommentForms[rightLineCode];
-
-      return hasCommentFormOnLeft || hasCommentFormOnRight;
-    },
-  },
 };
 </script>
 
@@ -97,13 +75,17 @@ export default {
             :line="line"
             :is-bottom="index + 1 === diffLinesLength"
             :key="index"
+            :left-discussions="singleDiscussionByLineCode(line.left.lineCode)"
+            :right-discussions="singleDiscussionByLineCode(line.right.lineCode)"
           />
           <parallel-diff-comment-row
-            v-if="shouldRenderCommentRow(line)"
+            v-if="shouldRenderParallelCommentRow(line)"
             :key="`dcr-${index}`"
             :line="line"
             :diff-file-hash="diffFile.fileHash"
             :line-index="index"
+            :left-discussions="singleDiscussionByLineCode(line.left.lineCode)"
+            :right-discussions="singleDiscussionByLineCode(line.right.lineCode)"
           />
         </template>
       </tbody>

app/assets/javascripts/diffs/store/getters.js

@@ -75,9 +75,10 @@ export const discussionsByLineCode = (state, getters, rootState, rootGetters) =>
     const isDiffDiscussion = note.diff_discussion;
     const hasLineCode = note.line_code;
     const isResolvable = note.resolvable;
-    const diffRefs = diffRefsByLineCode[note.line_code];
 
-    if (isDiffDiscussion && hasLineCode && isResolvable && diffRefs) {
+    if (isDiffDiscussion && hasLineCode && isResolvable) {
+      const diffRefs = diffRefsByLineCode[note.line_code];
+      if (diffRefs) {
         const refs = convertObjectPropsToCamelCase(note.position.formatter);
         const originalRefs = convertObjectPropsToCamelCase(note.original_position.formatter);
 
@@ -91,11 +92,53 @@ export const discussionsByLineCode = (state, getters, rootState, rootGetters) =>
           }
         }
       }
+    }
 
     return acc;
   }, {});
 };
 
+export const singleDiscussionByLineCode = (state, getters) => lineCode => {
+  if (!lineCode) return [];
+  const discussions = getters.discussionsByLineCode;
+  return discussions[lineCode] || [];
+};
+
+export const shouldRenderParallelCommentRow = (state, getters) => line => {
+  const leftLineCode = line.left.lineCode;
+  const rightLineCode = line.right.lineCode;
+  const leftDiscussions = getters.singleDiscussionByLineCode(leftLineCode);
+  const rightDiscussions = getters.singleDiscussionByLineCode(rightLineCode);
+  const hasDiscussion = leftDiscussions.length || rightDiscussions.length;
+
+  const hasExpandedDiscussionOnLeft = leftDiscussions.length
+    ? leftDiscussions.every(discussion => discussion.expanded)
+    : false;
+  const hasExpandedDiscussionOnRight = rightDiscussions.length
+    ? rightDiscussions.every(discussion => discussion.expanded)
+    : false;
+
+  if (hasDiscussion && (hasExpandedDiscussionOnLeft || hasExpandedDiscussionOnRight)) {
+    return true;
+  }
+
+  const hasCommentFormOnLeft = state.diffLineCommentForms[leftLineCode];
+  const hasCommentFormOnRight = state.diffLineCommentForms[rightLineCode];
+
+  return hasCommentFormOnLeft || hasCommentFormOnRight;
+};
+
+export const shouldRenderInlineCommentRow = (state, getters) => line => {
+  if (state.diffLineCommentForms[line.lineCode]) return true;
+
+  const lineDiscussions = getters.singleDiscussionByLineCode(line.lineCode);
+  if (lineDiscussions.length === 0) {
+    return false;
+  }
+
+  return lineDiscussions.every(discussion => discussion.expanded);
+};
+
 // prevent babel-plugin-rewire from generating an invalid default during karma∂ tests
 export const getDiffFileByHash = state => fileHash =>
   state.diffFiles.find(file => file.fileHash === fileHash);

app/assets/javascripts/gpg_badges.js

 import $ from 'jquery';
 import { parseQueryStringIntoObject } from '~/lib/utils/common_utils';
 import axios from '~/lib/utils/axios_utils';
-import flash from '~/flash';
+import createFlash from '~/flash';
 import { __ } from '~/locale';
 
 export default class GpgBadges {
   static fetch() {
-    const badges = $('.js-loading-gpg-badge');
     const tag = $('.js-signature-container');
+    if (tag.length === 0) {
+      return Promise.resolve();
+    }
+
+    const badges = $('.js-loading-gpg-badge');
 
     badges.html('<i class="fa fa-spinner fa-spin"></i>');
 
+    const displayError = () => createFlash(__('An error occurred while loading commit signatures'));
+
+    const endpoint = tag.data('signaturesPath');
+    if (!endpoint) {
+      displayError();
+      return Promise.reject(new Error('Missing commit signatures endpoint!'));
+    }
+
     const params = parseQueryStringIntoObject(tag.serialize());
-    return axios.get(tag.data('signaturesPath'), { params })
+    return axios
+      .get(endpoint, { params })
       .then(({ data }) => {
-      data.signatures.forEach((signature) => {
+        data.signatures.forEach(signature => {
           badges.filter(`[data-commit-sha="${signature.commit_sha}"]`).replaceWith(signature.html);
         });
       })
-    .catch(() => flash(__('An error occurred while loading commits')));
+      .catch(displayError);
   }
 }

app/assets/javascripts/pages/projects/blob/show/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue';
 import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue';
 import BlobViewer from '~/blob/viewer/index';
 import initBlob from '~/pages/projects/init_blob';
+import GpgBadges from '~/gpg_badges';
 
 document.addEventListener('DOMContentLoaded', () => {
   new BlobViewer(); // eslint-disable-line no-new
@@ -26,4 +27,6 @@ document.addEventListener('DOMContentLoaded', () => {
       },
     });
   }
+
+  GpgBadges.fetch();
 });

app/assets/javascripts/pages/projects/show/index.js

@@ -7,6 +7,7 @@ import TreeView from '~/tree';
 import BlobViewer from '~/blob/viewer/index';
 import Activities from '~/activities';
 import { ajaxGet } from '~/lib/utils/common_utils';
+import GpgBadges from '~/gpg_badges';
 import Star from '../../../star';
 import notificationsDropdown from '../../../notifications_dropdown';
 
@@ -38,4 +39,6 @@ document.addEventListener('DOMContentLoaded', () => {
   $(treeSlider).waitForImages(() => {
     ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath);
   });
+
+  GpgBadges.fetch();
 });

app/assets/javascripts/pages/projects/tree/show/index.js

@@ -2,6 +2,7 @@ import $ from 'jquery';
 import Vue from 'vue';
 import initBlob from '~/blob_edit/blob_bundle';
 import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue';
+import GpgBadges from '~/gpg_badges';
 import TreeView from '../../../../tree';
 import ShortcutsNavigation from '../../../../shortcuts_navigation';
 import BlobViewer from '../../../../blob/viewer';
@@ -14,7 +15,8 @@ document.addEventListener('DOMContentLoaded', () => {
   new BlobViewer(); // eslint-disable-line no-new
   new NewCommitForm($('.js-create-dir-form')); // eslint-disable-line no-new
   $('#tree-slider').waitForImages(() =>
-    ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath));
+    ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath),
+  );
 
   initBlob();
   const commitPipelineStatusEl = document.querySelector('.js-commit-pipeline-status');
@@ -36,4 +38,6 @@ document.addEventListener('DOMContentLoaded', () => {
       },
     });
   }
+
+  GpgBadges.fetch();
 });

app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue

 <script>
-  import Visibility from 'visibilityjs';
-  import ciIcon from '~/vue_shared/components/ci_icon.vue';
-  import loadingIcon from '~/vue_shared/components/loading_icon.vue';
-  import Poll from '~/lib/utils/poll';
-  import Flash from '~/flash';
-  import { s__, sprintf } from '~/locale';
-  import tooltip from '~/vue_shared/directives/tooltip';
-  import CommitPipelineService from '../services/commit_pipeline_service';
+import Visibility from 'visibilityjs';
+import ciIcon from '~/vue_shared/components/ci_icon.vue';
+import loadingIcon from '~/vue_shared/components/loading_icon.vue';
+import Poll from '~/lib/utils/poll';
+import Flash from '~/flash';
+import { s__, sprintf } from '~/locale';
+import tooltip from '~/vue_shared/directives/tooltip';
+import CommitPipelineService from '../services/commit_pipeline_service';
 
-  export default {
+export default {
   directives: {
     tooltip,
   },
@@ -87,7 +87,8 @@
       });
     },
     fetchPipelineCommitData() {
-        this.service.fetchData()
+      this.service
+        .fetchData()
         .then(this.successCallback)
         .catch(this.errorCallback);
     },
@@ -95,10 +96,10 @@
   destroy() {
     this.poll.stop();
   },
-  };
+};
 </script>
 <template>
-  <div>
+  <div class="ci-status-link">
     <loading-icon
       v-if="isLoading"
       label="Loading pipeline status"
@@ -113,6 +114,7 @@
         :title="statusTitle"
         :aria-label="statusTitle"
         :status="ciStatus"
+        :size="24"
         data-container="body"
       />
     </a>

app/assets/javascripts/reports/store/actions.js

+import Visibility from 'visibilityjs';
+import axios from '../../lib/utils/axios_utils';
+import Poll from '../../lib/utils/poll';
+import * as types from './mutation_types';
+
+export const setEndpoint = ({ commit }, endpoint) => commit(types.SET_ENDPOINT, endpoint);
+
+export const requestReports = ({ commit }) => commit(types.REQUEST_REPORTS);
+
+let eTagPoll;
+
+export const clearEtagPoll = () => {
+  eTagPoll = null;
+};
+
+export const stopPolling = () => {
+  if (eTagPoll) eTagPoll.stop();
+};
+
+export const restartPolling = () => {
+  if (eTagPoll) eTagPoll.restart();
+};
+
+/**
+ * We need to poll the reports endpoint while they are being parsed in the Backend.
+ * This can take up to one minute.
+ *
+ * Poll.js will handle etag response.
+ * While http status code is 204, it means it's parsing, and we'll keep polling
+ * When http status code is 200, it means parsing is done, we can show the results & stop polling
+ * When http status code is 500, it means parsing went wrong and we stop polling
+ */
+export const fetchReports = ({ state, dispatch }) => {
+  dispatch('requestReports');
+
+  eTagPoll = new Poll({
+    resource: {
+      getReports(endpoint) {
+        return axios.get(endpoint);
+      },
+    },
+    data: state.endpoint,
+    method: 'getReports',
+    successCallback: ({ data }) => dispatch('receiveReportsSuccess', data),
+    errorCallback: () => dispatch('receiveReportsError'),
+  });
+
+  if (!Visibility.hidden()) {
+    eTagPoll.makeRequest();
+  }
+
+  Visibility.change(() => {
+    if (!Visibility.hidden()) {
+      dispatch('restartPolling');
+    } else {
+      dispatch('stopPolling');
+    }
+  });
+};
+
+export const receiveReportsSuccess = ({ commit }, response) =>
+  commit(types.RECEIVE_REPORTS_SUCCESS, response);
+
+export const receiveReportsError = ({ commit }) => commit(types.RECEIVE_REPORTS_ERROR);
+
+// prevent babel-plugin-rewire from generating an invalid default during karma tests
+export default () => {};

app/assets/javascripts/reports/store/index.js

+import Vue from 'vue';
+import Vuex from 'vuex';
+import * as actions from './actions';
+import mutations from './mutations';
+import state from './state';
+
+Vue.use(Vuex);
+
+export default () => new Vuex.Store({
+  actions,
+  mutations,
+  state: state(),
+});

app/assets/javascripts/reports/store/mutation_types.js

+export const SET_ENDPOINT = 'SET_ENDPOINT';
+
+export const REQUEST_REPORTS = 'REQUEST_REPORTS';
+export const RECEIVE_REPORTS_SUCCESS = 'RECEIVE_REPORTS_SUCCESS';
+export const RECEIVE_REPORTS_ERROR = 'RECEIVE_REPORTS_ERROR';

app/assets/javascripts/reports/store/mutations.js

+/* eslint-disable no-param-reassign */
+import * as types from './mutation_types';
+
+export default {
+  [types.SET_ENDPOINT](state, endpoint) {
+    state.endpoint = endpoint;
+  },
+  [types.REQUEST_REPORTS](state) {
+    state.isLoading = true;
+  },
+  [types.RECEIVE_REPORTS_SUCCESS](state, response) {
+
+    state.isLoading = false;
+
+    state.summary.total = response.summary.total;
+    state.summary.resolved = response.summary.resolved;
+    state.summary.failed = response.summary.failed;
+
+    state.reports = response.suites;
+
+  },
+  [types.RECEIVE_REPORTS_ERROR](state) {
+    state.isLoading = false;
+    state.hasError = true;
+  },
+};

app/assets/javascripts/reports/store/state.js

+export default () => ({
+  endpoint: null,
+
+  isLoading: false,
+  hasError: false,
+
+  summary: {
+    total: 0,
+    resolved: 0,
+    failed: 0,
+  },
+
+  /**
+   * Each report will have the following format:
+   * {
+   *   name: {String},
+   *   summary: {
+   *     total: {Number},
+   *     resolved: {Number},
+   *     failed: {Number},
+   *   },
+   *   new_failures: {Array.<Object>},
+   *   resolved_failures: {Array.<Object>},
+   *   existing_failures: {Array.<Object>},
+   * }
+   */
+  reports: [],
+});

app/assets/javascripts/vue_shared/components/clipboard_button.vue

@@ -13,12 +13,19 @@
  * />
  */
 import tooltip from '../directives/tooltip';
+import Icon from '../components/icon.vue';
 
 export default {
   name: 'ClipboardButton',
+
   directives: {
     tooltip,
   },
+
+  components: {
+    Icon,
+  },
+
   props: {
     text: {
       type: String,
@@ -58,10 +65,6 @@ export default {
     type="button"
     class="btn"
   >
-    <i
-      aria-hidden="true"
-      class="fa fa-clipboard"
-    >
-    </i>
+    <icon name="duplicate" />
   </button>
 </template>

app/assets/stylesheets/framework/buttons.scss

@@ -294,6 +294,10 @@
 .btn-clipboard {
   border: 0;
   padding: 0 5px;
+
+  svg {
+    top: auto;
+  }
 }
 
 .input-group-prepend,

app/assets/stylesheets/pages/commits.scss

@@ -209,7 +209,7 @@
   > .ci-status-link,
   > .btn,
   > .commit-sha-group {
-    margin-left: $gl-padding-8;
+    margin-left: $gl-padding;
   }
 }
 
@@ -239,10 +239,6 @@
     fill: $gl-text-color-secondary;
   }
 
-  .fa-clipboard {
-    color: $gl-text-color-secondary;
-  }
-
   :first-child {
     border-bottom-left-radius: $border-radius-default;
     border-top-left-radius: $border-radius-default;

app/helpers/button_helper.rb

@@ -51,7 +51,7 @@ module ButtonHelper
     }
 
     content_tag :button, button_attributes do
-      concat(icon('clipboard', 'aria-hidden': 'true')) unless hide_button_icon
+      concat(sprite_icon('duplicate')) unless hide_button_icon
       concat(button_text)
     end
   end

app/helpers/ci_status_helper.rb

@@ -56,7 +56,7 @@ module CiStatusHelper
     status.humanize
   end
 
-  def ci_icon_for_status(status)
+  def ci_icon_for_status(status, size: 16)
     if detailed_status?(status)
       return sprite_icon(status.icon)
     end
@@ -85,7 +85,7 @@ module CiStatusHelper
         'status_canceled'
       end
 
-    sprite_icon(icon_name, size: 16)
+    sprite_icon(icon_name, size: size)
   end
 
   def pipeline_status_cache_key(pipeline_status)
@@ -111,7 +111,8 @@ module CiStatusHelper
       'commit',
       commit.status(ref),
       path,
-      tooltip_placement: tooltip_placement)
+      tooltip_placement: tooltip_placement,
+      icon_size: 24)
   end
 
   def render_pipeline_status(pipeline, tooltip_placement: 'left')
@@ -125,16 +126,16 @@ module CiStatusHelper
       Ci::Runner.instance_type.blank?
   end
 
-  def render_status_with_link(type, status, path = nil, tooltip_placement: 'left', cssclass: '', container: 'body')
+  def render_status_with_link(type, status, path = nil, tooltip_placement: 'left', cssclass: '', container: 'body', icon_size: 16)
     klass = "ci-status-link ci-status-icon-#{status.dasherize} #{cssclass}"
     title = "#{type.titleize}: #{ci_label_for_status(status)}"
     data = { toggle: 'tooltip', placement: tooltip_placement, container: container }
 
     if path
-      link_to ci_icon_for_status(status), path,
+      link_to ci_icon_for_status(status, size: icon_size), path,
               class: klass, title: title, data: data
     else
-      content_tag :span, ci_icon_for_status(status),
+      content_tag :span, ci_icon_for_status(status, size: icon_size),
               class: klass, title: title, data: data
     end
   end

app/helpers/commits_helper.rb

@@ -145,15 +145,14 @@ module CommitsHelper
         person_name
       end
 
-    options = {
-      class: "commit-#{options[:source]}-link has-tooltip",
-      title: source_email
+    link_options = {
+      class: "commit-#{options[:source]}-link"
     }
 
     if user.nil?
-      mail_to(source_email, text, options)
+      mail_to(source_email, text, link_options)
     else
-      link_to(text, user_path(user), options)
+      link_to(text, user_path(user), link_options)
     end
   end
 

app/services/projects/import_service.rb

@@ -25,7 +25,7 @@ module Projects
 
       success
     rescue => e
-      error("Error importing repository #{project.import_url} into #{project.full_path} - #{e.message}")
+      error("Error importing repository #{project.safe_import_url} into #{project.full_path} - #{e.message}")
     end
 
     private

app/uploaders/import_export_uploader.rb

+# frozen_string_literal: true
+
 class ImportExportUploader < AttachmentUploader
   EXTENSION_WHITELIST = %w[tar.gz].freeze
 

app/views/projects/blame/show.html.haml

@@ -18,7 +18,7 @@
               - commit = blame_group[:commit]
               %td.blame-commit{ class: age_map_class(commit.committed_date, project_duration) }
                 .commit
-                  = author_avatar(commit, size: 36)
+                  = author_avatar(commit, size: 36, has_tooltip: false)
                   .commit-row-title
                     %span.item-title.str-truncated-100
                       = link_to_markdown commit.title, project_commit_path(@project, commit.id), class: "cdark", title: commit.title

app/views/projects/blob/show.html.haml

@@ -3,6 +3,8 @@
 
 - page_title @blob.path, @ref
 
+.js-signature-container{ data: { 'signatures-path': namespace_project_signatures_path } }
+
 %div{ class: container_class }
   = render 'projects/last_push'
 

app/views/projects/commit/_commit_box.html.haml

@@ -10,7 +10,7 @@
     %span.d-none.d-sm-inline authored
     #{time_ago_with_tooltip(@commit.authored_date)}
     %span= s_('ByAuthor|by')
-    = author_avatar(@commit, size: 24)
+    = author_avatar(@commit, size: 24, has_tooltip: false)
     %strong
       = commit_author_link(@commit, avatar: true, size: 24)
     - if @commit.different_committer?

app/views/projects/commits/_commit.html.haml

@@ -23,7 +23,7 @@
   %li.commit.flex-row.js-toggle-container{ id: "commit-#{commit.short_id}" }
 
     .avatar-cell.d-none.d-sm-block
-      = author_avatar(commit, size: 36)
+      = author_avatar(commit, size: 36, has_tooltip: false)
 
     .commit-detail.flex-list
       .commit-content.qa-commit-content

app/views/projects/show.html.haml

@@ -8,6 +8,10 @@
 
 = render partial: 'flash_messages', locals: { project: @project }
 
+- if @project.repository_exists? && !@project.empty_repo?
+  - signatures_path = namespace_project_signatures_path(project_id: @project.path, id: @project.default_branch)
+  .js-signature-container{ data: { 'signatures-path': signatures_path } }
+
 %div{ class: [container_class, ("limit-container-width" unless fluid_layout)] }
   = render "projects/last_push"
 

app/views/projects/tree/show.html.haml

 - @no_container = true
 - breadcrumb_title _("Repository")
 - @content_class = "limit-container-width" unless fluid_layout
+- signatures_path = namespace_project_signatures_path(namespace_id: @project.namespace.path, project_id: @project.path, id: @ref)
 
 - page_title @path.presence || _("Files"), @ref
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits")
 
+.js-signature-container{ data: { 'signatures-path': signatures_path } }
+
 %div{ class: [(container_class), ("limit-container-width" unless fluid_layout)] }
   = render 'projects/last_push'
   = render 'projects/files', commit: @last_commit, project: @project, ref: @ref, content_url: project_tree_path(@project, @id)

app/views/sherlock/queries/_general.html.haml

@@ -27,7 +27,7 @@
     .card-header
       .float-right
         %button.js-clipboard-trigger.btn.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
-          %i.fa.fa-clipboard
+          = sprite_icon('duplicate')
         %pre.hidden
           = @query.formatted_query
       %strong
@@ -42,7 +42,7 @@
     .card-header
       .float-right
         %button.js-clipboard-trigger.btn.btn-sm{ title: t('sherlock.copy_to_clipboard'), type: :button }
-          %i.fa.fa-clipboard
+          = sprite_icon('duplicate')
         %pre.hidden
           = @query.explain
       %strong

app/workers/concerns/each_shard_worker.rb

+# frozen_string_literal: true
+
 module EachShardWorker
   extend ActiveSupport::Concern
   include ::Gitlab::Utils::StrongMemoize

app/workers/delete_diff_files_worker.rb

+# frozen_string_literal: true
+
 class DeleteDiffFilesWorker
   include ApplicationWorker
 

app/workers/repository_check/dispatch_worker.rb

+# frozen_string_literal: true
+
 module RepositoryCheck
   class DispatchWorker
     include ApplicationWorker

changelogs/unreleased/29278-commits-page-tooltips.yml

+---
+title: Remove tooltips from commit author avatar and name in commit lists
+merge_request: 20674
+author:
+type: other

changelogs/unreleased/45318-vuex-store.yml

+---
+title: Adds Vuex store for reports section in MR widget
+merge_request: 20709
+author:
+type: added

changelogs/unreleased/49272-sanitize-git-url-in-import-errors.yml

+---
+title: Sanitize git URL in import errors
+merge_request:
+author: Jamie Schembri
+type: fixed

changelogs/unreleased/blackst0ne-replace-sidekiq-inline-with-perform-enqueued-jobs.yml

+---
+title: Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs'
+merge_request: 20768
+author: "@blackst0ne"
+type: other

changelogs/unreleased/frozen-string-vestigial.yml

+---
+title: Enable frozen string in newly added files to previously processed directories
+merge_request: 20763
+author: gfyoung
+type: performance

changelogs/unreleased/sh-enable-frozen-literals-banzi-filters.yml

+---
+title: Enable frozen strings in remaining lib/banzai/filter/*.rb files
+merge_request: 20777
+author:
+type: performance

changelogs/unreleased/sh-freeze-banzai-filter-strings.yml

+---
+title: Enable frozen strings in lib/banzai/filter/*.rb
+merge_request: 20775
+author:
+type: performance

changelogs/unreleased/sh-remove-banzai-instrumentation.yml

+---
+title: Remove method instrumentation for Banzai filters and reference parsers
+merge_request: 20770
+author:
+type: performance

changelogs/unreleased/tz-mr-refactor-memory-reduction.yml

+---
+title: Reduces the client side memory footprint on merge requests
+merge_request: 20744
+author:
+type: performance

changelogs/unreleased/winh-tree-view-gpg.yml

+---
+title: Display GPG status on repository and blob pages
+merge_request: 20524
+author:
+type: changed

config/initializers/8_metrics.rb

@@ -58,20 +58,6 @@ def instrument_classes(instrumentation)
     instrumentation.instrument_instance_methods(const)
   end
 
-  # Instruments all Banzai filters and reference parsers
-  {
-    Filter: Rails.root.join('lib', 'banzai', 'filter', '*.rb'),
-    ReferenceParser: Rails.root.join('lib', 'banzai', 'reference_parser', '*.rb')
-  }.each do |const_name, path|
-    Dir[path].each do |file|
-      klass = File.basename(file, File.extname(file)).camelize
-      const = Banzai.const_get(const_name).const_get(klass)
-
-      instrumentation.instrument_methods(const)
-      instrumentation.instrument_instance_methods(const)
-    end
-  end
-
   instrumentation.instrument_methods(Banzai::Renderer)
   instrumentation.instrument_methods(Banzai::Querying)
 
@@ -94,8 +80,6 @@ def instrument_classes(instrumentation)
 
   instrumentation.instrument_instance_methods(RepositoryCheck::SingleRepositoryWorker)
 
-  instrumentation.instrument_instance_methods(Rouge::Plugins::CommonMark)
-  instrumentation.instrument_instance_methods(Rouge::Plugins::Redcarpet)
   instrumentation.instrument_instance_methods(Rouge::Formatters::HTMLGitlab)
 
   [:XML, :HTML].each do |namespace|

doc/administration/pages/index.md

@@ -267,7 +267,6 @@ Omnibus GitLab 11.1.
 Follow the steps below to configure verbose logging of GitLab Pages daemon.
 
 1. By default the daemon only logs with `INFO` level.
-
    If you wish to make it log events with level `DEBUG` you must configure this in
    `/etc/gitlab/gitlab.rb`:
 

doc/ci/variables/README.md

@@ -66,7 +66,11 @@ future GitLab releases.**
 | **CI_JOB_MANUAL**               | 8.12   | all    | The flag to indicate that job was manually started |
 | **CI_JOB_NAME**                 | 9.0    | 0.5    | The name of the job as defined in `.gitlab-ci.yml` |
 | **CI_JOB_STAGE**                | 9.0    | 0.5    | The name of the stage as defined in `.gitlab-ci.yml` |
+<<<<<<< HEAD
 | **CI_JOB_TOKEN**                | 9.0    | 1.2    | Token used for authenticating with [GitLab Container Registry][registry], downloading [dependent repositories][dependent-repositories], authenticate with multi-project pipelines when [triggers][trigger-job-token] are involved, and for [downloading job artifacts][get-job-artifacts]  |
+=======
+| **CI_JOB_TOKEN**                | 9.0    | 1.2    | Token used for authenticating with the [GitLab Container Registry][registry] and downloading [dependent repositories][dependent-repositories] |
+>>>>>>> upstream/master
 | **CI_JOB_URL**                  | 11.1   | 0.5    | Job details URL |
 | **CI_REPOSITORY_URL**           | 9.0    | all    | The URL to clone the Git repository |
 | **CI_RUNNER_DESCRIPTION**       | 8.10   | 0.5    | The description of the runner as saved in GitLab |
@@ -590,5 +594,9 @@ Below you can find supported syntax reference:
 [trigger-job-token]: ../triggers/README.md#ci-job-token
 [gitlab-deploy-token]: ../../user/project/deploy_tokens/index.md#gitlab-deploy-token
 [registry]: ../../user/project/container_registry.md
+<<<<<<< HEAD
 [dependent-repositories]: ../../user/project/new_ci_build_permissions_model.md#dependent-repositories
 [get-job-artifacts]:  ../../api/jobs.html#get-job-artifacts
+=======
+[dependent-repositories]: ../../user/project/new_ci_build_permissions_model.md#dependent-repositories
+>>>>>>> upstream/master

doc/topics/autodevops/index.md

@@ -591,7 +591,7 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac
 | `CANARY_ENABLED`             | From GitLab 11.0, this variable can be used to define a [deploy policy for canary environments](#deploy-policy-for-canary-environments). |
 | `INCREMENTAL_ROLLOUT_ENABLED`| From GitLab 10.8, this variable can be used to enable an [incremental rollout](#incremental-rollout-to-production) of your application for the production environment. |
 | `TEST_DISABLED`              | From GitLab 11.0, this variable can be used to disable the `test` job. If the variable is present, the job will not be created. |
-| `CODEQUALITY_DISABLED`       | From GitLab 11.0, this variable can be used to disable the `codequality` job. If the variable is present, the job will not be created. |
+| `CODE_QUALITY_DISABLED`       | From GitLab 11.0, this variable can be used to disable the `codequality` job. If the variable is present, the job will not be created. |
 | `SAST_DISABLED`              | From GitLab 11.0, this variable can be used to disable the `sast` job. If the variable is present, the job will not be created. |
 | `DEPENDENCY_SCANNING_DISABLED` | From GitLab 11.0, this variable can be used to disable the `dependency_scanning` job. If the variable is present, the job will not be created. |
 | `CONTAINER_SCANNING_DISABLED` | From GitLab 11.0, this variable can be used to disable the `sast:container` job. If the variable is present, the job will not be created. |

doc/update/mysql_to_postgresql.md

@@ -200,6 +200,12 @@ sudo apt-get install pgloader
     sudo -u git cp config/database.yml.postgresql config/database.yml
     sudo -u git -H chmod o-rwx config/database.yml
     ```
+1. Install Gems related to Postgresql
+
+    ``` bash
+    sudo -u git -H rm .bundle/config
+    sudo -u git -H bundle install --deployment --without development test mysql aws kerberos
+    ```
 
 1. Run the following commands to prepare the schema:
 

lib/banzai/filter/absolute_link_filter.rb

+# frozen_string_literal: true
+
 require 'uri'
 
 module Banzai

lib/banzai/filter/abstract_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # Issues, Merge Requests, Snippets, Commits and Commit Ranges share

lib/banzai/filter/ascii_doc_post_processing_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     class AsciiDocPostProcessingFilter < HTML::Pipeline::Filter

lib/banzai/filter/autolink_filter.rb

+# frozen_string_literal: true
+
 require 'uri'
 
 module Banzai

lib/banzai/filter/blockquote_fence_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     class BlockquoteFenceFilter < HTML::Pipeline::TextFilter

lib/banzai/filter/color_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that renders `color` followed by a color "chip".

lib/banzai/filter/commit_range_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces commit range references with links.

lib/banzai/filter/commit_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces commit references with links.

lib/banzai/filter/commit_trailers_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces users' names and emails in commit trailers

lib/banzai/filter/emoji_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces :emoji: and unicode with images.

lib/banzai/filter/epic_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # The actual filter is implemented in the EE mixin

lib/banzai/filter/external_issue_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces external issue tracker references with links.

lib/banzai/filter/external_link_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML Filter to modify the attributes of external links

lib/banzai/filter/gollum_tags_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML Filter for parsing Gollum's tags in HTML. It's only parses the

lib/banzai/filter/html_entity_filter.rb

+# frozen_string_literal: true
+
 require 'erb'
 
 module Banzai

lib/banzai/filter/image_lazy_load_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that moves the value of image `src` attributes to `data-src`
@@ -5,7 +7,7 @@ module Banzai
     class ImageLazyLoadFilter < HTML::Pipeline::Filter
       def call
         doc.xpath('descendant-or-self::img').each do |img|
-          img['class'] ||= '' << 'lazy'
+          img.add_class('lazy')
           img['data-src'] = img['src']
           img['src'] = LazyImageTagHelper.placeholder_image
         end

lib/banzai/filter/image_link_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that wraps links around inline images.

lib/banzai/filter/inline_diff_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     class InlineDiffFilter < HTML::Pipeline::Filter

lib/banzai/filter/issuable_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     class IssuableReferenceFilter < AbstractReferenceFilter

lib/banzai/filter/issuable_state_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that appends state information to issuable links.

lib/banzai/filter/issue_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces issue references with links. References to

lib/banzai/filter/label_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces label references with links.

lib/banzai/filter/markdown_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     class MarkdownFilter < HTML::Pipeline::TextFilter

lib/banzai/filter/math_filter.rb

+# frozen_string_literal: true
+
 require 'uri'
 
 module Banzai

lib/banzai/filter/merge_request_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces merge request references with links. References

lib/banzai/filter/mermaid_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     class MermaidFilter < HTML::Pipeline::Filter

lib/banzai/filter/milestone_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces milestone references with links.

lib/banzai/filter/plantuml_filter.rb

+# frozen_string_literal: true
+
 require "nokogiri"
 require "asciidoctor-plantuml/plantuml"
 

lib/banzai/filter/redactor_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that removes references to records that the current user does

lib/banzai/filter/reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # Base class for GitLab Flavored Markdown reference filters.

lib/banzai/filter/relative_link_filter.rb

+# frozen_string_literal: true
+
 require 'uri'
 
 module Banzai

lib/banzai/filter/sanitization_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # Sanitize HTML

lib/banzai/filter/set_direction_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that sets dir="auto" for RTL languages support

lib/banzai/filter/snippet_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces snippet references with links. References to

lib/banzai/filter/syntax_highlight_filter.rb

+# frozen_string_literal: true
+
 require 'rouge/plugins/common_mark'
 require 'rouge/plugins/redcarpet'
 
@@ -15,7 +17,7 @@ module Banzai
       end
 
       def highlight_node(node)
-        css_classes = 'code highlight js-syntax-highlight'
+        css_classes = +'code highlight js-syntax-highlight'
         lang = node.attr('lang')
         retried = false
 

lib/banzai/filter/table_of_contents_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that adds an anchor child element to all Headers in a
@@ -19,7 +21,7 @@ module Banzai
       def call
         return doc if context[:no_header_anchors]
 
-        result[:toc] = ""
+        result[:toc] = +""
 
         headers = Hash.new(0)
         header_root = current_header = HeaderNode.new

lib/banzai/filter/task_list_filter.rb

+# frozen_string_literal: true
+
 require 'task_list/filter'
 
 module Banzai

lib/banzai/filter/user_reference_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # HTML filter that replaces user or group references with links.

lib/banzai/filter/video_link_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     # Find every image that isn't already wrapped in an `a` tag, and that has

lib/banzai/filter/wiki_link_filter.rb

+# frozen_string_literal: true
+
 require 'uri'
 
 module Banzai

lib/banzai/filter/yaml_front_matter_filter.rb

+# frozen_string_literal: true
+
 module Banzai
   module Filter
     class YamlFrontMatterFilter < HTML::Pipeline::Filter

lib/feature.rb

@@ -39,7 +39,7 @@ class Feature
       # Flipper creates on-memory features when asked for a not-yet-created one.
       # If we want to check if a feature has been actually set, we look for it
       # on the persisted features list.
-      persisted_names.include?(feature.name)
+      persisted_names.include?(feature.name.to_s)
     end
 
     def enabled?(key, thing = nil)

locale/gitlab.pot

@@ -542,10 +542,14 @@ msgstr ""
 msgid "An error occurred while importing project: ${details}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "An error occurred while initializing path locks"
 msgstr ""
 
 msgid "An error occurred while loading commits"
+=======
+msgid "An error occurred while loading commit signatures"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "An error occurred while loading diff"

spec/features/projects/commits/user_browses_commits_spec.rb

@@ -238,6 +238,5 @@ def check_author_link(email, author)
   author_link = find('.commit-author-link')
 
   expect(author_link['href']).to eq(user_path(author))
-  expect(author_link['title']).to eq(email)
   expect(find('.commit-author-name').text).to eq(author.name)
 end

spec/features/signed_commits_spec.rb

@@ -7,7 +7,7 @@ describe 'GPG signed commits', :js do
     user = create :user, email: 'unrelated.user@example.org'
     project.add_maintainer(user)
 
-    Sidekiq::Testing.inline! do
+    perform_enqueued_jobs do
       create :gpg_key, key: GpgHelpers::User1.public_key, user: user
     end
 
@@ -21,7 +21,7 @@ describe 'GPG signed commits', :js do
     end
 
     # user changes his email which makes the gpg key verified
-    Sidekiq::Testing.inline! do
+    perform_enqueued_jobs do
       user.skip_reconfirmation!
       user.update!(email: GpgHelpers::User1.emails.first)
     end
@@ -48,7 +48,7 @@ describe 'GPG signed commits', :js do
     end
 
     # user adds the gpg key which makes the signature valid
-    Sidekiq::Testing.inline! do
+    perform_enqueued_jobs do
       create :gpg_key, key: GpgHelpers::User1.public_key, user: user
     end
 
@@ -66,7 +66,7 @@ describe 'GPG signed commits', :js do
     end
 
     let(:user_1_key) do
-      Sidekiq::Testing.inline! do
+      perform_enqueued_jobs do
         create :gpg_key, key: GpgHelpers::User1.public_key, user: user_1
       end
     end
@@ -79,7 +79,7 @@ describe 'GPG signed commits', :js do
     end
 
     let(:user_2_key) do
-      Sidekiq::Testing.inline! do
+      perform_enqueued_jobs do
         create :gpg_key, key: GpgHelpers::User2.public_key, user: user_2
       end
     end

spec/helpers/button_helper_spec.rb

@@ -121,6 +121,8 @@ describe ButtonHelper do
   end
 
   describe 'clipboard_button' do
+    include IconsHelper
+
     let(:user) { create(:user) }
     let(:project) { build_stubbed(:project) }
 
@@ -145,7 +147,7 @@ describe ButtonHelper do
           expect(element.attr('data-clipboard-text')).to eq(nil)
           expect(element.inner_text).to eq("")
 
-          expect(element).to have_selector('.fa.fa-clipboard')
+          expect(element.to_html).to include sprite_icon('duplicate')
         end
       end
 
@@ -178,7 +180,7 @@ describe ButtonHelper do
 
     context 'with `hide_button_icon` attribute provided' do
       it 'shows copy to clipboard button without tooltip support' do
-        expect(element(hide_button_icon: true)).not_to have_selector('.fa.fa-clipboard')
+        expect(element(hide_button_icon: true).to_html).not_to include sprite_icon('duplicate')
       end
     end
   end

spec/javascripts/diffs/components/diff_line_gutter_content_spec.js

@@ -50,7 +50,11 @@ describe('DiffLineGutterContent', () => {
 
       it('should return discussions for the given lineCode', () => {
         const { lineCode } = getDiffFileMock().highlightedDiffLines[1];
-        const component = createComponent({ lineCode, showCommentButton: true });
+        const component = createComponent({
+          lineCode,
+          showCommentButton: true,
+          discussions: getDiscussionsMockData(),
+        });
 
         setDiscussions(component);