Add latest changes from gitlab-org/gitlab@master

5 files changed, 12 insertions, 37 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 91811efacd7..d3a29c6386d 100644
--- a/lib/api/entities.rb
+++ b/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
diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb
index 94619204274..47b1f037eb8 100644
--- a/lib/api/helpers/projects_helpers.rb
+++ b/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
diff --git a/lib/gitlab/background_migration/legacy_upload_mover.rb b/lib/gitlab/background_migration/legacy_upload_mover.rb
index c9e47f210be..1879a6c5427 100644
--- a/lib/gitlab/background_migration/legacy_upload_mover.rb
+++ b/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
diff --git a/lib/gitlab/background_migration/legacy_uploads_migrator.rb b/lib/gitlab/background_migration/legacy_uploads_migrator.rb
index a9d38a27e0c..f7cadb9b00d 100644
--- a/lib/gitlab/background_migration/legacy_uploads_migrator.rb
+++ b/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
diff --git a/lib/tasks/gitlab/uploads/legacy.rake b/lib/tasks/gitlab/uploads/legacy.rake
index 2eeb694d341..74db0060b8d 100644
--- a/lib/tasks/gitlab/uploads/legacy.rake
+++ b/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