.gitlab-ci.yml

@@ -9,6 +9,7 @@ stages:
   - review
   - qa
   - post-test
+  - notification
   - pages
 
 variables:
@@ -33,6 +34,7 @@ include:
   - local: .gitlab/ci/frontend.gitlab-ci.yml
   - local: .gitlab/ci/global.gitlab-ci.yml
   - local: .gitlab/ci/memory.gitlab-ci.yml
+  - local: .gitlab/ci/notifications.gitlab-ci.yml
   - local: .gitlab/ci/pages.gitlab-ci.yml
   - local: .gitlab/ci/qa.gitlab-ci.yml
   - local: .gitlab/ci/reports.gitlab-ci.yml

.gitlab/ci/global.gitlab-ci.yml

@@ -93,7 +93,7 @@
   - "config.ru"
   - "{package.json,yarn.lock}"
   - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
-  - "doc/api/graphql/**/*"
+  - "doc/api/graphql/reference/*" # Files in this folder are auto-generated
 
 .backstage-patterns: &backstage-patterns
   - "Dangerfile"
@@ -139,7 +139,7 @@
       - "config.ru"
       - "{package.json,yarn.lock}"
       - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
-      - "doc/api/graphql/**/*"
+      - "doc/api/graphql/reference/*" # Files in this folder are auto-generated
       # Backstage changes
       - "Dangerfile"
       - "danger/**/*"
@@ -163,7 +163,7 @@
       - "config.ru"
       - "{package.json,yarn.lock}"
       - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
-      - "doc/api/graphql/**/*"
+      - "doc/api/graphql/reference/*" # Files in this folder are auto-generated
       # QA changes
       - ".dockerignore"
       - "qa/**/*"
@@ -183,7 +183,7 @@
       - "config.ru"
       - "{package.json,yarn.lock}"
       - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
-      - "doc/api/graphql/**/*"
+      - "doc/api/graphql/reference/*" # Files in this folder are auto-generated
       # Backstage changes
       - "Dangerfile"
       - "danger/**/*"

.gitlab/ci/notifications.gitlab-ci.yml

+.notify:
+  image: alpine
+  stage: notification
+  dependencies: []
+  cache: {}
+  before_script:
+    - apk update && apk add git curl bash
+  variables:
+    COMMIT_NOTES_URL: "https://$CI_SERVER_HOST/$CI_PROJECT_PATH/commit/$CI_COMMIT_SHA#notes-list"
+
+schedule:package-and-qa:notify-failure:
+  extends:
+    - .only:variables_refs-canonical-dot-com-schedules
+    - .notify
+  script:
+    - 'scripts/notify-slack qa-master ":skull_and_crossbones: Scheduled QA against master failed! :skull_and_crossbones: See $CI_PIPELINE_URL. For downstream pipelines, see $COMMIT_NOTES_URL" ci_failing'
+  needs: ["schedule:package-and-qa"]
+  when: on_failure

.gitlab/ci/review.gitlab-ci.yml

@@ -94,10 +94,7 @@ schedule:review-build-cng:
   variables:
     HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
     DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
-    # v2.4.4 + two improvements:
-    # - Allow to pass an EE license when installing the chart: https://gitlab.com/gitlab-org/charts/gitlab/merge_requests/1008
-    # - Allow to customize the livenessProbe for `gitlab-shell`: https://gitlab.com/gitlab-org/charts/gitlab/merge_requests/1021
-    GITLAB_HELM_CHART_REF: "6c655ed77e60f1f7f533afb97bef8c9cb7dc61eb"
+    GITLAB_HELM_CHART_REF: "v2.5.1"
     GITLAB_EDITION: "ce"
   environment:
     name: review/${CI_COMMIT_REF_NAME}
@@ -135,13 +132,11 @@ review-deploy:
     - .review-deploy-base
     - .only-review
     - .only:changes-code-qa
-  needs: ["review-build-cng"]
 
 schedule:review-deploy:
   extends:
     - .review-deploy-base
     - .only-review-schedules
-  needs: ["schedule:review-build-cng"]
 
 .base-review-stop:
   extends:

GITALY_SERVER_VERSION

-1.73.0
+1.74.0

Gemfile

@@ -264,7 +264,7 @@ gem 'licensee', '~> 8.9'
 gem 'ace-rails-ap', '~> 4.1.0'
 
 # Detect and convert string character encoding
-gem 'charlock_holmes', '~> 0.7.7'
+gem 'charlock_holmes', '~> 0.7.5'
 
 # Detect mime content type from content
 gem 'mimemagic', '~> 0.3.2'

Gemfile.lock

@@ -142,7 +142,7 @@ GEM
       mime-types (>= 1.16)
     cause (0.1)
     character_set (1.1.2)
-    charlock_holmes (0.7.7)
+    charlock_holmes (0.7.6)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
@@ -1143,7 +1143,7 @@ DEPENDENCIES
   capybara (~> 3.22.0)
   capybara-screenshot (~> 1.0.22)
   carrierwave (~> 1.3)
-  charlock_holmes (~> 0.7.7)
+  charlock_holmes (~> 0.7.5)
   chronic (~> 0.10.2)
   commonmarker (~> 0.20)
   concurrent-ruby (~> 1.1)

VERSION

-12.5.0-pre
+12.6.0-pre

app/assets/javascripts/api.js

@@ -5,6 +5,8 @@ import { joinPaths } from './lib/utils/url_utility';
 import flash from '~/flash';
 import { __ } from '~/locale';
 
+const DEFAULT_PER_PAGE = 20;
+
 const Api = {
   groupsPath: '/api/:version/groups.json',
   groupPath: '/api/:version/groups/:id',
@@ -66,7 +68,7 @@ const Api = {
         params: Object.assign(
           {
             search: query,
-            per_page: 20,
+            per_page: DEFAULT_PER_PAGE,
           },
           options,
         ),
@@ -90,7 +92,7 @@ const Api = {
       .get(url, {
         params: {
           search: query,
-          per_page: 20,
+          per_page: DEFAULT_PER_PAGE,
         },
       })
       .then(({ data }) => callback(data));
@@ -101,7 +103,7 @@ const Api = {
     const url = Api.buildUrl(Api.projectsPath);
     const defaults = {
       search: query,
-      per_page: 20,
+      per_page: DEFAULT_PER_PAGE,
       simple: true,
     };
 
@@ -126,7 +128,7 @@ const Api = {
       .get(url, {
         params: {
           search: query,
-          per_page: 20,
+          per_page: DEFAULT_PER_PAGE,
           ...options,
         },
       })
@@ -235,7 +237,7 @@ const Api = {
     const url = Api.buildUrl(Api.groupProjectsPath).replace(':id', groupId);
     const defaults = {
       search: query,
-      per_page: 20,
+      per_page: DEFAULT_PER_PAGE,
     };
     return axios
       .get(url, {
@@ -325,7 +327,7 @@ const Api = {
       params: Object.assign(
         {
           search: query,
-          per_page: 20,
+          per_page: DEFAULT_PER_PAGE,
         },
         options,
       ),
@@ -355,7 +357,7 @@ const Api = {
     const url = Api.buildUrl(Api.userProjectsPath).replace(':id', userId);
     const defaults = {
       search: query,
-      per_page: 20,
+      per_page: DEFAULT_PER_PAGE,
     };
     return axios
       .get(url, {
@@ -371,7 +373,7 @@ const Api = {
     return axios.get(url, {
       params: {
         search: query,
-        per_page: 20,
+        per_page: DEFAULT_PER_PAGE,
         ...options,
       },
     });
@@ -403,10 +405,15 @@ const Api = {
     return axios.post(url);
   },
 
-  releases(id) {
+  releases(id, options = {}) {
     const url = Api.buildUrl(this.releasesPath).replace(':id', encodeURIComponent(id));
 
-    return axios.get(url);
+    return axios.get(url, {
+      params: {
+        per_page: DEFAULT_PER_PAGE,
+        ...options,
+      },
+    });
   },
 
   release(projectPath, tagName) {

app/assets/javascripts/boards/index.js

@@ -16,7 +16,6 @@ import '~/boards/models/project';
 import store from '~/boards/stores';
 import boardsStore from '~/boards/stores/boards_store';
 import ModalStore from '~/boards/stores/modal_store';
-import BoardService from 'ee_else_ce/boards/services/board_service';
 import modalMixin from '~/boards/mixins/modal_mixins';
 import '~/boards/filters/due_date_filters';
 import Board from 'ee_else_ce/boards/components/board';
@@ -97,7 +96,6 @@ export default () => {
         bulkUpdatePath: this.bulkUpdatePath,
         boardId: this.boardId,
       });
-      gl.boardService = new BoardService();
       boardsStore.rootPath = this.boardsEndpoint;
 
       eventHub.$on('updateTokens', this.updateTokens);
@@ -116,7 +114,7 @@ export default () => {
       this.filterManager.setup();
 
       boardsStore.disabled = this.disabled;
-      gl.boardService
+      boardsStore
         .all()
         .then(res => res.data)
         .then(lists => {
@@ -155,7 +153,8 @@ export default () => {
           newIssue.setFetchingState('subscriptions', true);
           setWeigthFetchingState(newIssue, true);
           setEpicFetchingState(newIssue, true);
-          BoardService.getIssueInfo(sidebarInfoEndpoint)
+          boardsStore
+            .getIssueInfo(sidebarInfoEndpoint)
             .then(res => res.data)
             .then(data => {
               const {
@@ -211,7 +210,8 @@ export default () => {
         const { issue } = boardsStore.detail;
         if (issue.id === id && issue.toggleSubscriptionEndpoint) {
           issue.setFetchingState('subscriptions', true);
-          BoardService.toggleIssueSubscription(issue.toggleSubscriptionEndpoint)
+          boardsStore
+            .toggleIssueSubscription(issue.toggleSubscriptionEndpoint)
             .then(() => {
               issue.setFetchingState('subscriptions', false);
               issue.updateData({

app/assets/javascripts/clusters/components/applications.vue

@@ -170,7 +170,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
           ),
         ),
         {
-          gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ce/user/project/integrations/crossplane.html"
+          gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ee/user/clusters/applications.html#crossplane"
           target="_blank" rel="noopener noreferrer">
           ${_.escape(s__('ClusterIntegration|Gitlab Integration'))}</a>`,
           kubectl: `<code>kubectl</code>`,

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

@@ -48,7 +48,7 @@ export default {
     });
   },
   [types.RECEIVE_SEARCHED_ITEMS_SUCCESS](state, results) {
-    const rawItems = results.data;
+    const rawItems = results.data ? results.data : results; // Api.groups returns array, Api.projects returns object
     Object.assign(state, {
       items: rawItems.map(rawItem => ({
         id: rawItem.id,

app/assets/javascripts/lib/utils/datetime_utility.js

@@ -602,3 +602,19 @@ export const getDatesInRange = (d1, d2, formatter = x => x) => {
  * @return {Number} number of milliseconds
  */
 export const secondsToMilliseconds = seconds => seconds * 1000;
+
+/**
+ * Converts the supplied number of seconds to days.
+ *
+ * @param {Number} seconds
+ * @return {Number} number of days
+ */
+export const secondsToDays = seconds => Math.round(seconds / 86400);
+
+/**
+ * Returns the date after the date provided
+ *
+ * @param {Date} date the initial date
+ * @return {Date} the date following the date provided
+ */
+export const dayAfter = date => new Date(newDate(date).setDate(date.getDate() + 1));

app/assets/javascripts/lib/utils/text_markdown.js

-/* eslint-disable func-names, no-var, no-param-reassign, one-var, operator-assignment, no-else-return, consistent-return */
+/* eslint-disable func-names, no-param-reassign, operator-assignment, no-else-return, consistent-return */
 import $ from 'jquery';
 import { insertText } from '~/lib/utils/common_utils';
 
@@ -13,8 +13,7 @@ function addBlockTags(blockTag, selected) {
 }
 
 function lineBefore(text, textarea) {
-  var split;
-  split = text
+  const split = text
     .substring(0, textarea.selectionStart)
     .trim()
     .split('\n');
@@ -80,7 +79,7 @@ function moveCursor({
   editorSelectionStart,
   editorSelectionEnd,
 }) {
-  var pos;
+  let pos;
   if (textArea && !textArea.setSelectionRange) {
     return;
   }
@@ -132,18 +131,13 @@ export function insertMarkdownText({
   select,
   editor,
 }) {
-  var textToInsert,
-    selectedSplit,
-    startChar,
-    removedLastNewLine,
-    removedFirstNewLine,
-    currentLineEmpty,
-    lastNewLine,
-    editorSelectionStart,
-    editorSelectionEnd;
-  removedLastNewLine = false;
-  removedFirstNewLine = false;
-  currentLineEmpty = false;
+  let removedLastNewLine = false;
+  let removedFirstNewLine = false;
+  let currentLineEmpty = false;
+  let editorSelectionStart;
+  let editorSelectionEnd;
+  let lastNewLine;
+  let textToInsert;
 
   if (editor) {
     const selectionRange = editor.getSelectionRange();
@@ -186,7 +180,7 @@ export function insertMarkdownText({
     }
   }
 
-  selectedSplit = selected.split('\n');
+  const selectedSplit = selected.split('\n');
 
   if (editor && !wrap) {
     lastNewLine = editor.getValue().split('\n')[editorSelectionStart.row];
@@ -207,8 +201,7 @@ export function insertMarkdownText({
     (textArea && textArea.selectionStart === 0) ||
     (editor && editorSelectionStart.column === 0 && editorSelectionStart.row === 0);
 
-  startChar = !wrap && !currentLineEmpty && !isBeginning ? '\n' : '';
-
+  const startChar = !wrap && !currentLineEmpty && !isBeginning ? '\n' : '';
   const textPlaceholder = '{text}';
 
   if (selectedSplit.length > 1 && (!wrap || (blockTag != null && blockTag !== ''))) {
@@ -263,11 +256,10 @@ export function insertMarkdownText({
 }
 
 function updateText({ textArea, tag, cursorOffset, blockTag, wrap, select, tagContent }) {
-  var $textArea, selected, text;
-  $textArea = $(textArea);
+  const $textArea = $(textArea);
   textArea = $textArea.get(0);
-  text = $textArea.val();
-  selected = selectedText(text, textArea) || tagContent;
+  const text = $textArea.val();
+  const selected = selectedText(text, textArea) || tagContent;
   $textArea.focus();
   return insertMarkdownText({
     textArea,

app/assets/javascripts/monitoring/components/panel_type.vue

@@ -126,7 +126,7 @@ export default {
       />
       <gl-dropdown
         v-gl-tooltip
-        class="mx-2"
+        class="ml-auto mx-3"
         toggle-class="btn btn-transparent border-0"
         :right="true"
         :no-caret="true"

app/assets/javascripts/monitoring/stores/state.js

 import invalidUrl from '~/lib/utils/invalid_url';
 
 export default () => ({
-  hasMetrics: false,
-  showPanels: true,
   metricsEndpoint: null,
   environmentsEndpoint: null,
   deploymentsEndpoint: null,

app/assets/javascripts/notebook/cells/markdown.vue

 <script>
-/* global katex */
 import marked from 'marked';
 import sanitize from 'sanitize-html';
+import katex from 'katex';
 import Prompt from './prompt.vue';
 
 const renderer = new marked.Renderer();
@@ -70,7 +70,6 @@ renderer.paragraph = t => {
 };
 
 marked.setOptions({
-  sanitize: true,
   renderer,
 });
 
@@ -87,9 +86,66 @@ export default {
   computed: {
     markdown() {
       return sanitize(marked(this.cell.source.join('').replace(/\\/g, '\\\\')), {
-        allowedTags: false,
+        // allowedTags from GitLab's inline HTML guidelines
+        // https://docs.gitlab.com/ee/user/markdown.html#inline-html
+        allowedTags: [
+          'h1',
+          'h2',
+          'h3',
+          'h4',
+          'h5',
+          'h6',
+          'h7',
+          'h8',
+          'br',
+          'b',
+          'i',
+          'strong',
+          'em',
+          'a',
+          'pre',
+          'code',
+          'img',
+          'tt',
+          'div',
+          'ins',
+          'del',
+          'sup',
+          'sub',
+          'p',
+          'ol',
+          'ul',
+          'table',
+          'thead',
+          'tbody',
+          'tfoot',
+          'blockquote',
+          'dl',
+          'dt',
+          'dd',
+          'kbd',
+          'q',
+          'samp',
+          'var',
+          'hr',
+          'ruby',
+          'rt',
+          'rp',
+          'li',
+          'tr',
+          'td',
+          'th',
+          's',
+          'strike',
+          'span',
+          'abbr',
+          'abbr',
+          'summary',
+        ],
         allowedAttributes: {
-          '*': ['class'],
+          '*': ['class', 'style'],
+          a: ['href'],
+          img: ['src'],
         },
       });
     },
@@ -105,6 +161,15 @@ export default {
 </template>
 
 <style>
+/*
+  Importing the necessary katex stylesheet from the node_module folder rather
+  than copying the stylesheet into `app/assets/stylesheets/vendors` for
+  automatic importing via `app/assets/stylesheets/application.scss`. The reason
+  is that the katex stylesheet depends on many fonts that are in node_module
+  subfolders - moving all these fonts would make updating katex difficult.
+ */
+@import '~katex/dist/katex.min.css';
+
 .markdown .katex {
   display: block;
   text-align: center;

app/assets/javascripts/notes/components/discussion_counter.vue

@@ -19,6 +19,7 @@ export default {
       'resolvableDiscussionsCount',
       'firstUnresolvedDiscussionId',
       'unresolvedDiscussionsCount',
+      'getDiscussion',
     ]),
     isLoggedIn() {
       return this.getUserData.id;
@@ -40,9 +41,10 @@ export default {
     ...mapActions(['expandDiscussion']),
     jumpToFirstUnresolvedDiscussion() {
       const diffTab = window.mrTabs.currentAction === 'diffs';
-      const discussionId = this.firstUnresolvedDiscussionId(diffTab);
-
-      this.jumpToDiscussion(discussionId);
+      const discussionId =
+        this.firstUnresolvedDiscussionId(diffTab) || this.firstUnresolvedDiscussionId();
+      const firstDiscussion = this.getDiscussion(discussionId);
+      this.jumpToDiscussion(firstDiscussion);
     },
   },
 };

app/assets/javascripts/notes/components/discussion_keyboard_navigator.vue

@@ -19,7 +19,11 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['nextUnresolvedDiscussionId', 'previousUnresolvedDiscussionId']),
+    ...mapGetters([
+      'nextUnresolvedDiscussionId',
+      'previousUnresolvedDiscussionId',
+      'getDiscussion',
+    ]),
   },
   mounted() {
     Mousetrap.bind('n', () => this.jumpToNextDiscussion());
@@ -33,14 +37,14 @@ export default {
     ...mapActions(['expandDiscussion']),
     jumpToNextDiscussion() {
       const nextId = this.nextUnresolvedDiscussionId(this.currentDiscussionId, this.isDiffView);
-
-      this.jumpToDiscussion(nextId);
+      const nextDiscussion = this.getDiscussion(nextId);
+      this.jumpToDiscussion(nextDiscussion);
       this.currentDiscussionId = nextId;
     },
     jumpToPreviousDiscussion() {
       const prevId = this.previousUnresolvedDiscussionId(this.currentDiscussionId, this.isDiffView);
-
-      this.jumpToDiscussion(prevId);
+      const prevDiscussion = this.getDiscussion(prevId);
+      this.jumpToDiscussion(prevDiscussion);
       this.currentDiscussionId = prevId;
     },
   },

app/assets/javascripts/notes/components/noteable_discussion.vue

@@ -84,6 +84,7 @@ export default {
       'hasUnresolvedDiscussions',
       'showJumpToNextDiscussion',
       'getUserData',
+      'getDiscussion',
     ]),
     currentUser() {
       return this.getUserData;
@@ -221,8 +222,9 @@ export default {
         this.discussion.id,
         this.discussionsByDiffOrder,
       );
+      const nextDiscussion = this.getDiscussion(nextId);
 
-      this.jumpToDiscussion(nextId);
+      this.jumpToDiscussion(nextDiscussion);
     },
     deleteNoteHandler(note) {
       this.$emit('noteDeleted', this.discussion, note);