Add latest changes from gitlab-org/gitlab@master

app/controllers/projects_controller.rb

@@ -371,6 +371,7 @@ class ProjectsController < Projects::ApplicationController
       :path,
       :printing_merge_request_link_enabled,
       :public_builds,
+      :remove_source_branch_after_merge,
       :request_access_enabled,
       :runners_token,
       :tag_list,

app/graphql/types/project_type.rb

@@ -66,6 +66,7 @@ module Types
     field :request_access_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
     field :only_allow_merge_if_all_discussions_are_resolved, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
     field :printing_merge_request_link_enabled, GraphQL::BOOLEAN_TYPE, null: true # rubocop:disable Graphql/Descriptions
+    field :remove_source_branch_after_merge, GraphQL::BOOLEAN_TYPE, null: true, description: 'Remove the source branch by default after merge'
     field :namespace, Types::NamespaceType, null: true # rubocop:disable Graphql/Descriptions
     field :group, Types::GroupType, null: true # rubocop:disable Graphql/Descriptions

app/models/project.rb

@@ -91,6 +91,7 @@ class Project < ApplicationRecord
   default_value_for :wiki_enabled, gitlab_config_features.wiki
   default_value_for :snippets_enabled, gitlab_config_features.snippets
   default_value_for :only_allow_merge_if_all_discussions_are_resolved, false
+  default_value_for :remove_source_branch_after_merge, true
   add_authentication_token_field :runners_token, encrypted: -> { Feature.enabled?(:projects_tokens_optional_encryption, default_enabled: true) ? :optional : :required }

app/models/release.rb

 # frozen_string_literal: true
 class Release < ApplicationRecord
+  include Presentable
   include CacheMarkdownField
   include Gitlab::Utils::StrongMemoize

app/presenters/release_presenter.rb

+# frozen_string_literal: true
+
+class ReleasePresenter < Gitlab::View::Presenter::Delegated
+  include ActionView::Helpers::UrlHelper
+
+  presents :release
+
+  delegate :project, :tag, to: :release
+
+  def commit_path
+    return unless release.commit && can_download_code?
+
+    project_commit_path(project, release.commit.id)
+  end
+
+  def tag_path
+    return unless can_download_code?
+
+    project_tag_path(project, release.tag)
+  end
+
+  def merge_requests_url
+    return unless release_mr_issue_urls_available?
+
+    project_merge_requests_url(project, params_for_issues_and_mrs)
+  end
+
+  def issues_url
+    return unless release_mr_issue_urls_available?
+
+    project_issues_url(project, params_for_issues_and_mrs)
+  end
+
+  private
+
+  def can_download_code?
+    can?(current_user, :download_code, project)
+  end
+
+  def params_for_issues_and_mrs
+    { scope: 'all', state: 'opened', release_tag: release.tag }
+  end
+
+  def release_mr_issue_urls_available?
+    ::Feature.enabled?(:release_mr_issue_urls, project)
+  end
+end

app/services/merge_requests/build_service.rb

@@ -10,13 +10,20 @@ module MergeRequests
       # TODO: this should handle all quick actions that don't have side effects
       # https://gitlab.com/gitlab-org/gitlab-foss/issues/53658
       merge_quick_actions_into_params!(merge_request, only: [:target_branch])
-      merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) if params.has_key?(:force_remove_source_branch)
       # Assign the projects first so we can use policies for `filter_params`
       merge_request.author = current_user
       merge_request.source_project = find_source_project
       merge_request.target_project = find_target_project
+      # Source project sets the default source branch removal setting
+      merge_request.merge_params['force_remove_source_branch'] =
+        if params.key?(:force_remove_source_branch)
+          params.delete(:force_remove_source_branch)
+        else
+          merge_request.source_project.remove_source_branch_after_merge?
+        end
+
       filter_params(merge_request)
       # merge_request.assign_attributes(...) below is a Rails

app/views/projects/_merge_request_merge_options_settings.html.haml

@@ -12,3 +12,9 @@
     = form.check_box :printing_merge_request_link_enabled, class: 'form-check-input'
     = form.label :printing_merge_request_link_enabled, class: 'form-check-label' do
       = s_('ProjectSettings|Show link to create/view merge request when pushing from the command line')
+  .form-check.mb-2
+    = form.check_box :remove_source_branch_after_merge, class: 'form-check-input'
+    = form.label :remove_source_branch_after_merge, class: 'form-check-label' do
+      = s_("ProjectSettings|Enable 'Delete source branch' option by default")
+      .descr.text-secondary
+        = s_('ProjectSettings|Existing merge requests and protected branches are not affected')

changelogs/unreleased/jramsay-configure-default-branch-deletion.yml

+---
+title: Add project option for deleting source branch
+merge_request: 18408
+author: Zsolt Kovari
+type: added

db/migrate/20191017094449_add_remove_source_branch_after_merge_to_projects.rb

+# frozen_string_literal: true
+
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddRemoveSourceBranchAfterMergeToProjects < ActiveRecord::Migration[5.1]
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  def up
+    add_column :projects, :remove_source_branch_after_merge, :boolean
+  end
+
+  def down
+    remove_column :projects, :remove_source_branch_after_merge
+  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: 2019_10_17_045817) do
+ActiveRecord::Schema.define(version: 2019_10_17_094449) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -3058,6 +3058,7 @@ ActiveRecord::Schema.define(version: 2019_10_17_045817) do
     t.integer "max_pages_size"
     t.integer "max_artifacts_size"
     t.string "pull_mirror_branch_prefix", limit: 50
+    t.boolean "remove_source_branch_after_merge"
     t.index "lower((name)::text)", name: "index_projects_on_lower_name"
     t.index ["archived", "pending_delete", "merge_requests_require_code_owner_approval"], name: "projects_requiring_code_owner_approval", where: "((pending_delete = false) AND (archived = false) AND (merge_requests_require_code_owner_approval = true))"
     t.index ["created_at"], name: "index_projects_on_created_at"

doc/api/graphql/reference/index.md

@@ -604,6 +604,7 @@ The API can be explored interactively using the [GraphiQL IDE](../index.md#graph
 | `requestAccessEnabled` | Boolean |  |
 | `onlyAllowMergeIfAllDiscussionsAreResolved` | Boolean |  |
 | `printingMergeRequestLinkEnabled` | Boolean |  |
+| `removeSourceBranchAfterMerge` | Boolean | Remove the source branch by default after merge |
 | `namespace` | Namespace |  |
 | `group` | Group |  |
 | `statistics` | ProjectStatistics |  |

doc/api/projects.md

@@ -148,6 +148,7 @@ When the user is authenticated and `simple` is not set this returns something li
     "shared_with_groups": [],
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
+    "remove_source_branch_after_merge": false,
     "request_access_enabled": false,
     "merge_method": "merge",
     "statistics": {
@@ -232,6 +233,7 @@ When the user is authenticated and `simple` is not set this returns something li
     "shared_with_groups": [],
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
+    "remove_source_branch_after_merge": false,
     "request_access_enabled": false,
     "merge_method": "merge",
     "statistics": {
@@ -357,6 +359,7 @@ GET /users/:user_id/projects
     "shared_with_groups": [],
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
+    "remove_source_branch_after_merge": false,
     "request_access_enabled": false,
     "merge_method": "merge",
     "statistics": {
@@ -441,6 +444,7 @@ GET /users/:user_id/projects
     "shared_with_groups": [],
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
+    "remove_source_branch_after_merge": false,
     "request_access_enabled": false,
     "merge_method": "merge",
     "statistics": {
@@ -550,6 +554,7 @@ Example response:
     "shared_with_groups": [],
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
+    "remove_source_branch_after_merge": false,
     "request_access_enabled": false,
     "merge_method": "merge",
     "statistics": {
@@ -631,6 +636,7 @@ Example response:
     "shared_with_groups": [],
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
+    "remove_source_branch_after_merge": false,
     "request_access_enabled": false,
     "merge_method": "merge",
     "statistics": {
@@ -757,6 +763,7 @@ GET /projects/:id
   "repository_storage": "default",
   "only_allow_merge_if_pipeline_succeeds": false,
   "only_allow_merge_if_all_discussions_are_resolved": false,
+  "remove_source_branch_after_merge": false,
   "printing_merge_requests_link_enabled": true,
   "request_access_enabled": false,
   "merge_method": "merge",
@@ -917,6 +924,7 @@ POST /projects
 | `only_allow_merge_if_pipeline_succeeds` | boolean | no | Set whether merge requests can only be merged with successful jobs |
 | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved |
 | `merge_method` | string | no | Set the [merge method](#project-merge-method) used |
+| `remove_source_branch_after_merge` | boolean | no | Enable `Delete source branch` option by default for all new merge requests |
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
 | `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
@@ -978,6 +986,7 @@ POST /projects/user/:user_id
 | `only_allow_merge_if_pipeline_succeeds` | boolean | no | Set whether merge requests can only be merged with successful jobs |
 | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved |
 | `merge_method` | string | no | Set the [merge method](#project-merge-method) used |
+| `remove_source_branch_after_merge` | boolean | no | Enable `Delete source branch` option by default for all new merge requests |
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
 | `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
@@ -1039,6 +1048,7 @@ PUT /projects/:id
 | `only_allow_merge_if_pipeline_succeeds` | boolean | no | Set whether merge requests can only be merged with successful jobs |
 | `only_allow_merge_if_all_discussions_are_resolved` | boolean | no | Set whether merge requests can only be merged when all the discussions are resolved |
 | `merge_method` | string | no | Set the [merge method](#project-merge-method) used |
+| `remove_source_branch_after_merge` | boolean | no | Enable `Delete source branch` option by default for all new merge requests |
 | `lfs_enabled` | boolean | no | Enable LFS |
 | `request_access_enabled` | boolean | no | Allow users to request member access |
 | `tag_list`    | array   | no       | The list of tags for a project; put array of tags, that should be finally assigned to a project |
@@ -1165,6 +1175,7 @@ Example responses:
     "shared_with_groups": [],
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
+    "remove_source_branch_after_merge": false,
     "request_access_enabled": false,
     "merge_method": "merge",
     "_links": {
@@ -1252,6 +1263,7 @@ Example response:
   "shared_with_groups": [],
   "only_allow_merge_if_pipeline_succeeds": false,
   "only_allow_merge_if_all_discussions_are_resolved": false,
+  "remove_source_branch_after_merge": false,
   "request_access_enabled": false,
   "merge_method": "merge",
   "_links": {
@@ -1338,6 +1350,7 @@ Example response:
   "shared_with_groups": [],
   "only_allow_merge_if_pipeline_succeeds": false,
   "only_allow_merge_if_all_discussions_are_resolved": false,
+  "remove_source_branch_after_merge": false,
   "request_access_enabled": false,
   "merge_method": "merge",
   "_links": {
@@ -1511,6 +1524,7 @@ Example response:
   "shared_with_groups": [],
   "only_allow_merge_if_pipeline_succeeds": false,
   "only_allow_merge_if_all_discussions_are_resolved": false,
+  "remove_source_branch_after_merge": false,
   "request_access_enabled": false,
   "merge_method": "merge",
   "_links": {
@@ -1616,6 +1630,7 @@ Example response:
   "shared_with_groups": [],
   "only_allow_merge_if_pipeline_succeeds": false,
   "only_allow_merge_if_all_discussions_are_resolved": false,
+  "remove_source_branch_after_merge": false,
   "request_access_enabled": false,
   "merge_method": "merge",
   "_links": {

doc/user/project/merge_requests/index.md

@@ -94,7 +94,9 @@ You can [search and filter the results](../../search/index.md#issues-and-merge-r
 When creating a merge request, select the "Delete source branch when merge
 request accepted" option and the source branch will be deleted when the merge
-request is merged.
+request is merged. To make this option enabled by default for all new merge
+requests, enable it in the
+[project's settings](../settings/index.md#merge-request-settings).
 This option is also visible in an existing merge request next to the merge
 request button and can be selected/deselected before merging. It's only visible

doc/user/project/settings/index.md

@@ -49,10 +49,11 @@ Add an [issue description template](../description_templates.md#description-temp
 Set up your project's merge request settings:
 - Set up the merge request method (merge commit, [fast-forward merge](../merge_requests/fast_forward_merge.html)).
-- Merge request [description templates](../description_templates.md#description-templates).
+- Add merge request [description templates](../description_templates.md#description-templates).
 - Enable [merge request approvals](../merge_requests/merge_request_approvals.md). **(STARTER)**
-- Enable [merge only of pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md).
-- Enable [merge only when all discussions are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved).
+- Enable [merge only if pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md).
+- Enable [merge only when all threads are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved).
+- Enable [`delete source branch after merge` option by default](../merge_requests/index.md#deleting-the-source-branch)
 ![project's merge request settings](img/merge_requests_settings.png)

lib/api/entities.rb

@@ -307,6 +307,7 @@ module API
       expose :only_allow_merge_if_pipeline_succeeds
       expose :request_access_enabled
       expose :only_allow_merge_if_all_discussions_are_resolved
+      expose :remove_source_branch_after_merge
       expose :printing_merge_request_link_enabled
       expose :merge_method
       expose :statistics, using: 'API::Entities::ProjectStatistics', if: -> (project, options) {
@@ -1290,6 +1291,8 @@ module API
     end
     class Release < Grape::Entity
+      include ::API::Helpers::Presentable
+
       expose :name
       expose :tag, as: :tag_name, if: ->(_, _) { can_download_code? }
       expose :description
@@ -1302,8 +1305,8 @@ module API
       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? }
-      expose :commit_path, if: ->(_, _) { can_download_code? }
-      expose :tag_path, if: ->(_, _) { can_download_code? }
+      expose :commit_path, expose_nil: false
+      expose :tag_path, expose_nil: false
       expose :assets do
         expose :assets_count, as: :count do |release, _|
           assets_to_exclude = can_download_code? ? [] : [:sources]
@@ -1315,8 +1318,8 @@ module API
         end
       end
       expose :_links do
-        expose :merge_requests_url, if: -> (_) { release_mr_issue_urls_available? }
-        expose :issues_url, if: -> (_) { release_mr_issue_urls_available? }
+        expose :merge_requests_url, expose_nil: false
+        expose :issues_url, expose_nil: false
       end
       private
@@ -1324,36 +1327,6 @@ module API
       def can_download_code?
         Ability.allowed?(options[:current_user], :download_code, object.project)
       end
-
-      def commit_path
-        return unless object.commit
-
-        Gitlab::Routing.url_helpers.project_commit_path(project, object.commit.id)
-      end
-
-      def tag_path
-        Gitlab::Routing.url_helpers.project_tag_path(project, object.tag)
-      end
-
-      def merge_requests_url
-        Gitlab::Routing.url_helpers.project_merge_requests_url(project, params_for_issues_and_mrs)
-      end
-
-      def issues_url
-        Gitlab::Routing.url_helpers.project_issues_url(project, params_for_issues_and_mrs)
-      end
-
-      def params_for_issues_and_mrs
-        { scope: 'all', state: 'opened', release_tag: object.tag }
-      end
-
-      def release_mr_issue_urls_available?
-        ::Feature.enabled?(:release_mr_issue_urls, project)
-      end
-
-      def project
-        @project ||= object.project
-      end
     end
     class Tag < Grape::Entity

lib/api/helpers/projects_helpers.rb

@@ -30,6 +30,7 @@ module API
         optional :shared_runners_enabled, type: Boolean, desc: 'Flag indication if shared runners are enabled for that project'
         optional :resolve_outdated_diff_discussions, type: Boolean, desc: 'Automatically resolve merge request diffs discussions on lines changed with a push'
+        optional :remove_source_branch_after_merge, type: Boolean, desc: 'Remove the source branch by default after merge'
         optional :container_registry_enabled, type: Boolean, desc: 'Flag indication if the container registry is enabled for that project'
         optional :lfs_enabled, type: Boolean, desc: 'Flag indication if Git LFS is enabled for that project'
         optional :visibility, type: String, values: Gitlab::VisibilityLevel.string_values, desc: 'The visibility of the project.'
@@ -94,6 +95,7 @@ module API
           :path,
           :printing_merge_request_link_enabled,
           :public_builds,
+          :remove_source_branch_after_merge,
           :repository_access_level,
           :request_access_enabled,
           :resolve_outdated_diff_discussions,
@@ -109,7 +111,6 @@ module API
           :jobs_enabled,
           :merge_requests_enabled,
           :wiki_enabled,
-          :jobs_enabled,
           :snippets_enabled
         ]
       end

lib/gitlab/background_migration/legacy_upload_mover.rb

@@ -18,6 +18,7 @@ module Gitlab
       def execute
         return unless upload
+        return unless upload.model_type == 'Note'
         if !project
           # if we don't have models associated with the upload we can not move it

lib/gitlab/background_migration/legacy_uploads_migrator.rb

@@ -14,7 +14,7 @@ module Gitlab
       include Database::MigrationHelpers
       def perform(start_id, end_id)
-        Upload.where(id: start_id..end_id, uploader: 'AttachmentUploader').find_each do |upload|
+        Upload.where(id: start_id..end_id, uploader: 'AttachmentUploader', model_type: 'Note').find_each do |upload|
           LegacyUploadMover.new(upload).execute
         end
       end

lib/tasks/gitlab/uploads/legacy.rake

@@ -15,7 +15,7 @@ namespace :gitlab do
         batch_size = 5000
         delay_interval = 5.minutes.to_i
-        Upload.where(uploader: 'AttachmentUploader').each_batch(of: batch_size) do |relation, index|
+        Upload.where(uploader: 'AttachmentUploader', model_type: 'Note').each_batch(of: batch_size) do |relation, index|
           start_id, end_id = relation.pluck('MIN(id), MAX(id)').first
           delay = index * delay_interval

locale/gitlab.pot

@@ -12857,9 +12857,15 @@ msgstr ""
 msgid "ProjectSettings|Customize your project badges."
 msgstr ""
+msgid "ProjectSettings|Enable 'Delete source branch' option by default"
+msgstr ""
+
 msgid "ProjectSettings|Every merge creates a merge commit"
 msgstr ""
+msgid "ProjectSettings|Existing merge requests and protected branches are not affected"
+msgstr ""
+
 msgid "ProjectSettings|Failed to protect the tag"
 msgstr ""