Add latest changes from gitlab-org/gitlab@master

app/models/snippet.rb

@@ -17,7 +17,7 @@ class Snippet < ApplicationRecord
   include HasRepository
   extend ::Gitlab::Utils::Override
-  ignore_column :repository_storage, remove_with: '12.10', remove_after: '2020-04-22'
+  ignore_column :repository_storage, remove_with: '12.10', remove_after: '2020-03-22'
   cache_markdown_field :title, pipeline: :single_line
   cache_markdown_field :description

app/views/projects/services/slack/_help.haml

+- webhooks_link_url = 'https://slack.com/apps/A0F7XDUAZ-incoming-webhooks'
+- webhooks_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: webhooks_link_url }
+
+.info-well
+  .well-segment
+    %p= s_('SlackIntegration|This service send notifications about projects\' events to Slack channels. To set up this service:')
+    %ol
+      %li
+        = s_('SlackIntegration|%{webhooks_link_start}Add an incoming webhook%{webhooks_link_end} in your Slack team. The default channel can be overridden for each event.').html_safe % { webhooks_link_start: webhooks_link_start, webhooks_link_end: '</a>'.html_safe }
+      %li
+        = s_('SlackIntegration|Paste the <strong>Webhook URL</strong> into the field below.').html_safe
+      %li
+        = s_('SlackIntegration|Select events below to enable notifications. The <strong>Slack channel names</strong> and <strong>Slack username</strong> fields are optional.').html_safe
+    %p.mt-3.mb-0
+      = s_('SlackIntegration|<strong>Note:</strong> Usernames and private channels are not supported.').html_safe
+      = link_to _('Learn more'), help_page_path('user/project/integrations/slack')

app/views/shared/snippets/_list.html.haml

@@ -8,4 +8,4 @@
     %ul.content-list
       = render partial: 'shared/snippets/snippet', collection: @snippets, locals: { link_project: link_project }
-    = paginate @snippets, theme: 'gitlab', remote: remote
+    = paginate_collection @snippets, remote: remote

app/workers/concerns/waitable_worker.rb

@@ -9,7 +9,7 @@ module WaitableWorker
       # Short-circuit: it's more efficient to do small numbers of jobs inline
       return bulk_perform_inline(args_list) if args_list.size <= 3
-      waiter = Gitlab::JobWaiter.new(args_list.size)
+      waiter = Gitlab::JobWaiter.new(args_list.size, worker_label: self.to_s)
       # Point all the bulk jobs at the same JobWaiter. Converts, [[1], [2], [3]]
       # into [[1, "key"], [2, "key"], [3, "key"]]

changelogs/unreleased/14080-slack-multiple-channels.yml

+---
+title: Allow multiple Slack channels for notifications
+merge_request: 24132
+author:
+type: added

changelogs/unreleased/207390-pages-api-case-insensitive-domain-lookup.yml

+---
+title: 'Add index on LOWER(domain) for pages_domains'
+merge_request: 25664
+author:
+type: other

changelogs/unreleased/34420-optimize-pagination-on-explore-snippets.yml

+---
+title: Showing only "Next" button for snippet explore page.
+merge_request: 25404
+author:
+type: changed

changelogs/unreleased/changed-pages-ci-var.yml

+---
+title: Added CI_MERGE_REQUEST_CHANGED_PAGE_* to Predefined Variables reference
+merge_request: 25256
+author:
+type: added

changelogs/unreleased/fj-remove-repository-storage-column-from-snippets.yml

+---
+title: Remove repository_storage column from snippets
+merge_request: 25699
+author:
+type: other

changelogs/unreleased/jdb-fix-jump-to-next-unresolved-thread.yml

+---
+title: Fix Jump to next unresolved thread
+merge_request: 24728
+author:
+type: fixed

config/initializers/tracing.rb

@@ -5,22 +5,6 @@ if Labkit::Tracing.enabled?
     config.middleware.insert_after Labkit::Middleware::Rack, ::Labkit::Tracing::RackMiddleware
   end
-  # Instrument the Sidekiq client
-  Sidekiq.configure_client do |config|
-    config.client_middleware do |chain|
-      chain.add Labkit::Tracing::Sidekiq::ClientMiddleware
-    end
-  end
-
-  # Instrument Sidekiq server calls when running Sidekiq server
-  if Gitlab::Runtime.sidekiq?
-    Sidekiq.configure_server do |config|
-      config.server_middleware do |chain|
-        chain.add Labkit::Tracing::Sidekiq::ServerMiddleware
-      end
-    end
-  end
-
   # Instrument Redis
   Labkit::Tracing::Redis.instrument

config/sidekiq_queues.yml

@@ -28,6 +28,8 @@
   - 1
 - - admin_emails
   - 1
+- - analytics_code_review_metrics
+  - 1
 - - authorized_projects
   - 2
 - - auto_devops

db/migrate/20200221023320_add_index_on_pages_domain_on_domain_lowercase.rb

+# frozen_string_literal: true
+
+class AddIndexOnPagesDomainOnDomainLowercase < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  INDEX_NAME = 'index_pages_domains_on_domain_lowercase'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :pages_domains, 'LOWER(domain)', name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :pages_domains, INDEX_NAME
+  end
+end

db/migrate/20200221074028_add_mr_metrics_first_approved_at.rb

+# frozen_string_literal: true
+
+class AddMrMetricsFirstApprovedAt < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def up
+    add_column :merge_request_metrics, :first_approved_at, :datetime_with_timezone
+  end
+
+  def down
+    remove_column :merge_request_metrics, :first_approved_at
+  end
+end

db/post_migrate/20200221142216_remove_repository_storage_from_snippets.rb

+# frozen_string_literal: true
+
+class RemoveRepositoryStorageFromSnippets < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    return unless column_exists?(:snippets, :repository_storage)
+
+    remove_column :snippets, :repository_storage
+  end
+
+  def down
+    return if column_exists?(:snippets, :repository_storage)
+
+    add_column_with_default( # rubocop:disable Migration/AddColumnWithDefault
+      :snippets,
+      :repository_storage,
+      :string,
+      default: 'default',
+      limit: 255,
+      allow_null: false
+    )
+  end
+end

db/schema.rb

@@ -2537,6 +2537,7 @@ ActiveRecord::Schema.define(version: 2020_02_24_163804) do
     t.integer "diff_size"
     t.integer "modified_paths_size"
     t.integer "commits_count"
+    t.datetime_with_timezone "first_approved_at"
     t.index ["first_deployed_to_production_at"], name: "index_merge_request_metrics_on_first_deployed_to_production_at"
     t.index ["latest_closed_at"], name: "index_merge_request_metrics_on_latest_closed_at", where: "(latest_closed_at IS NOT NULL)"
     t.index ["latest_closed_by_id"], name: "index_merge_request_metrics_on_latest_closed_by_id"
@@ -3062,6 +3063,7 @@ ActiveRecord::Schema.define(version: 2020_02_24_163804) do
     t.boolean "wildcard", default: false, null: false
     t.integer "usage", limit: 2, default: 0, null: false
     t.integer "scope", limit: 2, default: 2, null: false
+    t.index "lower((domain)::text)", name: "index_pages_domains_on_domain_lowercase"
     t.index ["certificate_source", "certificate_valid_not_after"], name: "index_pages_domains_need_auto_ssl_renewal", where: "(auto_ssl_enabled = true)"
     t.index ["domain", "wildcard"], name: "index_pages_domains_on_domain_and_wildcard", unique: true
     t.index ["project_id", "enabled_until"], name: "index_pages_domains_on_project_id_and_enabled_until"
@@ -3938,7 +3940,6 @@ ActiveRecord::Schema.define(version: 2020_02_24_163804) do
     t.string "encrypted_secret_token", limit: 255
     t.string "encrypted_secret_token_iv", limit: 255
     t.boolean "secret", default: false, null: false
-    t.string "repository_storage", limit: 255, default: "default", null: false
     t.index ["author_id"], name: "index_snippets_on_author_id"
     t.index ["content"], name: "index_snippets_on_content_trigram", opclass: :gin_trgm_ops, using: :gin
     t.index ["created_at"], name: "index_snippets_on_created_at"

doc/ci/variables/predefined_variables.md

@@ -64,6 +64,8 @@ future GitLab releases.**
 | `CI_JOB_TOKEN`                                | 9.0    | 1.2    | Token used for authenticating with the [GitLab Container Registry][registry] and downloading [dependent repositories][dependent-repositories]                                                                                                                                                                                                              |
 | `CI_JOB_URL`                                  | 11.1   | 0.5    | Job details URL                                                                                                                                                                                                                                                                                                                                            |
 | `CI_MERGE_REQUEST_ASSIGNEES`                  | 11.9   | all    | Comma-separated list of username(s) of assignee(s) for the merge request if [the pipelines are for merge requests](../merge_request_pipelines/index.md). Available only if `only: [merge_requests]` is used and the merge request is created.                                                                                                              |
+| `CI_MERGE_REQUEST_CHANGED_PAGE_PATHS`         | 12.9   | all    | Comma-separated list of paths of changed pages in a deployed [Review App](../review_apps/index.md) for a [Merge Request](../merge_request_pipelines/index.md). A [Route Map](../review_apps/index.md#route-maps) must be configured.                                                                                 |
+| `CI_MERGE_REQUEST_CHANGED_PAGE_URLS`          | 12.9   | all    | Comma-separated list of URLs of changed pages in a deployed [Review App](../review_apps/index.md) for a [Merge Request](../merge_request_pipelines/index.md). A [Route Map](../review_apps/index.md#route-maps) must be configured.                                                                                  |
 | `CI_MERGE_REQUEST_ID`                         | 11.6   | all    | The ID of the merge request if [the pipelines are for merge requests](../merge_request_pipelines/index.md). Available only if `only: [merge_requests]` is used and the merge request is created.                                                                                                                                                           |
 | `CI_MERGE_REQUEST_IID`                        | 11.6   | all    | The IID of the merge request if [the pipelines are for merge requests](../merge_request_pipelines/index.md). Available only if `only: [merge_requests]` is used and the merge request is created.                                                                                                                                                          |
 | `CI_MERGE_REQUEST_LABELS`                     | 11.9   | all    | Comma-separated label names of the merge request if [the pipelines are for merge requests](../merge_request_pipelines/index.md). Available only if `only: [merge_requests]` is used and the merge request is created.                                                                                                                                      |

doc/user/project/integrations/slack.md

@@ -16,7 +16,7 @@ The Slack Notifications Service allows your GitLab project to send events (e.g.
 1. Select the **Slack notifications** project service to configure it.
 1. Check the **Active** checkbox to turn on the service.
 1. Check the checkboxes corresponding to the GitLab events you want to send to Slack as a notification.
-1. For each event, optionally enter the Slack channel where you want to send the event. (Do _not_ include the `#` symbol.) If left empty, the event will be sent to the default channel that you configured in the Slack Configuration step.
+1. For each event, optionally enter the Slack channel names where you want to send the event, separated by a comma. If left empty, the event will be sent to the default channel that you configured in the Slack Configuration step. **Note:** Usernames and private channels are not supported. To send direct messages, use the Member ID found under user's Slack profile.
 1. Paste the **Webhook URL** that you copied from the Slack Configuration step.
 1. Optionally customize the Slack bot username that will be sending the notifications.
 1. Configure the remaining options and click `Save changes`.

lib/api/internal/pages.rb

@@ -36,7 +36,7 @@ module API
               present virtual_domain, with: Entities::Internal::Serverless::VirtualDomain
             else
               # Handle Pages domains
-              host = Namespace.find_by_pages_host(params[:host]) || PagesDomain.find_by_domain(params[:host])
+              host = Namespace.find_by_pages_host(params[:host]) || PagesDomain.find_by_domain_case_insensitive(params[:host])
               no_content! unless host
               virtual_domain = host.pages_virtual_domain

lib/gitlab/import_export/import_export.yml

@@ -173,7 +173,6 @@ excluded_attributes:
     - :secret
     - :encrypted_secret_token
     - :encrypted_secret_token_iv
-    - :repository_storage
   merge_request_diff:
     - :external_diff
     - :stored_externally