Add latest changes from gitlab-org/gitlab@master

.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

VERSION

-12.5.0-pre
+12.6.0-pre

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/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/repository/log_tree.js

@@ -7,8 +7,8 @@ import getRef from './queries/getRef.query.graphql';
 let fetchpromise;
 let resolvers = [];
-export function resolveCommit(commits, { resolve, entry }) {
-  const commit = commits.find(c => c.fileName === entry.name && c.type === entry.type);
+export function resolveCommit(commits, path, { resolve, entry }) {
+  const commit = commits.find(c => c.filePath === `${path}/${entry.name}` && c.type === entry.type);
   if (commit) {
     resolve(commit);
@@ -35,13 +35,13 @@ export function fetchLogsTree(client, path, offset, resolver = null) {
     .then(({ data, headers }) => {
       const headerLogsOffset = headers['more-logs-offset'];
       const { commits } = client.readQuery({ query: getCommits });
-      const newCommitData = [...commits, ...normalizeData(data)];
+      const newCommitData = [...commits, ...normalizeData(data, path)];
       client.writeQuery({
         query: getCommits,
         data: { commits: newCommitData },
       });
-      resolvers.forEach(r => resolveCommit(newCommitData, r));
+      resolvers.forEach(r => resolveCommit(newCommitData, path, r));
       fetchpromise = null;

app/assets/javascripts/repository/utils/commit.js

 // eslint-disable-next-line import/prefer-default-export
-export function normalizeData(data, extra = () => {}) {
+export function normalizeData(data, path, extra = () => {}) {
   return data.map(d => ({
     sha: d.commit.id,
     message: d.commit.message,
     committedDate: d.commit.committed_date,
     commitPath: d.commit_path,
     fileName: d.file_name,
+    filePath: `${path}/${d.file_name}`,
     type: d.type,
     __typename: 'LogTreeCommit',
     ...extra(d),

app/graphql/types/issuable_sort_enum.rb

 # frozen_string_literal: true
 module Types
-  # rubocop: disable Graphql/AuthorizeTypes
   class IssuableSortEnum < SortEnum
     graphql_name 'IssuableSort'
     description 'Values for sorting issuables'
   end
-  # rubocop: enable Graphql/AuthorizeTypes
 end

app/graphql/types/issue_sort_enum.rb

 # frozen_string_literal: true
 module Types
-  # rubocop: disable Graphql/AuthorizeTypes
   class IssueSortEnum < IssuableSortEnum
     graphql_name 'IssueSort'
     description 'Values for sorting issues'
@@ -10,7 +9,6 @@ module Types
     value 'DUE_DATE_DESC', 'Due date by descending order', value: 'due_date_desc'
     value 'RELATIVE_POSITION_ASC', 'Relative position by ascending order', value: 'relative_position_asc'
   end
-  # rubocop: enable Graphql/AuthorizeTypes
 end
 Types::IssueSortEnum.prepend_if_ee('::EE::Types::IssueSortEnum')

app/graphql/types/issue_state_enum.rb

 # frozen_string_literal: true
 module Types
-  # rubocop: disable Graphql/AuthorizeTypes
-  # This is a BaseEnum through IssuableEnum, so it does not need authorization
   class IssueStateEnum < IssuableStateEnum
     graphql_name 'IssueState'
     description 'State of a GitLab issue'
   end
-  # rubocop: enable Graphql/AuthorizeTypes
 end

app/graphql/types/merge_request_state_enum.rb

 # frozen_string_literal: true
 module Types
-  # rubocop: disable Graphql/AuthorizeTypes
-  # This is a BaseEnum through IssuableEnum, so it does not need authorization
   class MergeRequestStateEnum < IssuableStateEnum
     graphql_name 'MergeRequestState'
     description 'State of a GitLab merge request'
     value 'merged'
   end
-  # rubocop: enable Graphql/AuthorizeTypes
 end

app/helpers/git_helper.rb

 # frozen_string_literal: true
 module GitHelper
-  def strip_gpg_signature(text)
+  def strip_signature(text)
     text.gsub(/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m, "")
+    text.gsub(/-----BEGIN PGP MESSAGE-----(.*)-----END PGP MESSAGE-----/m, "")
+    text.gsub(/-----BEGIN SIGNED MESSAGE-----(.*)-----END SIGNED MESSAGE-----/m, "")
   end
   def short_sha(text)

app/views/projects/tags/_tag.atom.builder

@@ -7,7 +7,7 @@ if commit
     xml.id      tag_url
     xml.link    href: tag_url
     xml.title   truncate(tag.name, length: 80)
-    xml.summary strip_gpg_signature(tag.message)
+    xml.summary strip_signature(tag.message)
     xml.content markdown_field(release, :description), type: 'html'
     xml.updated release.updated_at.xmlschema if release
     xml.media   :thumbnail, width: '40', height: '40', url: image_url(avatar_icon_for_email(commit.author_email))

app/views/projects/tags/_tag.html.haml

@@ -11,7 +11,7 @@
     - if tag.message.present?
        
-      = strip_gpg_signature(tag.message)
+      = strip_signature(tag.message)
     - if commit
       .block-truncated

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

+- user = user_email = nil
+- if @tag.tagger
+  - user_email = @tag.tagger.email
+  - user = User.find_by_any_email(user_email)
 - add_to_breadcrumbs s_('TagsPage|Tags'), project_tags_path(@project)
 - breadcrumb_title @tag.name
 - page_title @tag.name, s_('TagsPage|Tags')
@@ -11,6 +15,24 @@
       - if protected_tag?(@project, @tag)
         %span.badge.badge-success
           = s_('TagsPage|protected')
+
+    - if user
+      = link_to user_path(user) do
+        %div
+          = user_avatar_without_link(user: user, size: 32, css_class: "mt-1 mb-1")
+
+        %div
+          %strong= user.name
+          %div= user.to_reference
+
+    - elsif user_email
+      = mail_to user_email do
+        %div
+          = user_avatar_without_link(user_email: user_email, size: 32, css_class: "mt-1 mb-1")
+
+        %div{ :class => "clearfix" }
+          %strong= user_email
+
     - if @commit
       = render 'projects/branches/commit', commit: @commit, project: @project
     - else
@@ -33,7 +55,7 @@
   - if @tag.message.present?
     %pre.wrap
-      = strip_gpg_signature(@tag.message)
+      = strip_signature(@tag.message)
 .append-bottom-default.prepend-top-default
   - if @release.description.present?

changelogs/unreleased/11403-add-weight-wip-limit-to-list.yml

+---
+title: Add possibility to save max issue weight on lists
+merge_request: 19220
+author:
+type: added

changelogs/unreleased/Upate-boards-index-js-to-use-boardsStore.yml

+---
+title: Removed all references of BoardService
+merge_request: 20144
+author: nuwe1
+type: other

changelogs/unreleased/feat-tagger.yml

+---
+title: add tagger within tag view
+merge_request: 19681
+author: Roger Meier
+type: added

changelogs/unreleased/gitaly-version-v1.74.0.yml

+---
+title: Upgrade to Gitaly v1.74.0
+merge_request: 20706
+author:
+type: changed

changelogs/unreleased/jivanvl-fix-alignment-options-dropdown-graph.yml

+---
+title: Fix dropdown location on the monitoring charts
+merge_request: 20400
+author:
+type: fixed