Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into camilstaps/gitlab-ce-new-66023-public-private-fork-counts

doc/user/project/merge_requests/index.md

@@ -630,10 +630,7 @@ troubleshooting steps.
 ### Merge request cannot retrieve the pipeline status
-This can occur for one of two reasons:
-
-- Sidekiq doesn't pick up the changes fast enough
-- Because of the bug described in [#41545](https://gitlab.com/gitlab-org/gitlab-ce/issues/41545)
+This can occur if Sidekiq doesn't pick up the changes fast enough.
 #### Sidekiq

doc/user/project/merge_requests/merge_request_approvals.md

@@ -184,6 +184,10 @@ the merge request. To enable this feature:
 When this feature is enabled, all merge requests will need approval
 from one code owner per matched rule before it can be merged.
+NOTE: **Note:** Only the `CODEOWNERS` file on the default branch is evaluated for
+Merge Request approvals. If `CODEOWNERS` is changed on a non-default branch, those
+changes will not affect approvals until merged to the default branch.
+
 ## Overriding the merge request approvals default settings
 > Introduced in GitLab Enterprise Edition 9.4.
@@ -196,7 +200,7 @@ If approvals are [set at the project level](#editing-approvals), the
 default configuration (number of required approvals and approvers) can be
 overridden for each merge request in that project.
-One possible scenario would be to to assign a group of approvers at the project
+One possible scenario would be to assign a group of approvers at the project
 level and change them later when creating or editing the merge request.
 First, you have to enable this option in the project's settings:

doc/user/project/operations/tracing.md

@@ -26,7 +26,7 @@ and [OpenShift](https://github.com/jaegertracing/jaeger-openshift).
 GitLab provides an easy way to open the Jaeger UI from within your project:
-1. [Set up Jaeger](#deploying-jaeger) and configure your application using one of the
+1. [Set up Jaeger](https://www.jaegertracing.io) and configure your application using one of the
    [client libraries](https://www.jaegertracing.io/docs/latest/client-libraries/).
 1. Navigate to your project's **Settings > Operations** and provide the Jaeger URL.
 1. Click **Save changes** for the changes to take effect.

doc/user/project/pages/getting_started_part_four.md

@@ -53,9 +53,9 @@ write in the `.gitlab-ci.yml` the script you want to run so
 GitLab Runner will do it for you. It looks more complicated than it
 is. What you need to tell the Runner:
-```
-$ gem install jekyll
-$ jekyll build
+```sh
+gem install jekyll
+jekyll build
 ```
 ### Script

doc/user/project/settings/index.md

@@ -32,6 +32,8 @@ links will be missing from the sidebar UI.
 You can still access them with direct links if you can access Merge Requests. This is deliberate, if you can see
 Issues or Merge Requests, both of which use Labels and Milestones, then you shouldn't be denied access to Labels and Milestones pages.
+Project [Snippets](../../snippets.md) are enabled by default.
+
 #### Disabling email notifications
 You can disable all email notifications related to the project by selecting the

doc/user/snippets.md

@@ -33,6 +33,11 @@ overview that shows snippets you created and allows you to explore all snippets.
 If you want to discover snippets that belong to a specific project, you can navigate
 to the Snippets page via the left side navigation on the project page.
+Project snippets are enabled and available by default, but they can
+be disabled by navigating to your project's **Settings**, expanding
+**Visibility, project features, permissions** and scrolling down to
+**Snippets**. From there, you can toggle to disable them or select a
+different visibility level from the dropdown menu.
 ## Snippet comments

doc/workflow/lfs/lfs_administration.md

@@ -134,13 +134,13 @@ There are two ways to manually do the same thing as automatic uploading (describ
 **Option 1: rake task**
-```
-$ rake gitlab:lfs:migrate
+```sh
+rake gitlab:lfs:migrate
 ```
 **Option 2: rails console**
-```
+```sh
 $ sudo gitlab-rails console            # Login to rails console
 > # Upload LFS files manually

lib/api/entities.rb

@@ -1312,6 +1312,10 @@ module API
         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

lib/api/helpers.rb

@@ -5,10 +5,10 @@ module API
     include Gitlab::Utils
     include Helpers::Pagination
-    SUDO_HEADER = "HTTP_SUDO".freeze
-    GITLAB_SHARED_SECRET_HEADER = "Gitlab-Shared-Secret".freeze
+    SUDO_HEADER = "HTTP_SUDO"
+    GITLAB_SHARED_SECRET_HEADER = "Gitlab-Shared-Secret"
     SUDO_PARAM = :sudo
-    API_USER_ENV = 'gitlab.api.user'.freeze
+    API_USER_ENV = 'gitlab.api.user'
     def declared_params(options = {})
       options = { include_parent_namespaces: false }.merge(options)

lib/api/helpers/projects_helpers.rb

@@ -38,7 +38,8 @@ module API
         optional :only_allow_merge_if_pipeline_succeeds, type: Boolean, desc: 'Only allow to merge if builds succeed'
         optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all discussions are resolved'
         optional :tag_list, type: Array[String], desc: 'The list of tags for a project'
-        optional :avatar, type: File, desc: 'Avatar image for project'
+        # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960
+        optional :avatar, type: File, desc: 'Avatar image for project' # rubocop:disable Scalability/FileUploads
         optional :printing_merge_request_link_enabled, type: Boolean, desc: 'Show link to create/view merge request when pushing from the command line'
         optional :merge_method, type: String, values: %w(ff rebase_merge merge), desc: 'The merge method used when merging merge requests'
         optional :initialize_with_readme, type: Boolean, desc: "Initialize a project with a README.md"

lib/api/helpers/runner.rb

@@ -3,7 +3,7 @@
 module API
   module Helpers
     module Runner
-      JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze
+      JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'
       JOB_TOKEN_PARAM = :token
       def runner_registration_token_valid?

lib/api/pages_domains.rb

@@ -90,8 +90,11 @@ module API
       end
       params do
         requires :domain, type: String, desc: 'The domain'
+        # rubocop:disable Scalability/FileUploads
+        # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960
         optional :certificate, allow_blank: false, types: [File, String], desc: 'The certificate', as: :user_provided_certificate
         optional :key, allow_blank: false, types: [File, String], desc: 'The key', as: :user_provided_key
+        # rubocop:enable Scalability/FileUploads
         all_or_none_of :user_provided_certificate, :user_provided_key
       end
       post ":id/pages/domains" do
@@ -111,8 +114,11 @@ module API
       desc 'Updates a pages domain'
       params do
         requires :domain, type: String, desc: 'The domain'
+        # rubocop:disable Scalability/FileUploads
+        # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960
         optional :certificate, allow_blank: false, types: [File, String], desc: 'The certificate', as: :user_provided_certificate
         optional :key, allow_blank: false, types: [File, String], desc: 'The key', as: :user_provided_key
+        # rubocop:enable Scalability/FileUploads
       end
       put ":id/pages/domains/:domain", requirements: PAGES_DOMAINS_ENDPOINT_REQUIREMENTS do
         authorize! :update_pages, user_project

lib/api/project_import.rb

@@ -27,7 +27,8 @@ module API
     resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
       params do
         requires :path, type: String, desc: 'The new project path and name'
-        requires :file, type: File, desc: 'The project export file to be imported'
+        # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960
+        requires :file, type: File, desc: 'The project export file to be imported' # rubocop:disable Scalability/FileUploads
         optional :namespace, type: String, desc: "The ID or name of the namespace that the project will be imported into. Defaults to the current user's namespace."
         optional :overwrite, type: Boolean, default: false, desc: 'If there is a project in the same namespace and with the same name overwrite it'
         optional :override_params,

lib/api/projects.rb

@@ -478,7 +478,8 @@ module API
       desc 'Upload a file'
       params do
-        requires :file, type: File, desc: 'The file to be uploaded'
+        # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960
+        requires :file, type: File, desc: 'The file to be uploaded' # rubocop:disable Scalability/FileUploads
       end
       post ":id/uploads" do
         UploadService.new(user_project, params[:file]).execute.to_h

lib/api/users.rb

@@ -50,7 +50,8 @@ module API
           optional :admin, type: Boolean, desc: 'Flag indicating the user is an administrator'
           optional :can_create_group, type: Boolean, desc: 'Flag indicating the user can create groups'
           optional :external, type: Boolean, desc: 'Flag indicating the user is an external user'
-          optional :avatar, type: File, desc: 'Avatar image for user'
+          # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960
+          optional :avatar, type: File, desc: 'Avatar image for user' # rubocop:disable Scalability/FileUploads
           optional :private_profile, type: Boolean, default: false, desc: 'Flag indicating the user has a private profile'
           all_or_none_of :extern_uid, :provider

lib/backup/manager.rb

@@ -4,7 +4,7 @@ module Backup
   class Manager
     ARCHIVES_TO_BACKUP = %w[uploads builds artifacts pages lfs registry].freeze
     FOLDERS_TO_BACKUP = %w[repositories db].freeze
-    FILE_NAME_SUFFIX = '_gitlab_backup.tar'.freeze
+    FILE_NAME_SUFFIX = '_gitlab_backup.tar'
     attr_reader :progress

lib/banzai/filter/color_filter.rb

@@ -5,7 +5,7 @@ module Banzai
     # HTML filter that renders `color` followed by a color "chip".
     #
     class ColorFilter < HTML::Pipeline::Filter
-      COLOR_CHIP_CLASS = 'gfm-color_chip'.freeze
+      COLOR_CHIP_CLASS = 'gfm-color_chip'
       def call
         doc.css('code').each do |node|

lib/banzai/filter/external_link_filter.rb

@@ -5,8 +5,8 @@ module Banzai
     # HTML Filter to modify the attributes of external links
     class ExternalLinkFilter < HTML::Pipeline::Filter
       SCHEMES      = ['http', 'https', nil].freeze
-      RTLO         = "\u202E".freeze
-      ENCODED_RTLO = '%E2%80%AE'.freeze
+      RTLO         = "\u202E"
+      ENCODED_RTLO = '%E2%80%AE'
       def call
         links.each do |node|

lib/banzai/filter/footnote_filter.rb

@@ -17,8 +17,8 @@ module Banzai
     #
     class FootnoteFilter < HTML::Pipeline::Filter
       INTEGER_PATTERN                 = /\A\d+\z/.freeze
-      FOOTNOTE_ID_PREFIX              = 'fn'.freeze
-      FOOTNOTE_LINK_ID_PREFIX         = 'fnref'.freeze
+      FOOTNOTE_ID_PREFIX              = 'fn'
+      FOOTNOTE_LINK_ID_PREFIX         = 'fnref'
       FOOTNOTE_LI_REFERENCE_PATTERN   = /\A#{FOOTNOTE_ID_PREFIX}\d+\z/.freeze
       FOOTNOTE_LINK_REFERENCE_PATTERN = /\A#{FOOTNOTE_LINK_ID_PREFIX}\d+\z/.freeze
       FOOTNOTE_START_NUMBER           = 1

lib/banzai/filter/math_filter.rb

@@ -11,14 +11,14 @@ module Banzai
     #
     class MathFilter < HTML::Pipeline::Filter
       # Attribute indicating inline or display math.
-      STYLE_ATTRIBUTE = 'data-math-style'.freeze
+      STYLE_ATTRIBUTE = 'data-math-style'
       # Class used for tagging elements that should be rendered
-      TAG_CLASS = 'js-render-math'.freeze
-      INLINE_CLASSES = "code math #{TAG_CLASS}".freeze
-      DOLLAR_SIGN = '$'.freeze
+      TAG_CLASS = 'js-render-math'
+      INLINE_CLASSES = "code math #{TAG_CLASS}"
+      DOLLAR_SIGN = '$'
       def call
         doc.css('code').each do |code|