Add latest changes from gitlab-org/gitlab@master

.gitignore

@@ -83,6 +83,7 @@ package-lock.json
 jsdoc/
 **/tmp/rubocop_cache/**
 .overcommit.yml
+.overcommit.yml.backup
 .projections.json
 /qa/.rakeTasks
 webpack-dev-server.json

.overcommit.yml.example

@@ -15,6 +15,13 @@
 #
 # Uncomment the following lines to make the configuration take effect.
+# Make sure to run `cd tooling/overcommit && make && cd -`
+gemfile: 'tooling/overcommit/gems.rb'
+
+PostCheckout:
+  BundleInstall:
+    enabled: true
+
 PreCommit:
   AuthorName:
     enabled: false
@@ -35,6 +42,19 @@ PreCommit:
 #    on_warn: fail # Treat all warnings as failures
   ScssLint:
     enabled: true
+
+CommitMsg:
+  TextWidth:
+    enabled: true
+    min_subject_width: 8 # three 2-letter words with 2 spaces
+    max_subject_width: 72
+    quiet: false
+
+  EmptyMessage:
+    enabled: true
+    required: true
+    description: 'Checking for empty commit message'
+
 #PostCheckout:
 #  ALL: # Special hook name that customizes all hooks of this type
 #    quiet: true # Change all post-checkout hooks to only display output on failure

.rubocop.yml

@@ -347,6 +347,8 @@ RSpec/HaveGitlabHttpStatus:
     - 'ee/spec/features/**/*'
     - 'spec/controllers/*.rb'
     - 'ee/spec/controllers/*.rb'
+    - 'spec/requests/*.rb'
+    - 'ee/spec/requests/*.rb'
 Style/MultilineWhenThen:
   Enabled: false

app/models/concerns/prometheus_adapter.rb

@@ -21,7 +21,7 @@ module PrometheusAdapter
       raise NotImplemented
     end
-    # This is a heavy-weight check if a prometheus is properly configured and accesible from GitLab.
+    # This is a heavy-weight check if a prometheus is properly configured and accessible from GitLab.
     # This actually sends a request to an external service and often it could take a long time,
     # Please consider using `configured?` instead if the process is running on unicorn/puma threads.
     def can_query?

app/models/project.rb

@@ -2207,7 +2207,7 @@ class Project < ApplicationRecord
   end
   def reference_counter(type: Gitlab::GlRepository::PROJECT)
-    Gitlab::ReferenceCounter.new(type.identifier_for_repositorable(self))
+    Gitlab::ReferenceCounter.new(type.identifier_for_container(self))
   end
   def badges

app/models/project_wiki.rb

@@ -65,7 +65,7 @@ class ProjectWiki
   # Returns the Gitlab::Git::Wiki object.
   def wiki
     @wiki ||= begin
-      gl_repository = Gitlab::GlRepository::WIKI.identifier_for_repositorable(project)
+      gl_repository = Gitlab::GlRepository::WIKI.identifier_for_container(project)
       raw_repository = Gitlab::Git::Repository.new(project.repository_storage, disk_path + '.git', gl_repository, full_path)
       create_repo!(raw_repository) unless raw_repository.exists?

app/models/repository.rb

@@ -1183,7 +1183,7 @@ class Repository
   def initialize_raw_repository
     Gitlab::Git::Repository.new(project.repository_storage,
                                 disk_path + '.git',
-                                repo_type.identifier_for_repositorable(project),
+                                repo_type.identifier_for_container(project),
                                 project.full_path)
   end
 end

changelogs/unreleased/39042-filter-merge-requests-approved-by-user-backend.yml

+---
+title: Filter merge requests by approvals (API)
+merge_request: 21379
+author:
+type: added

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

+---
+title: Add separate classes for user related entities for email, membership, status
+merge_request: 23748
+author: Rajendra Kadam
+type: added

doc/administration/gitaly/praefect.md

@@ -173,9 +173,11 @@ praefect['virtual_storages'] = {
   }
 }
+# Replace POSTGRESQL_SERVER below with a real IP/host address of the database.
 praefect['database_host'] = 'POSTGRESQL_SERVER'
 praefect['database_port'] = 5432
 praefect['database_user'] = 'praefect'
+# Replace PRAEFECT_SQL_PASSWORD below with a real password of the database.
 praefect['database_password'] = 'PRAEFECT_SQL_PASSWORD'
 praefect['database_dbname'] = 'praefect_production'

doc/development/contributing/style_guides.md

@@ -30,7 +30,9 @@
 This is also the style used by linting tools such as
 [RuboCop](https://github.com/rubocop-hq/rubocop) and [Hound CI](https://houndci.com).
 You can run RuboCop by hand or install a tool like [Overcommit](https://github.com/sds/overcommit) to run it for you.
-Overcommit will automatically run the configured checks (like Rubocop) on every modified file before commit. You can use the example overcommit configuration found in `.overcommit.yml.example` as a quickstart.
+
+Overcommit will automatically run the configured checks (like Rubocop) on every modified file before commit.
+You can use the example overcommit configuration found in `.overcommit.yml.example` as a quickstart.
 This saves you time as you don't have to wait for the same errors to be detected by the CI.
 ---

doc/user/project/releases/index.md

@@ -94,6 +94,19 @@ project.
 ![Releases list](img/releases.png)
+### Number of Releases
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/36667) in GitLab 12.8.
+
+The incremental number of Releases is displayed on the project's details page. When clicked,
+it takes you to the list of Releases.
+
+![Number of Releases](img/releases_count_v12_8.png "Incremental counter of Releases")
+
+For private projects, the number of Releases is displayed to users with Reporter
+[permissions](../../permissions.md#releases-permissions) or higher. For public projects,
+it is displayed to every user regardless of their permission level.
+
 ## Editing a release
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/26016) in GitLab 12.6.

doc/user/project/repository/forking_workflow.md

@@ -60,4 +60,8 @@ changes will be added to the repository and branch you're merging into.
 ![New merge request](img/forking_workflow_merge_request.png)
+## Removing a fork relationship
+
+You can unlink your fork from its upstream project in the [advanced settings](../settings/index.md#removing-a-fork-relationship).
+
 [gitlab flow]: https://about.gitlab.com/blog/2014/09/29/gitlab-flow/ "GitLab Flow blog post"

doc/user/project/repository/web_editor.md

@@ -97,7 +97,8 @@ In case your development workflow dictates to have an issue for every merge
 request, you can quickly create a branch right on the issue page which will be
 tied with the issue itself. You can see a **Create merge request** dropdown
 below the issue description unless there is already a branch with the same
-name or a referenced merge request.
+name or a referenced merge request or your project (still) has an active
+[fork relationship](../settings/index.md#advanced-settings).
 ![Create Button](img/web_editor_new_branch_from_issue_create_button_v12_6.png)

doc/user/project/settings/index.md

 # Project settings
 NOTE: **Note:**
-Only project Maintainers and Admin users have the [permissions] to access a project
-settings.
+Only project Maintainers and Admin users have the [permissions](../../permissions.md#project-members-permissions)
+to access a project settings.
 You can adjust your [project](../index.md) settings by navigating
 to your project's homepage and clicking **Settings**.
@@ -106,12 +106,13 @@ Learn how to [export a project](import_export.md#importing-the-project) in GitLa
 ### Advanced settings
-Here you can run housekeeping, archive, rename, transfer, or remove a project.
+Here you can run housekeeping, archive, rename, transfer, [remove a fork relationship](#removing-a-fork-relationship), or remove a project.
 #### Archiving a project
 NOTE: **Note:**
-Only project Owners and Admin users have the [permissions] to archive a project.
+Only project Owners and Admin users have the [permissions](../../permissions.md#project-members-permissions)
+to archive a project.
 Archiving a project makes it read-only for all users and indicates that it is
 no longer actively maintained. Projects that have been archived can also be
@@ -130,7 +131,7 @@ To archive a project:
 #### Renaming a repository
 NOTE: **Note:**
-Only project Maintainers and Admin users have the [permissions] to rename a
+Only project Maintainers and Admin users have the [permissions](../../permissions.md#project-members-permissions) to rename a
 repository. Not to be confused with a project's name where it can also be
 changed from the [general project settings](#general-project-settings).
@@ -150,11 +151,12 @@ old URL will not be able to push or pull. Read more about what happens with the
 #### Transferring an existing project into another namespace
 NOTE: **Note:**
-Only project Owners and Admin users have the [permissions] to transfer a project.
+Only project Owners and Admin users have the [permissions](../../permissions.md#project-members-permissions)
+to transfer a project.
 You can transfer an existing project into a [group](../../group/index.md) if:
-1. You have at least **Maintainer** [permissions] to that group.
+1. You have at least **Maintainer** [permissions](../../permissions.md#project-members-permissions) to that group.
 1. The project is in a subgroup you own.
 1. You are at least a **Maintainer** of the project under your personal namespace.
    Similarly, if you are an owner of a group, you can transfer any of its projects
@@ -175,8 +177,6 @@ NOTE: **Note:**
 GitLab administrators can use the admin interface to move any project to any
 namespace if needed.
-[permissions]: ../../permissions.md#project-members-permissions
-
 #### Remove a project
 NOTE: **Note:**
@@ -202,6 +202,24 @@ To restore a project that is marked for deletion:
 1. Navigate to your project, and select **{settings}** **Settings > General > Advanced**.
 1. In the Restore project section, click the **Restore project** button.
+#### Removing a fork relationship
+
+Forking is a great way to [contribute to a project](../repository/forking_workflow.md)
+of which you are not a member.
+If you want to use the fork for yourself and do not need to send
+[merge requests](../merge_requests.md) to the upstream project,
+you can safely remove the fork relationship.
+
+To do so:
+
+1. Navigate to your project's **Settings > General > Advanced**.
+1. Under **Remove fork relationship**, click the likewise-labeled button.
+1. Confirm the action by typing the project's path as instructed.
+
+NOTE: **Note:**
+Only project maintainers have the [permissions](../../permissions.md#project-members-permissions)
+to remove a fork relationship.
+
 ## Operations settings
 ### Error Tracking

lib/api/entities.rb

@@ -2,31 +2,6 @@
 module API
   module Entities
-    class Membership < Grape::Entity
-      expose :source_id
-      expose :source_name do |member|
-        member.source.name
-      end
-      expose :source_type
-      expose :access_level
-    end
-
-    class Identity < Grape::Entity
-      expose :provider, :extern_uid
-    end
-
-    class UserStatus < Grape::Entity
-      expose :emoji
-      expose :message
-      expose :message_html do |entity|
-        MarkupHelper.markdown_field(entity, :message)
-      end
-    end
-
-    class Email < Grape::Entity
-      expose :id, :email
-    end
-
     class Hook < Grape::Entity
       expose :id, :url, :created_at, :push_events, :tag_push_events, :merge_requests_events, :repository_update_events
       expose :enable_ssl_verification

lib/api/entities/email.rb

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