Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/leipert-fix-user-label-bug.yml

+---
+title: Fix autocomplete limitation bug
+merge_request: 25127
+author:
+type: fixed

changelogs/unreleased/refactoring-entities-file-18.yml

+---
+title: Separate board, list and other entities into own class files
+merge_request: 24939
+author: Rajendra Kadam
+type: added

changelogs/unreleased/refactoring-entities-file-20.yml

+---
+title: Separate tag and release entities into own class files
+merge_request: 24943
+author: Rajendra Kadam
+type: added

db/migrate/20200206112850_create_snippet_repository_table.rb

+# frozen_string_literal: true
+
+class CreateSnippetRepositoryTable < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    create_table :snippet_repositories, id: false, primary_key: :snippet_id do |t|
+      t.references :shard, null: false, index: true, foreign_key: { on_delete: :restrict }
+      t.references :snippet, primary_key: true, default: nil, index: false, foreign_key: { on_delete: :cascade }
+      t.string :disk_path, limit: 80, null: false, index: { unique: true }
+    end
+  end
+end

db/schema.rb

@@ -3892,6 +3892,13 @@ ActiveRecord::Schema.define(version: 2020_02_12_052620) do
     t.index ["user_id"], name: "index_smartcard_identities_on_user_id"
   end
+  create_table "snippet_repositories", primary_key: "snippet_id", id: :bigint, default: nil, force: :cascade do |t|
+    t.bigint "shard_id", null: false
+    t.string "disk_path", limit: 80, null: false
+    t.index ["disk_path"], name: "index_snippet_repositories_on_disk_path", unique: true
+    t.index ["shard_id"], name: "index_snippet_repositories_on_shard_id"
+  end
+
   create_table "snippet_user_mentions", force: :cascade do |t|
     t.integer "snippet_id", null: false
     t.integer "note_id"
@@ -4963,6 +4970,8 @@ ActiveRecord::Schema.define(version: 2020_02_12_052620) do
   add_foreign_key "services", "projects", name: "fk_71cce407f9", on_delete: :cascade
   add_foreign_key "slack_integrations", "services", on_delete: :cascade
   add_foreign_key "smartcard_identities", "users", on_delete: :cascade
+  add_foreign_key "snippet_repositories", "shards", on_delete: :restrict
+  add_foreign_key "snippet_repositories", "snippets", on_delete: :cascade
   add_foreign_key "snippet_user_mentions", "notes", on_delete: :cascade
   add_foreign_key "snippet_user_mentions", "snippets", on_delete: :cascade
   add_foreign_key "snippets", "projects", name: "fk_be41fd4bb7", on_delete: :cascade

doc/administration/audit_events.md

@@ -107,6 +107,7 @@ recorded:
 - Started/stopped user impersonation
 - Changed username ([introduced](https://gitlab.com/gitlab-org/gitlab/issues/7797) in GitLab 12.8)
 - User was deleted ([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)
 It is 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/install/aws/index.md

@@ -357,15 +357,7 @@ In this step we'll configure some details:
 ### Add storage
-The root volume is 8GB by default and should be enough given that we won't store
-any data there. Let's create a new EBS volume that will host the Git data. Its
-size depends on your needs and you can always migrate to a bigger volume later.
-You will be able to [set up that volume](#setting-up-the-ebs-volume)
-after the instance is created.
-
-CAUTION: **Caution:**
-We **do not** recommend using the AWS Elastic File System (EFS), as it can result
-in [significantly degraded performance](../../administration/high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs).
+The root volume is 8GB by default and should be enough given that we won't store any data there.
 ### Configure security group
@@ -490,33 +482,6 @@ sudo gitlab-ctl status
 If everything looks good, you should be able to reach GitLab in your browser.
-### Setting up the EBS volume
-
-The EBS volume will host the Git repositories data:
-
-1. First, format the `/dev/xvdb` volume and then mount it under the directory
-   where the data will be stored. For example, `/mnt/gitlab-data/`.
-1. Tell GitLab to store its data in the new directory by editing
-   `/etc/gitlab/gitlab.rb` with your editor:
-
-   ```ruby
-   git_data_dirs({
-     "default" => { "path" => "/mnt/gitlab-data" }
-   })
-   ```
-
-   where `/mnt/gitlab-data` the location where you will store the Git data.
-
-1. Save the file and reconfigure GitLab:
-
-   ```shell
-   sudo gitlab-ctl reconfigure
-   ```
-
-TIP: **Tip:**
-If you wish to add more than one data volumes to store the Git repositories,
-read the [repository storage paths docs](../../administration/repository_storage_paths.md).
-
 ### Setting up Gitaly
 CAUTION: **Caution:** In this architecture, having a single Gitaly server creates a single point of failure. This limitation will be removed once [Gitaly HA](https://gitlab.com/groups/gitlab-org/-/epics/842) is released.  

lib/api/entities.rb

@@ -163,160 +163,6 @@ module API
       end
     end
-    class List < Grape::Entity
-      expose :id
-      expose :label, using: Entities::LabelBasic
-      expose :position
-    end
-
-    class Board < Grape::Entity
-      expose :id
-      expose :project, using: Entities::BasicProjectDetails
-
-      expose :lists, using: Entities::List do |board|
-        board.destroyable_lists
-      end
-    end
-
-    class Compare < Grape::Entity
-      expose :commit, using: Entities::Commit do |compare, _|
-        compare.commits.last
-      end
-
-      expose :commits, using: Entities::Commit do |compare, _|
-        compare.commits
-      end
-
-      expose :diffs, using: Entities::Diff do |compare, _|
-        compare.diffs.diffs.to_a
-      end
-
-      expose :compare_timeout do |compare, _|
-        compare.diffs.diffs.overflow?
-      end
-
-      expose :same, as: :compare_same_ref
-    end
-
-    class Contributor < Grape::Entity
-      expose :name, :email, :commits, :additions, :deletions
-    end
-
-    class BroadcastMessage < Grape::Entity
-      expose :message, :starts_at, :ends_at, :color, :font, :target_path, :broadcast_type
-    end
-
-    class Release < Grape::Entity
-      include ::API::Helpers::Presentable
-
-      expose :name do |release, _|
-        can_download_code? ? release.name : "Release-#{release.id}"
-      end
-      expose :tag, as: :tag_name, if: ->(_, _) { can_download_code? }
-      expose :description
-      expose :description_html do |entity|
-        MarkupHelper.markdown_field(entity, :description)
-      end
-      expose :created_at
-      expose :released_at
-      expose :author, using: Entities::UserBasic, if: -> (release, _) { release.author.present? }
-      expose :commit, using: Entities::Commit, if: ->(_, _) { can_download_code? }
-      expose :upcoming_release?, as: :upcoming_release
-      expose :milestones, using: Entities::Milestone, if: -> (release, _) { release.milestones.present? && can_read_milestone? }
-      expose :commit_path, expose_nil: false
-      expose :tag_path, expose_nil: false
-      expose :evidence_sha, expose_nil: false, if: ->(_, _) { can_download_code? }
-      expose :assets do
-        expose :assets_count, as: :count do |release, _|
-          assets_to_exclude = can_download_code? ? [] : [:sources]
-          release.assets_count(except: assets_to_exclude)
-        end
-        expose :sources, using: Entities::Releases::Source, if: ->(_, _) { can_download_code? }
-        expose :links, using: Entities::Releases::Link do |release, options|
-          release.links.sorted
-        end
-        expose :evidence_file_path, expose_nil: false, if: ->(_, _) { can_download_code? }
-      end
-      expose :_links do
-        expose :self_url, as: :self, expose_nil: false
-        expose :merge_requests_url, expose_nil: false
-        expose :issues_url, expose_nil: false
-        expose :edit_url, expose_nil: false
-      end
-
-      private
-
-      def can_download_code?
-        Ability.allowed?(options[:current_user], :download_code, object.project)
-      end
-
-      def can_read_milestone?
-        Ability.allowed?(options[:current_user], :read_milestone, object.project)
-      end
-    end
-
-    class Tag < Grape::Entity
-      expose :name, :message, :target
-
-      expose :commit, using: Entities::Commit do |repo_tag, options|
-        options[:project].repository.commit(repo_tag.dereferenced_target)
-      end
-
-      # rubocop: disable CodeReuse/ActiveRecord
-      expose :release, using: Entities::TagRelease do |repo_tag, options|
-        options[:project].releases.find_by(tag: repo_tag.name)
-      end
-      # rubocop: enable CodeReuse/ActiveRecord
-
-      expose :protected do |repo_tag, options|
-        ::ProtectedTag.protected?(options[:project], repo_tag.name)
-      end
-    end
-
-    class Runner < Grape::Entity
-      expose :id
-      expose :description
-      expose :ip_address
-      expose :active
-      expose :instance_type?, as: :is_shared
-      expose :name
-      expose :online?, as: :online
-      expose :status
-    end
-
-    class RunnerDetails < Runner
-      expose :tag_list
-      expose :run_untagged
-      expose :locked
-      expose :maximum_timeout
-      expose :access_level
-      expose :version, :revision, :platform, :architecture
-      expose :contacted_at
-      expose :token, if: lambda { |runner, options| options[:current_user].admin? || !runner.instance_type? }
-      # rubocop: disable CodeReuse/ActiveRecord
-      expose :projects, with: Entities::BasicProjectDetails do |runner, options|
-        if options[:current_user].admin?
-          runner.projects
-        else
-          options[:current_user].authorized_projects.where(id: runner.projects)
-        end
-      end
-      # rubocop: enable CodeReuse/ActiveRecord
-      # rubocop: disable CodeReuse/ActiveRecord
-      expose :groups, with: Entities::BasicGroupDetails do |runner, options|
-        if options[:current_user].admin?
-          runner.groups
-        else
-          options[:current_user].authorized_groups.where(id: runner.groups)
-        end
-      end
-      # rubocop: enable CodeReuse/ActiveRecord
-    end
-
-    class RunnerRegistrationDetails < Grape::Entity
-      expose :id, :token
-    end
-
     class Trigger < Grape::Entity
       include ::API::Helpers::Presentable

lib/api/entities/board.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Board < Grape::Entity
+      expose :id
+      expose :project, using: Entities::BasicProjectDetails
+
+      expose :lists, using: Entities::List do |board|
+        board.destroyable_lists
+      end
+    end
+  end
+end

lib/api/entities/broadcast_message.rb

@@ -3,7 +3,7 @@
 module API
   module Entities
     class BroadcastMessage < Grape::Entity
-      expose :id, :message, :starts_at, :ends_at, :color, :font
+      expose :id, :message, :starts_at, :ends_at, :color, :font, :target_path, :broadcast_type
       expose :active?, as: :active
     end
   end

lib/api/entities/compare.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Compare < Grape::Entity
+      expose :commit, using: Entities::Commit do |compare, _|
+        compare.commits.last
+      end
+
+      expose :commits, using: Entities::Commit do |compare, _|
+        compare.commits
+      end
+
+      expose :diffs, using: Entities::Diff do |compare, _|
+        compare.diffs.diffs.to_a
+      end
+
+      expose :compare_timeout do |compare, _|
+        compare.diffs.diffs.overflow?
+      end
+
+      expose :same, as: :compare_same_ref
+    end
+  end
+end

lib/api/entities/contributor.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Contributor < Grape::Entity
+      expose :name, :email, :commits, :additions, :deletions
+    end
+  end
+end

lib/api/entities/list.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class List < Grape::Entity
+      expose :id
+      expose :label, using: Entities::LabelBasic
+      expose :position
+    end
+  end
+end

lib/api/entities/release.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Release < Grape::Entity
+      include ::API::Helpers::Presentable
+
+      expose :name do |release, _|
+        can_download_code? ? release.name : "Release-#{release.id}"
+      end
+      expose :tag, as: :tag_name, if: ->(_, _) { can_download_code? }
+      expose :description
+      expose :description_html do |entity|
+        MarkupHelper.markdown_field(entity, :description)
+      end
+      expose :created_at
+      expose :released_at
+      expose :author, using: Entities::UserBasic, if: -> (release, _) { release.author.present? }
+      expose :commit, using: Entities::Commit, if: ->(_, _) { can_download_code? }
+      expose :upcoming_release?, as: :upcoming_release
+      expose :milestones, using: Entities::Milestone, if: -> (release, _) { release.milestones.present? && can_read_milestone? }
+      expose :commit_path, expose_nil: false
+      expose :tag_path, expose_nil: false
+      expose :evidence_sha, expose_nil: false, if: ->(_, _) { can_download_code? }
+      expose :assets do
+        expose :assets_count, as: :count do |release, _|
+          assets_to_exclude = can_download_code? ? [] : [:sources]
+          release.assets_count(except: assets_to_exclude)
+        end
+        expose :sources, using: Entities::Releases::Source, if: ->(_, _) { can_download_code? }
+        expose :links, using: Entities::Releases::Link do |release, options|
+          release.links.sorted
+        end
+        expose :evidence_file_path, expose_nil: false, if: ->(_, _) { can_download_code? }
+      end
+      expose :_links do
+        expose :self_url, as: :self, expose_nil: false
+        expose :merge_requests_url, expose_nil: false
+        expose :issues_url, expose_nil: false
+        expose :edit_url, expose_nil: false
+      end
+
+      private
+
+      def can_download_code?
+        Ability.allowed?(options[:current_user], :download_code, object.project)
+      end
+
+      def can_read_milestone?
+        Ability.allowed?(options[:current_user], :read_milestone, object.project)
+      end
+    end
+  end
+end

lib/api/entities/runner.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Runner < Grape::Entity
+      expose :id
+      expose :description
+      expose :ip_address
+      expose :active
+      expose :instance_type?, as: :is_shared
+      expose :name
+      expose :online?, as: :online
+      expose :status
+    end
+  end
+end

lib/api/entities/runner_details.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class RunnerDetails < Runner
+      expose :tag_list
+      expose :run_untagged
+      expose :locked
+      expose :maximum_timeout
+      expose :access_level
+      expose :version, :revision, :platform, :architecture
+      expose :contacted_at
+      expose :token, if: lambda { |runner, options| options[:current_user].admin? || !runner.instance_type? }
+      # rubocop: disable CodeReuse/ActiveRecord
+      expose :projects, with: Entities::BasicProjectDetails do |runner, options|
+        if options[:current_user].admin?
+          runner.projects
+        else
+          options[:current_user].authorized_projects.where(id: runner.projects)
+        end
+      end
+      # rubocop: enable CodeReuse/ActiveRecord
+      # rubocop: disable CodeReuse/ActiveRecord
+      expose :groups, with: Entities::BasicGroupDetails do |runner, options|
+        if options[:current_user].admin?
+          runner.groups
+        else
+          options[:current_user].authorized_groups.where(id: runner.groups)
+        end
+      end
+      # rubocop: enable CodeReuse/ActiveRecord
+    end
+  end
+end

lib/api/entities/runner_registration_details.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class RunnerRegistrationDetails < Grape::Entity
+      expose :id, :token
+    end
+  end
+end

lib/api/entities/tag.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Tag < Grape::Entity
+      expose :name, :message, :target
+
+      expose :commit, using: Entities::Commit do |repo_tag, options|
+        options[:project].repository.commit(repo_tag.dereferenced_target)
+      end
+
+      # rubocop: disable CodeReuse/ActiveRecord
+      expose :release, using: Entities::TagRelease do |repo_tag, options|
+        options[:project].releases.find_by(tag: repo_tag.name)
+      end
+      # rubocop: enable CodeReuse/ActiveRecord
+
+      expose :protected do |repo_tag, options|
+        ::ProtectedTag.protected?(options[:project], repo_tag.name)
+      end
+    end
+  end
+end

lib/api/project_container_repositories.rb

@@ -80,7 +80,7 @@ module API
         render_api_error!(message, 400) unless obtain_new_cleanup_container_lease
         CleanupContainerRepositoryWorker.perform_async(current_user.id, repository.id,
-          declared_params.except(:repository_id))
+          declared_params.except(:repository_id).merge(container_expiration_policy: false))
         track_event('delete_tag_bulk')

lib/gitlab/git_access_snippet.rb

+# frozen_string_literal: true
+
+module Gitlab
+  class GitAccessSnippet < GitAccess
+    ERROR_MESSAGES = {
+      snippet_not_found: 'The snippet you were looking for could not be found.',
+      repository_not_found: 'The snippet repository you were looking for could not be found.'
+    }.freeze
+
+    attr_reader :snippet
+
+    def initialize(actor, snippet, protocol, **kwargs)
+      @snippet = snippet
+
+      super(actor, project, protocol, **kwargs)
+    end
+
+    def check(cmd, _changes)
+      unless Feature.enabled?(:version_snippets, user)
+        raise NotFoundError, ERROR_MESSAGES[:snippet_not_found]
+      end
+
+      check_snippet_accessibility!
+
+      success_result(cmd)
+    end
+
+    def project
+      snippet&.project
+    end
+
+    private
+
+    def repository
+      snippet&.repository
+    end
+
+    def check_snippet_accessibility!
+      if snippet.blank?
+        raise NotFoundError, ERROR_MESSAGES[:snippet_not_found]
+      end
+
+      unless repository&.exists?
+        raise NotFoundError, ERROR_MESSAGES[:repository_not_found]
+      end
+    end
+  end
+end