Add latest changes from gitlab-org/gitlab@master

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

@@ -81,3 +81,20 @@ export const lineChartOptions = ({ width, numberOfPoints, shouldAdjustFontSize }
     },
   },
 });
+
+/**
+ * Takes a dataset and returns an array containing the y-values of it's first and last entry.
+ * (e.g., [['xValue1', 'yValue1'], ['xValue2', 'yValue2'], ['xValue3', 'yValue3']] will yield ['yValue1', 'yValue3'])
+ *
+ * @param {Array} data
+ * @returns {[*, *]}
+ */
+export const firstAndLastY = data => {
+  const [firstEntry] = data;
+  const [lastEntry] = data.slice(-1);
+
+  const firstY = firstEntry[1];
+  const lastY = lastEntry[1];
+
+  return [firstY, lastY];
+};

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

@@ -117,3 +117,36 @@ export const median = arr => {
   const sorted = arr.sort((a, b) => a - b);
   return arr.length % 2 !== 0 ? sorted[middle] : (sorted[middle - 1] + sorted[middle]) / 2;
 };
+
+/**
+ * Computes the change from one value to the other as a percentage.
+ * @param {Number} firstY
+ * @param {Number} lastY
+ * @returns {Number}
+ */
+export const changeInPercent = (firstY, lastY) => {
+  if (firstY === lastY) {
+    return 0;
+  }
+
+  return Math.round(((lastY - firstY) / Math.abs(firstY)) * 100);
+};
+
+/**
+ * Computes and formats the change from one value to the other as a percentage.
+ * Prepends the computed percentage with either "+" or "-" to indicate an in- or decrease and
+ * returns a given string if the result is not finite (for example, if the first value is "0").
+ * @param firstY
+ * @param lastY
+ * @param nonFiniteResult
+ * @returns {String}
+ */
+export const formattedChangeInPercent = (firstY, lastY, { nonFiniteResult = '-' } = {}) => {
+  const change = changeInPercent(firstY, lastY);
+
+  if (!Number.isFinite(change)) {
+    return nonFiniteResult;
+  }
+
+  return `${change >= 0 ? '+' : ''}${change}%`;
+};

app/assets/javascripts/pipelines/components/pipelines_table_row.vue

@@ -265,7 +265,11 @@ export default {
     <div class="table-section section-10 commit-link">
       <div class="table-mobile-header" role="rowheader">{{ s__('Pipeline|Status') }}</div>
       <div class="table-mobile-content">
-        <ci-badge :status="pipelineStatus" :show-text="!isChildView" />
+        <ci-badge
+          :status="pipelineStatus"
+          :show-text="!isChildView"
+          data-qa-selector="pipeline_commit_status"
+        />
       </div>
     </div>

app/assets/stylesheets/framework/common.scss

@@ -562,6 +562,8 @@ img.emoji {
 }
 .gl-font-size-small { font-size: $gl-font-size-small; }
+.gl-font-size-large { font-size: $gl-font-size-large; }
+
 .gl-line-height-24 { line-height: $gl-line-height-24; }
 .gl-font-size-12 { font-size: $gl-font-size-12; }

app/finders/projects_finder.rb

@@ -110,7 +110,10 @@ class ProjectsFinder < UnionFinder
   # rubocop: disable CodeReuse/ActiveRecord
   def by_ids(items)
-    project_ids_relation ? items.where(id: project_ids_relation) : items
+    items = items.where(id: project_ids_relation) if project_ids_relation
+    items = items.where('id > ?', params[:id_after]) if params[:id_after]
+    items = items.where('id < ?', params[:id_before]) if params[:id_before]
+    items
   end
   # rubocop: enable CodeReuse/ActiveRecord

app/graphql/mutations/merge_requests/set_labels.rb

+# frozen_string_literal: true
+
+module Mutations
+  module MergeRequests
+    class SetLabels < Base
+      graphql_name 'MergeRequestSetLabels'
+
+      argument :label_ids,
+               [GraphQL::ID_TYPE],
+               required: true,
+               description: <<~DESC
+                            The Label IDs to set. Replaces existing labels by default.
+               DESC
+
+      argument :operation_mode,
+               Types::MutationOperationModeEnum,
+               required: false,
+               description: <<~DESC
+                            Changes the operation mode. Defaults to REPLACE.
+               DESC
+
+      def resolve(project_path:, iid:, label_ids:, operation_mode: Types::MutationOperationModeEnum.enum[:replace])
+        merge_request = authorized_find!(project_path: project_path, iid: iid)
+        project = merge_request.project
+
+        label_ids = label_ids
+                      .select(&method(:label_descendant?))
+                      .map { |gid| GlobalID.parse(gid).model_id } # MergeRequests::UpdateService expects integers
+
+        attribute_name = case operation_mode
+                         when Types::MutationOperationModeEnum.enum[:append]
+                           :add_label_ids
+                         when Types::MutationOperationModeEnum.enum[:remove]
+                           :remove_label_ids
+                         else
+                           :label_ids
+                         end
+
+        ::MergeRequests::UpdateService.new(project, current_user, attribute_name => label_ids)
+          .execute(merge_request)
+
+        {
+          merge_request: merge_request,
+          errors: merge_request.errors.full_messages
+        }
+      end
+
+      def label_descendant?(gid)
+        GlobalID.parse(gid)&.model_class&.ancestors&.include?(Label)
+      end
+    end
+  end
+end

app/graphql/mutations/merge_requests/set_locked.rb

+# frozen_string_literal: true
+
+module Mutations
+  module MergeRequests
+    class SetLocked < Base
+      graphql_name 'MergeRequestSetLocked'
+
+      argument :locked,
+               GraphQL::BOOLEAN_TYPE,
+               required: true,
+               description: <<~DESC
+                            Whether or not to lock the merge request.
+               DESC
+
+      def resolve(project_path:, iid:, locked:)
+        merge_request = authorized_find!(project_path: project_path, iid: iid)
+        project = merge_request.project
+
+        ::MergeRequests::UpdateService.new(project, current_user, discussion_locked: locked)
+          .execute(merge_request)
+
+        {
+          merge_request: merge_request,
+          errors: merge_request.errors.full_messages
+        }
+      end
+    end
+  end
+end

app/graphql/mutations/merge_requests/set_subscription.rb

+# frozen_string_literal: true
+
+module Mutations
+  module MergeRequests
+    class SetSubscription < Base
+      graphql_name 'MergeRequestSetSubscription'
+
+      argument :subscribed_state,
+               GraphQL::BOOLEAN_TYPE,
+               required: true,
+               description: 'The desired state of the subscription'
+
+      def resolve(project_path:, iid:, subscribed_state:)
+        merge_request = authorized_find!(project_path: project_path, iid: iid)
+        project = merge_request.project
+
+        merge_request.set_subscription(current_user, subscribed_state, project)
+
+        {
+          merge_request: merge_request,
+          errors: merge_request.errors.full_messages
+        }
+      end
+    end
+  end
+end

app/graphql/types/label_type.rb

@@ -6,6 +6,8 @@ module Types
     authorize :read_label
+    field :id, GraphQL::ID_TYPE, null: false,
+          description: 'Label ID'
     field :description, GraphQL::STRING_TYPE, null: true,
           description: 'Description of the label (markdown rendered as HTML for caching)'
     markdown_field :description_html, null: true

app/graphql/types/mutation_type.rb

@@ -9,7 +9,10 @@ module Types
     mount_mutation Mutations::AwardEmojis::Add
     mount_mutation Mutations::AwardEmojis::Remove
     mount_mutation Mutations::AwardEmojis::Toggle
+    mount_mutation Mutations::MergeRequests::SetLabels
+    mount_mutation Mutations::MergeRequests::SetLocked
     mount_mutation Mutations::MergeRequests::SetMilestone
+    mount_mutation Mutations::MergeRequests::SetSubscription
     mount_mutation Mutations::MergeRequests::SetWip, calls_gitaly: true
     mount_mutation Mutations::MergeRequests::SetAssignees
     mount_mutation Mutations::Notes::Create::Note, calls_gitaly: true

app/views/dashboard/projects/_zero_authorized_projects.html.haml

@@ -3,7 +3,7 @@
     .container.section-body
       .row
         .blank-state-welcome.w-100
-          %h2.blank-state-welcome-title
+          %h2.blank-state-welcome-title{ data: { qa_selector: 'welcome_title_content' } }
             = _('Welcome to GitLab')
           %p.blank-state-text
             = _('Faster releases. Better code. Less pain.')

changelogs/unreleased/12881-security-dashboard-leveraging-sparklines-to-show-vulnerability-tren.yml

+---
+title: Vulnerabilities history chart - use sparklines
+merge_request: 19745
+author:
+type: changed

changelogs/unreleased/31919-graphql-MR-label-mutation.yml

+---
+title: 'GraphQL: Create MR mutations needed for the sidebar'
+merge_request: 19913
+author:
+type: added

changelogs/unreleased/ab-projects-id-filter.yml

+---
+title: Add id_before, id_after filter param to projects API
+merge_request: 19949
+author:
+type: added

changelogs/unreleased/change-default-factor-on-merge-train.yml

+---
+title: Change the default concurrency factor of merge train to 20
+merge_request: 20201
+author:
+type: changed

doc/api/graphql/reference/gitlab_schema.graphql

@@ -2814,6 +2814,11 @@ type Label {
   """
   descriptionHtml: String
+  """
+  Label ID
+  """
+  id: ID!
+
   """
   Text color of the label
   """
@@ -3407,6 +3412,101 @@ type MergeRequestSetAssigneesPayload {
   mergeRequest: MergeRequest
 }
+"""
+Autogenerated input type of MergeRequestSetLabels
+"""
+input MergeRequestSetLabelsInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The iid of the merge request to mutate
+  """
+  iid: String!
+
+  """
+  The Label IDs to set. Replaces existing labels by default.
+  """
+  labelIds: [ID!]!
+
+  """
+  Changes the operation mode. Defaults to REPLACE.
+  """
+  operationMode: MutationOperationMode
+
+  """
+  The project the merge request to mutate is in
+  """
+  projectPath: ID!
+}
+
+"""
+Autogenerated return type of MergeRequestSetLabels
+"""
+type MergeRequestSetLabelsPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Reasons why the mutation failed.
+  """
+  errors: [String!]!
+
+  """
+  The merge request after mutation
+  """
+  mergeRequest: MergeRequest
+}
+
+"""
+Autogenerated input type of MergeRequestSetLocked
+"""
+input MergeRequestSetLockedInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The iid of the merge request to mutate
+  """
+  iid: String!
+
+  """
+  Whether or not to lock the merge request.
+  """
+  locked: Boolean!
+
+  """
+  The project the merge request to mutate is in
+  """
+  projectPath: ID!
+}
+
+"""
+Autogenerated return type of MergeRequestSetLocked
+"""
+type MergeRequestSetLockedPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Reasons why the mutation failed.
+  """
+  errors: [String!]!
+
+  """
+  The merge request after mutation
+  """
+  mergeRequest: MergeRequest
+}
+
 """
 Autogenerated input type of MergeRequestSetMilestone
 """
@@ -3452,6 +3552,51 @@ type MergeRequestSetMilestonePayload {
   mergeRequest: MergeRequest
 }
+"""
+Autogenerated input type of MergeRequestSetSubscription
+"""
+input MergeRequestSetSubscriptionInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The iid of the merge request to mutate
+  """
+  iid: String!
+
+  """
+  The project the merge request to mutate is in
+  """
+  projectPath: ID!
+
+  """
+  The desired state of the subscription
+  """
+  subscribedState: Boolean!
+}
+
+"""
+Autogenerated return type of MergeRequestSetSubscription
+"""
+type MergeRequestSetSubscriptionPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Reasons why the mutation failed.
+  """
+  errors: [String!]!
+
+  """
+  The merge request after mutation
+  """
+  mergeRequest: MergeRequest
+}
+
 """
 Autogenerated input type of MergeRequestSetWip
 """
@@ -3588,7 +3733,10 @@ type Mutation {
   epicSetSubscription(input: EpicSetSubscriptionInput!): EpicSetSubscriptionPayload
   epicTreeReorder(input: EpicTreeReorderInput!): EpicTreeReorderPayload
   mergeRequestSetAssignees(input: MergeRequestSetAssigneesInput!): MergeRequestSetAssigneesPayload
+  mergeRequestSetLabels(input: MergeRequestSetLabelsInput!): MergeRequestSetLabelsPayload
+  mergeRequestSetLocked(input: MergeRequestSetLockedInput!): MergeRequestSetLockedPayload
   mergeRequestSetMilestone(input: MergeRequestSetMilestoneInput!): MergeRequestSetMilestonePayload
+  mergeRequestSetSubscription(input: MergeRequestSetSubscriptionInput!): MergeRequestSetSubscriptionPayload
   mergeRequestSetWip(input: MergeRequestSetWipInput!): MergeRequestSetWipPayload
   removeAwardEmoji(input: RemoveAwardEmojiInput!): RemoveAwardEmojiPayload
   todoMarkDone(input: TodoMarkDoneInput!): TodoMarkDonePayload

doc/api/graphql/reference/index.md

@@ -410,6 +410,7 @@ The API can be explored interactively using the [GraphiQL IDE](../index.md#graph
 | Name  | Type  | Description |
 | ---   |  ---- | ----------  |
+| `id` | ID! | Label ID |
 | `description` | String | Description of the label (markdown rendered as HTML for caching) |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
 | `title` | String! | Content of the label |
@@ -491,6 +492,22 @@ The API can be explored interactively using the [GraphiQL IDE](../index.md#graph
 | `errors` | String! => Array | Reasons why the mutation failed. |
 | `mergeRequest` | MergeRequest | The merge request after mutation |
+### MergeRequestSetLabelsPayload
+
+| Name  | Type  | Description |
+| ---   |  ---- | ----------  |
+| `clientMutationId` | String | A unique identifier for the client performing the mutation. |
+| `errors` | String! => Array | Reasons why the mutation failed. |
+| `mergeRequest` | MergeRequest | The merge request after mutation |
+
+### MergeRequestSetLockedPayload
+
+| Name  | Type  | Description |
+| ---   |  ---- | ----------  |
+| `clientMutationId` | String | A unique identifier for the client performing the mutation. |
+| `errors` | String! => Array | Reasons why the mutation failed. |
+| `mergeRequest` | MergeRequest | The merge request after mutation |
+
 ### MergeRequestSetMilestonePayload
 | Name  | Type  | Description |
@@ -499,6 +516,14 @@ The API can be explored interactively using the [GraphiQL IDE](../index.md#graph
 | `errors` | String! => Array | Reasons why the mutation failed. |
 | `mergeRequest` | MergeRequest | The merge request after mutation |
+### MergeRequestSetSubscriptionPayload
+
+| Name  | Type  | Description |
+| ---   |  ---- | ----------  |
+| `clientMutationId` | String | A unique identifier for the client performing the mutation. |
+| `errors` | String! => Array | Reasons why the mutation failed. |
+| `mergeRequest` | MergeRequest | The merge request after mutation |
+
 ### MergeRequestSetWipPayload
 | Name  | Type  | Description |

doc/api/projects.md

@@ -58,6 +58,8 @@ GET /projects
 | `wiki_checksum_failed`        | boolean | no | **(PREMIUM)** Limit projects where the wiki checksum calculation has failed ([Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/6137) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.2) |
 | `repository_checksum_failed`  | boolean | no | **(PREMIUM)** Limit projects where the repository checksum calculation has failed ([Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/6137) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.2) |
 | `min_access_level`            | integer | no | Limit by current user minimal [access level](members.md) |
+| `id_after`                    | integer | no | Limit results to projects with IDs greater than the specified ID |
+| `id_before`                   | integer | no | Limit results to projects with IDs less than the specified ID |
 When `simple=true` or the user is unauthenticated this returns something like:
@@ -304,6 +306,8 @@ GET /users/:user_id/projects
 | `with_merge_requests_enabled` | boolean | no | Limit by enabled merge requests feature |
 | `with_programming_language` | string | no | Limit by projects which use the given programming language |
 | `min_access_level` | integer | no | Limit by current user minimal [access level](members.md) |
+| `id_after`                    | integer | no | Limit results to projects with IDs greater than the specified ID |
+| `id_before`                   | integer | no | Limit results to projects with IDs less than the specified ID |
 ```json
 [

doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md

@@ -32,8 +32,8 @@ Merge trains have the following requirements and limitations:
 - This feature requires that
   [pipelines for merged results](../index.md#pipelines-for-merged-results-premium) are
   **configured properly**.
-- Each merge train can run a maximum of **four** pipelines in parallel.
-  If more than four merge requests are added to the merge train, the merge requests
+- Each merge train can run a maximum of **twenty** pipelines in parallel.
+  If more than twenty merge requests are added to the merge train, the merge requests
   will be queued until a slot in the merge train is free. There is no limit to the
   number of merge requests that can be queued.
 - This feature does not support [squash and merge](../../../../user/project/merge_requests/squash_and_merge.md).