Add latest changes from gitlab-org/gitlab@master

6 files changed, 13 insertions, 10 deletions

diff --git a/lib/api/entities/user_with_admin.rb b/lib/api/entities/user_with_admin.rb
index f9c1a646a4f..53fef7a46e2 100644
--- a/lib/api/entities/user_with_admin.rb
+++ b/lib/api/entities/user_with_admin.rb
@@ -6,6 +6,7 @@ module API
       expose :admin?, as: :is_admin
       expose :note
       expose :namespace_id
+      expose :created_by, with: UserBasic
     end
   end
 end
diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb
index 716db9a87b0..9839828a5b4 100644
--- a/lib/api/helpers/projects_helpers.rb
+++ b/lib/api/helpers/projects_helpers.rb
@@ -59,7 +59,7 @@ module API
         optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all threads are resolved'
         optional :tag_list, type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, desc: 'Deprecated: Use :topics instead'
         optional :topics, type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, desc: 'The list of topics for a project'
-        optional :avatar, type: ::API::Validations::Types::WorkhorseFile, desc: 'Avatar image for project'
+        optional :avatar, type: ::API::Validations::Types::WorkhorseFile, desc: 'Avatar image for project', documentation: { type: 'file' }
         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 :suggestion_commit_message, type: String, desc: 'The commit message used to apply merge request suggestions'
@@ -73,7 +73,7 @@ module API
         optional :repository_storage, type: String, desc: 'Which storage shard the repository is on. Available only to admins'
         optional :packages_enabled, type: Boolean, desc: 'Enable project packages feature'
         optional :squash_option, type: String, values: %w(never always default_on default_off), desc: 'Squash default for project. One of `never`, `always`, `default_on`, or `default_off`.'
-        optional :mr_default_target_self, Boolean, desc: 'Merge requests of this forked project targets itself by default'
+        optional :mr_default_target_self, type: Boolean, desc: 'Merge requests of this forked project targets itself by default'
       end
 
       params :optional_project_params_ee do
diff --git a/lib/api/project_export.rb b/lib/api/project_export.rb
index d610b5e4f95..29fdfe45566 100644
--- a/lib/api/project_export.rb
+++ b/lib/api/project_export.rb
@@ -46,7 +46,8 @@ module API
         optional :description, type: String, desc: 'Override the project description'
         optional :upload, type: Hash do
           optional :url, type: String, desc: 'The URL to upload the project'
-          optional :http_method, type: String, default: 'PUT', desc: 'HTTP method to upload the exported project'
+          optional :http_method, type: String, default: 'PUT', values: %w[PUT POST],
+                                 desc: 'HTTP method to upload the exported project'
         end
       end
       post ':id/export' do
diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb
index 7a66044c5b6..0da8c1ecedd 100644
--- a/lib/api/project_import.rb
+++ b/lib/api/project_import.rb
@@ -55,7 +55,7 @@ module API
 
       params do
         requires :path, type: String, desc: 'The new project path and name'
-        requires :file, type: ::API::Validations::Types::WorkhorseFile, desc: 'The project export file to be imported'
+        requires :file, type: ::API::Validations::Types::WorkhorseFile, desc: 'The project export file to be imported', documentation: { type: 'file' }
         optional :name, type: String, desc: 'The name of the project to be imported. Defaults to the path of the project if not provided.'
         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'
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 814040d29e1..bdb7484f3d6 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -33,6 +33,7 @@ module Gitlab
       gon.sprite_file_icons      = IconsHelper.sprite_file_icons_path
       gon.emoji_sprites_css_path = ActionController::Base.helpers.stylesheet_path('emoji_sprites')
       gon.select2_css_path       = ActionController::Base.helpers.stylesheet_path('lazy_bundles/select2.css')
+      gon.gridstack_css_path     = ActionController::Base.helpers.stylesheet_path('lazy_bundles/gridstack.css')
       gon.test_env               = Rails.env.test?
       gon.disable_animations     = Gitlab.config.gitlab['disable_animations']
       gon.suggested_label_colors = LabelsHelper.suggested_colors
diff --git a/lib/tasks/gitlab/tw/codeowners.rake b/lib/tasks/gitlab/tw/codeowners.rake
index 5b2d538f709..fd9c7114979 100644
--- a/lib/tasks/gitlab/tw/codeowners.rake
+++ b/lib/tasks/gitlab/tw/codeowners.rake
@@ -7,10 +7,10 @@ namespace :tw do
   task :codeowners do
     CodeOwnerRule = Struct.new(:category, :writer)
     DocumentOwnerMapping = Struct.new(:path, :writer) do
-      def writer_owns_all_pages?(mappings)
-        mappings
-          .select { |mapping| mapping.directory == directory }
-          .all? { |mapping| mapping.writer == writer }
+      def writer_owns_directory?(mappings)
+        dir_mappings = mappings.select { |mapping| mapping.directory == directory }
+
+        dir_mappings.count { |mapping| mapping.writer == writer } / dir_mappings.length.to_f > 0.5
       end
 
       def directory
@@ -115,14 +115,14 @@ namespace :tw do
     deduplicated_mappings = Set.new
 
     mappings.each do |mapping|
-      if mapping.writer_owns_all_pages?(mappings)
+      if mapping.writer_owns_directory?(mappings)
         deduplicated_mappings.add("#{mapping.directory}/ #{mapping.writer}")
       else
         deduplicated_mappings.add("#{mapping.path} #{mapping.writer}")
       end
     end
 
-    deduplicated_mappings.each { |mapping| puts mapping }
+    deduplicated_mappings.sort.each { |mapping| puts mapping }
 
     if errors.present?
       puts "-----"