Add latest changes from gitlab-org/gitlab@master

app/workers/process_commit_worker.rb

@@ -12,6 +12,7 @@ class ProcessCommitWorker
   feature_category :source_code_management
   latency_sensitive_worker!
+  weight 3
   # project_id - The ID of the project this commit belongs to.
   # user_id - The ID of the user that pushed the commit.

app/workers/rebase_worker.rb

@@ -6,6 +6,7 @@ class RebaseWorker
   include ApplicationWorker
   feature_category :source_code_management
+  weight 2
   def perform(merge_request_id, current_user_id, skip_ci = false)
     current_user = User.find(current_user_id)

app/workers/remote_mirror_notification_worker.rb

@@ -4,6 +4,7 @@ class RemoteMirrorNotificationWorker
   include ApplicationWorker
   feature_category :source_code_management
+  weight 2
   def perform(remote_mirror_id)
     remote_mirror = RemoteMirror.find_by_id(remote_mirror_id)

app/workers/update_external_pull_requests_worker.rb

@@ -4,6 +4,7 @@ class UpdateExternalPullRequestsWorker
   include ApplicationWorker
   feature_category :source_code_management
+  weight 3
   def perform(project_id, user_id, ref)
     project = Project.find_by_id(project_id)

app/workers/update_merge_requests_worker.rb

@@ -6,6 +6,7 @@ class UpdateMergeRequestsWorker
   feature_category :source_code_management
   latency_sensitive_worker!
   worker_resource_boundary :cpu
+  weight 3
   LOG_TIME_THRESHOLD = 90 # seconds

changelogs/unreleased/14707-add-waf-anomaly-summary-service.yml

+---
+title: Add WAF Anomaly Summary service
+merge_request: 22736
+author:
+type: added

changelogs/unreleased/194164-add-missing-detailed-sentry-error-graphql.yml

+---
+title: Add tags, external_base_url, gitlab_issue to Sentry Detailed Error graphql
+merge_request: 23483
+author:
+type: added

changelogs/unreleased/197500-edit-and-web-ide-look-like-segmented-control-in-file-header.yml

+---
+title: Remove button group for edit and web ide in file header
+merge_request: 23291
+author:
+type: other

changelogs/unreleased/23296-add-ci-variables-server-port-protocol.yml

+---
+title: Add CI variables to provide GitLab port and protocol
+merge_request: 23296
+author: Aidin Abedi
+type: added

changelogs/unreleased/broadcast-api-auth.yml

+---
+title: Allow users to read broadcast messages via API
+merge_request: 23298
+author: Rajendra Kadam
+type: changed

changelogs/unreleased/fix-missing-apply-sugegstion-project-setting.yml

+---
+title: Add accidentally deleted project config for custom apply suggestions
+merge_request: 23687
+author: Fabio Huser
+type: fixed

changelogs/unreleased/integrate-gitaly-disk_statistics-grpc.yml

+---
+title: "Support retrieval of disk statistics from Gitaly"
+merge_request: 22226
+author: Nels Nelson
+type: added

config/initializers/lograge.rb

@@ -15,6 +15,10 @@ unless Gitlab::Runtime.sidekiq?
       data
     end
+    # This isn't a user-reachable controller; we use it to check for a
+    # valid CSRF token in the API
+    config.lograge.ignore_actions = ['Gitlab::RequestForgeryProtection::Controller#index']
+
     # Add request parameters to log output
     config.lograge.custom_options = lambda do |event|
       params = event.payload[:params]

config/routes/git_http.rb

-scope(path: '*namespace_id/:project_id',
-      format: nil,
-      constraints: { namespace_id: Gitlab::PathRegex.full_namespace_route_regex }) do
-  scope(constraints: { project_id: Gitlab::PathRegex.project_git_route_regex }, module: :projects) do
-    # Git HTTP clients ('git clone' etc.)
-    scope(controller: :git_http) do
-      get '/info/refs', action: :info_refs
-      post '/git-upload-pack', action: :git_upload_pack
-      post '/git-receive-pack', action: :git_receive_pack
-    end
-    # Git LFS API (metadata)
-    scope(path: 'info/lfs/objects', controller: :lfs_api) do
-      post :batch
-      post '/', action: :deprecated
-      get '/*oid', action: :deprecated
-    end
-    scope(path: 'info/lfs') do
-      resources :lfs_locks, controller: :lfs_locks_api, path: 'locks' do
-        post :unlock, on: :member
-        post :verify, on: :collection
-      end
+concern :gitactionable do
+  scope(controller: :git_http) do
+    get '/info/refs', action: :info_refs
+    post '/git-upload-pack', action: :git_upload_pack
+    post '/git-receive-pack', action: :git_receive_pack
+  end
+end
+concern :lfsable do
+  # Git LFS API (metadata)
+  scope(path: 'info/lfs/objects', controller: :lfs_api) do
+    post :batch
+    post '/', action: :deprecated
+    get '/*oid', action: :deprecated
+  end
+  scope(path: 'info/lfs') do
+    resources :lfs_locks, controller: :lfs_locks_api, path: 'locks' do
+      post :unlock, on: :member
+      post :verify, on: :collection
     end
-    # GitLab LFS object storage
-    scope(path: 'gitlab-lfs/objects/*oid', controller: :lfs_storage, constraints: { oid: /[a-f0-9]{64}/ }) do
-      get '/', action: :download
-      scope constraints: { size: /[0-9]+/ } do
-        put '/*size/authorize', action: :upload_authorize
-        put '/*size', action: :upload_finalize
-      end
+  end
+  # GitLab LFS object storage
+  scope(path: 'gitlab-lfs/objects/*oid', controller: :lfs_storage, constraints: { oid: /[a-f0-9]{64}/ }) do
+    get '/', action: :download
+    scope constraints: { size: /[0-9]+/ } do
+      put '/*size/authorize', action: :upload_authorize
+      put '/*size', action: :upload_finalize
+    end
+  end
+end
+
+scope(path: '*namespace_id/:repository_id',
+      format: nil,
+      constraints: { namespace_id: Gitlab::PathRegex.full_namespace_route_regex }) do
+  scope(constraints: { repository_id: Gitlab::PathRegex.project_git_route_regex }) do
+    scope(module: :repositories) do
+      concerns :gitactionable
+      concerns :lfsable
     end
   end
   # Redirect /group/project.wiki.git to the project wiki
-  scope(format: true, constraints: { project_id: Gitlab::PathRegex.project_wiki_git_route_regex, format: :git }) do
+  scope(format: true, constraints: { repository_id: Gitlab::PathRegex.project_wiki_git_route_regex, format: :git }) do
     wiki_redirect = redirect do |params, request|
-      project_id = params[:project_id].delete_suffix('.wiki')
+      project_id = params[:repository_id].delete_suffix('.wiki')
       path = [params[:namespace_id], project_id, 'wikis'].join('/')
       path << "?#{request.query_string}" unless request.query_string.blank?
       path
@@ -47,7 +55,7 @@ scope(path: '*namespace_id/:project_id',
   end
   # Redirect /group/project/info/refs to /group/project.git/info/refs
-  scope(constraints: { project_id: Gitlab::PathRegex.project_route_regex }) do
+  scope(constraints: { repository_id: Gitlab::PathRegex.project_route_regex }) do
     # Allow /info/refs, /info/refs?service=git-upload-pack, and
     # /info/refs?service=git-receive-pack, but nothing else.
     #
@@ -58,7 +66,7 @@ scope(path: '*namespace_id/:project_id',
     end
     ref_redirect = redirect do |params, request|
-      path = "#{params[:namespace_id]}/#{params[:project_id]}.git/info/refs"
+      path = "#{params[:namespace_id]}/#{params[:repository_id]}.git/info/refs"
       path << "?#{request.query_string}" unless request.query_string.blank?
       path
     end

config/sidekiq_queues.yml

+# This file is generated automatically by
+#   bin/rake gitlab:sidekiq:sidekiq_queues_yml:generate
+#
+# Do not edit it manually!
+#
 # This configuration file should be exclusively used to set queue settings for
 # Sidekiq. Any other setting should be specified using the Sidekiq CLI or the
 # Sidekiq Ruby API (see config/initializers/sidekiq.rb).
----
+#
 # All the queues to process and their weights. Every queue _must_ have a weight
 # defined.
 #
@@ -17,116 +22,217 @@
 # to perform) is:
 #
 #     chance = (queue weight / total weight of all queues) * 100
+---
 :queues:
-  - [post_receive, 5]
-  - [merge, 5]
-  - [update_merge_requests, 3]
-  - [process_commit, 3]
-  - [new_note, 2]
-  - [new_issue, 2]
-  - [notifications, 2]
-  - [new_merge_request, 2]
-  - [pipeline_processing, 5]
-  - [pipeline_creation, 4]
-  - [pipeline_default, 3]
-  - [pipeline_cache, 3]
-  - [deployment, 3]
-  - [auto_merge, 3]
-  - [pipeline_hooks, 2]
-  - [gitlab_shell, 2]
-  - [email_receiver, 2]
-  - [emails_on_push, 2]
-  - [mailers, 2]
-  - [mail_scheduler, 2]
-  - [invalid_gpg_signature_update, 2]
-  - [create_gpg_signature, 2]
-  - [rebase, 2]
-  - [upload_checksum, 1]
-  - [repository_fork, 1]
-  - [repository_import, 1]
-  - [github_importer, 1]
-  - [github_import_advance_stage, 1]
-  - [project_service, 1]
-  - [delete_user, 1]
-  - [todos_destroyer, 1]
-  - [delete_merged_branches, 1]
-  - [authorized_projects, 2]
-  - [expire_build_instance_artifacts, 1]
-  - [group_destroy, 1]
-  - [irker, 1]
-  - [namespaceless_project_destroy, 1]
-  - [project_cache, 1]
-  - [project_destroy, 1]
-  - [project_export, 1]
-  - [web_hook, 1]
-  - [repository_check, 1]
-  - [git_garbage_collect, 1]
-  - [reactive_caching, 1]
-  - [cronjob, 1]
-  - [default, 1]
-  - [pages, 1]
-  - [system_hook_push, 1]
-  - [propagate_service_template, 1]
-  - [background_migration, 1]
-  - [gcp_cluster, 1]
-  - [project_migrate_hashed_storage, 1]
-  - [project_rollback_hashed_storage, 1]
-  - [hashed_storage, 1]
-  - [pages_domain_verification, 1]
-  - [pages_domain_ssl_renewal, 1]
-  - [object_storage_upload, 1]
-  - [object_storage, 1]
-  - [file_hook, 1]
-  - [pipeline_background, 1]
-  - [repository_update_remote_mirror, 1]
-  - [repository_remove_remote, 1]
-  - [create_note_diff_file, 1]
-  - [delete_diff_files, 1]
-  - [detect_repository_languages, 1]
-  - [auto_devops, 2]
-  - [container_repository, 1]
-  - [object_pool, 1]
-  - [repository_cleanup, 1]
-  - [delete_stored_files, 1]
-  - [remote_mirror_notification, 2]
-  - [project_daily_statistics, 1]
-  - [import_issues_csv, 2]
-  - [chat_notification, 2]
-  - [migrate_external_diffs, 1]
-  - [update_project_statistics, 1]
-  - [phabricator_import_import_tasks, 1]
-  - [update_namespace_statistics, 1]
-  - [chaos, 2]
-  - [create_evidence, 2]
-  - [group_export, 1]
-  - [self_monitoring_project_create, 2]
-  - [self_monitoring_project_delete, 2]
-  - [error_tracking_issue_link, 2]
-  - [merge_request_mergeability_check, 5]
-
-  # EE-specific queues
-  - [analytics, 1]
-  - [ldap_group_sync, 2]
-  - [create_github_webhook, 2]
-  - [geo, 1]
-  - [repository_update_mirror, 1]
-  - [repository_push_audit_event, 1]
-  - [new_epic, 2]
-  - [project_import_schedule, 1]
-  - [project_update_repository_storage, 1]
-  - [admin_emails, 1]
-  - [elastic_batch_project_indexer, 1]
-  - [elastic_indexer, 1]
-  - [elastic_full_index, 1]
-  - [elastic_commit_indexer, 1]
-  - [elastic_namespace_indexer, 1]
-  - [elastic_namespace_rollout, 1]
-  - [export_csv, 1]
-  - [incident_management, 2]
-  - [jira_connect, 1]
-  - [update_external_pull_requests, 3]
-  - [refresh_license_compliance_checks, 2]
-  - [design_management_new_version, 1]
-  - [epics, 2]
-  - [personal_access_tokens, 1]
-  - [adjourned_project_deletion, 1]
+- - adjourned_project_deletion
+  - 1
+- - admin_emails
+  - 1
+- - authorized_projects
+  - 2
+- - auto_devops
+  - 2
+- - auto_merge
+  - 3
+- - background_migration
+  - 1
+- - chaos
+  - 2
+- - chat_notification
+  - 2
+- - container_repository
+  - 1
+- - create_evidence
+  - 2
+- - create_github_webhook
+  - 2
+- - create_gpg_signature
+  - 2
+- - create_note_diff_file
+  - 1
+- - cronjob
+  - 1
+- - default
+  - 1
+- - delete_diff_files
+  - 1
+- - delete_merged_branches
+  - 1
+- - delete_stored_files
+  - 1
+- - delete_user
+  - 1
+- - deployment
+  - 3
+- - design_management_new_version
+  - 1
+- - detect_repository_languages
+  - 1
+- - elastic_batch_project_indexer
+  - 1
+- - elastic_commit_indexer
+  - 1
+- - elastic_full_index
+  - 1
+- - elastic_indexer
+  - 1
+- - elastic_namespace_indexer
+  - 1
+- - elastic_namespace_rollout
+  - 1
+- - email_receiver
+  - 2
+- - emails_on_push
+  - 2
+- - epics
+  - 2
+- - error_tracking_issue_link
+  - 1
+- - expire_build_instance_artifacts
+  - 1
+- - export_csv
+  - 1
+- - file_hook
+  - 1
+- - gcp_cluster
+  - 1
+- - geo
+  - 1
+- - git_garbage_collect
+  - 1
+- - github_import_advance_stage
+  - 1
+- - github_importer
+  - 1
+- - gitlab_shell
+  - 2
+- - group_destroy
+  - 1
+- - group_export
+  - 1
+- - hashed_storage
+  - 1
+- - import_issues_csv
+  - 2
+- - incident_management
+  - 2
+- - invalid_gpg_signature_update
+  - 2
+- - irker
+  - 1
+- - jira_connect
+  - 1
+- - ldap_group_sync
+  - 2
+- - mail_scheduler
+  - 2
+- - mailers
+  - 2
+- - merge
+  - 5
+- - merge_request_mergeability_check
+  - 1
+- - migrate_external_diffs
+  - 1
+- - namespaceless_project_destroy
+  - 1
+- - new_epic
+  - 2
+- - new_issue
+  - 2
+- - new_merge_request
+  - 2
+- - new_note
+  - 2
+- - notifications
+  - 2
+- - object_pool
+  - 1
+- - object_storage
+  - 1
+- - pages
+  - 1
+- - pages_domain_ssl_renewal
+  - 1
+- - pages_domain_verification
+  - 1
+- - personal_access_tokens
+  - 1
+- - phabricator_import_import_tasks
+  - 1
+- - pipeline_background
+  - 1
+- - pipeline_cache
+  - 3
+- - pipeline_creation
+  - 4
+- - pipeline_default
+  - 3
+- - pipeline_hooks
+  - 2
+- - pipeline_processing
+  - 5
+- - post_receive
+  - 5
+- - process_commit
+  - 3
+- - project_cache
+  - 1
+- - project_daily_statistics
+  - 1
+- - project_destroy
+  - 1
+- - project_export
+  - 1
+- - project_import_schedule
+  - 1
+- - project_service
+  - 1
+- - project_update_repository_storage
+  - 1
+- - propagate_service_template
+  - 1
+- - reactive_caching
+  - 1
+- - rebase
+  - 2
+- - refresh_license_compliance_checks
+  - 2
+- - remote_mirror_notification
+  - 2
+- - repository_check
+  - 1
+- - repository_cleanup
+  - 1
+- - repository_fork
+  - 1
+- - repository_import
+  - 1
+- - repository_push_audit_event
+  - 1
+- - repository_remove_remote
+  - 1
+- - repository_update_mirror
+  - 1
+- - repository_update_remote_mirror
+  - 1
+- - self_monitoring_project_create
+  - 2
+- - self_monitoring_project_delete
+  - 2
+- - system_hook_push
+  - 1
+- - todos_destroyer
+  - 1
+- - update_external_pull_requests
+  - 3
+- - update_merge_requests
+  - 3
+- - update_namespace_statistics
+  - 1
+- - update_project_statistics
+  - 1
+- - upload_checksum
+  - 1
+- - web_hook
+  - 1

db/migrate/20200124053531_add_source_to_import_failures.rb

+# frozen_string_literal: true
+
+class AddSourceToImportFailures < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    add_column :import_failures, :source, :string, limit: 128
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_01_23_155929) do
+ActiveRecord::Schema.define(version: 2020_01_24_053531) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -2046,6 +2046,7 @@ ActiveRecord::Schema.define(version: 2020_01_23_155929) do
     t.string "exception_message", limit: 255
     t.integer "retry_count"
     t.integer "group_id"
+    t.string "source", limit: 128
     t.index ["correlation_id_value"], name: "index_import_failures_on_correlation_id_value"
     t.index ["group_id"], name: "index_import_failures_on_group_id_not_null", where: "(group_id IS NOT NULL)"
     t.index ["project_id"], name: "index_import_failures_on_project_id_not_null", where: "(project_id IS NOT NULL)"

doc/api/broadcast_messages.md

@@ -4,7 +4,7 @@
 Broadcast messages API operates on [broadcast messages](../user/admin_area/broadcast_messages.md).
-The broadcast message API is only accessible to administrators. All requests by:
+As of GitLab 12.8, GET requests do not require authentication. All other broadcast message API endpoints are accessible only to administrators. Non-GET requests by:
 - Guests will result in `401 Unauthorized`.
 - Regular users will result in `403 Forbidden`.
@@ -20,7 +20,7 @@ GET /broadcast_messages
 Example request:
 ```sh
-curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/broadcast_messages
+curl https://gitlab.example.com/api/v4/broadcast_messages
 ```
 Example response:
@@ -57,7 +57,7 @@ Parameters:
 Example request:
 ```sh
-curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/broadcast_messages/1
+curl https://gitlab.example.com/api/v4/broadcast_messages/1
 ```
 Example response:

doc/api/graphql/reference/gitlab_schema.graphql

@@ -6065,6 +6065,11 @@ type SentryDetailedError {
   """
   culprit: String!
+  """
+  External Base URL of the Sentry Instance
+  """
+  externalBaseUrl: String!
+
   """
   External URL of the error
   """
@@ -6100,6 +6105,11 @@ type SentryDetailedError {
   """
   gitlabCommitPath: String
+  """
+  URL of GitLab Issue
+  """
+  gitlabIssuePath: String
+
   """
   ID (global ID) of the error
   """
@@ -6155,6 +6165,11 @@ type SentryDetailedError {
   """
   status: SentryErrorStatus!
+  """
+  Tags associated with the Sentry Error
+  """
+  tags: SentryErrorTags!
+
   """
   Title of the error
   """
@@ -6208,6 +6223,21 @@ enum SentryErrorStatus {
   UNRESOLVED
 }
+"""
+State of a Sentry error
+"""
+type SentryErrorTags {
+  """
+  Severity level of the Sentry Error
+  """
+  level: String
+
+  """
+  Logger of the Sentry Error
+  """
+  logger: String
+}
+
 """
 Represents a snippet entry
 """

doc/api/graphql/reference/gitlab_schema.json

@@ -16746,6 +16746,24 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "externalBaseUrl",
+              "description": "External Base URL of the Sentry Instance",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "externalUrl",
               "description": "External URL of the error",
@@ -16864,6 +16882,20 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "gitlabIssuePath",
+              "description": "URL of GitLab Issue",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "id",
               "description": "ID (global ID) of the error",
@@ -17050,6 +17082,24 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "tags",
+              "description": "Tags associated with the Sentry Error",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "SentryErrorTags",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "title",
               "description": "Title of the error",
@@ -17196,6 +17246,47 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "SentryErrorTags",
+          "description": "State of a Sentry error",
+          "fields": [
+            {
+              "name": "level",
+              "description": "Severity level of the Sentry Error",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "logger",
+              "description": "Logger of the Sentry Error",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "OBJECT",
           "name": "GrafanaIntegration",