Add latest changes from gitlab-org/gitlab@master

app/controllers/concerns/invisible_captcha.rb → app/controllers/concerns/invisible_captcha_on_signup.rb

 # frozen_string_literal: true
-module InvisibleCaptcha
+module InvisibleCaptchaOnSignup
   extend ActiveSupport::Concern
   included do

app/controllers/projects/releases_controller.rb

@@ -3,7 +3,7 @@
 class Projects::ReleasesController < Projects::ApplicationController
   # Authorize
   before_action :require_non_empty_project, except: [:index]
-  before_action :release, only: %i[edit show update]
+  before_action :release, only: %i[edit show update downloads]
   before_action :authorize_read_release!
   before_action do
     push_frontend_feature_flag(:release_issue_summary, project)
@@ -40,6 +40,10 @@ class Projects::ReleasesController < Projects::ApplicationController
     end
   end
+  def downloads
+    redirect_to link.url
+  end
+
   protected
   def releases
@@ -69,6 +73,14 @@ class Projects::ReleasesController < Projects::ApplicationController
     @release ||= project.releases.find_by_tag!(sanitized_tag_name)
   end
+  def link
+    release.links.find_by_filepath!(sanitized_filepath)
+  end
+
+  def sanitized_filepath
+    CGI.unescape(params[:filepath])
+  end
+
   def sanitized_tag_name
     CGI.unescape(params[:tag])
   end

app/controllers/registrations_controller.rb

@@ -4,7 +4,7 @@ class RegistrationsController < Devise::RegistrationsController
   include Recaptcha::Verify
   include AcceptsPendingInvitations
   include RecaptchaExperimentHelper
-  include InvisibleCaptcha
+  include InvisibleCaptchaOnSignup
   layout :choose_layout

app/graphql/mutations/issues/update.rb

@@ -17,12 +17,12 @@ module Mutations
       argument :due_date,
                Types::TimeType,
-               required: true,
+               required: false,
                description: copy_field_description(Types::IssueType, :due_date)
       argument :confidential,
                GraphQL::BOOLEAN_TYPE,
-               required: true,
+               required: false,
                description: copy_field_description(Types::IssueType, :confidential)
       def resolve(project_path:, iid:, **args)

app/models/merge_request_diff_commit.rb

@@ -10,8 +10,9 @@ class MergeRequestDiffCommit < ApplicationRecord
   sha_attribute :sha
   alias_attribute :id, :sha
+  # Deprecated; use `bulk_insert!` from `BulkInsertSafe` mixin instead.
+  # cf. https://gitlab.com/gitlab-org/gitlab/issues/207989 for progress
   def self.create_bulk(merge_request_diff_id, commits)
-    warn 'Deprecated; use `bulk_insert` from `BulkInsertSafe` mixin instead'
     rows = commits.map.with_index do |commit, index|
       # See #parent_ids.
       commit_hash = commit.to_hash.except(:parent_ids)

app/services/post_receive_service.rb

@@ -28,7 +28,7 @@ class PostReceiveService
       response.add_alert_message(message)
     end
-    broadcast_message = BroadcastMessage.current&.last&.message
+    broadcast_message = BroadcastMessage.current_banner_messages&.last&.message
     response.add_alert_message(broadcast_message)
     response.add_merge_request_urls(merge_request_urls)

app/views/snippets/notes/_actions.html.haml

@@ -2,7 +2,6 @@
   - if note.emoji_awardable?
     .note-actions-item
       = link_to '#', title: _('Add reaction'), class: "note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip", data: { position: 'right' } do
-        = icon('spinner spin')
         %span{ class: 'link-highlight award-control-icon-neutral' }= sprite_icon('slight-smile')
         %span{ class: 'link-highlight award-control-icon-positive' }= sprite_icon('smiley')
         %span{ class: 'link-highlight award-control-icon-super-positive' }= sprite_icon('smile')

changelogs/unreleased/199220-snippet-index-desc.yml

+---
+title: Add trigram index on snippet description
+merge_request: 26341
+author:
+type: performance

changelogs/unreleased/27300-add-filepath-redirect-url.yml

+---
+title: Add filepath redirect url
+merge_request: 25541
+author:
+type: added

changelogs/unreleased/Resolve-Migrate--fa-spinner-app-views-snippets-notes.yml

+---
+title: Remove .fa-spinner from app/views/snippets/notes
+merge_request: 25036
+author: nuwe1
+type: other

changelogs/unreleased/limit-broadcast-notifications-to-ui.yml

+---
+title: Limit notification-type broadcast display to web interface
+merge_request: 26236
+author: Aleksandrs Ļedovskis
+type: changed

changelogs/unreleased/sha-params-validator.yml

+---
+title: Add grape custom validator for sha params
+merge_request: 26220
+author: Rajendra Kadam
+type: added

config/routes/project.rb

@@ -171,6 +171,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         resources :releases, only: [:index, :show, :edit], param: :tag, constraints: { tag: %r{[^/]+} } do
           member do
             get :evidence
+            get :downloads, path: 'downloads/*filepath', format: false
           end
         end

db/migrate/20200303074328_add_index_on_snippet_description.rb

+# frozen_string_literal: true
+
+class AddIndexOnSnippetDescription < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_snippets_on_description_trigram'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :snippets, :description, name: INDEX_NAME, using: :gin, opclass: { description: :gin_trgm_ops }
+  end
+
+  def down
+    remove_concurrent_index_by_name :snippets, INDEX_NAME
+  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_02_27_165129) do
+ActiveRecord::Schema.define(version: 2020_03_03_074328) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -3964,6 +3964,7 @@ ActiveRecord::Schema.define(version: 2020_02_27_165129) do
     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"
+    t.index ["description"], name: "index_snippets_on_description_trigram", opclass: :gin_trgm_ops, using: :gin
     t.index ["file_name"], name: "index_snippets_on_file_name_trigram", opclass: :gin_trgm_ops, using: :gin
     t.index ["project_id", "visibility_level"], name: "index_snippets_on_project_id_and_visibility_level"
     t.index ["title"], name: "index_snippets_on_title_trigram", opclass: :gin_trgm_ops, using: :gin

doc/administration/audit_events.md

@@ -107,6 +107,7 @@ recorded:
 - User was deleted ([introduced](https://gitlab.com/gitlab-org/gitlab/issues/251) in GitLab 12.8)
 - User was added ([introduced](https://gitlab.com/gitlab-org/gitlab/issues/251) in GitLab 12.8)
 - User was blocked via Admin Area ([introduced](https://gitlab.com/gitlab-org/gitlab/issues/251) in GitLab 12.8)
+- User was blocked via API ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25872) in GitLab 12.9)
 It's possible to filter particular actions by choosing an audit data type from
 the filter dropdown box. You can further filter by specific group, project, or user

doc/api/graphql/reference/gitlab_schema.graphql

@@ -8011,7 +8011,7 @@ input UpdateIssueInput {
   """
   Indicates the issue is confidential
   """
-  confidential: Boolean!
+  confidential: Boolean
   """
   Description of the issue
@@ -8021,7 +8021,7 @@ input UpdateIssueInput {
   """
   Due date of the issue
   """
-  dueDate: Time!
+  dueDate: Time
   """
   The desired health status

doc/api/graphql/reference/gitlab_schema.json

@@ -21114,13 +21114,9 @@
               "name": "dueDate",
               "description": "Due date of the issue",
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Time",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Time",
+                "ofType": null
               },
               "defaultValue": null
             },
@@ -21128,13 +21124,9 @@
               "name": "confidential",
               "description": "Indicates the issue is confidential",
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
               },
               "defaultValue": null
             },