Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline

* upstream/master: (1168 commits)
  Job details won't scroll horizontally to show long lines
  Bring back branches badge to main project page
  Limit OpenGraph image size to 64x64
  Improve changelog
  Split up MergeRequestsController
  Add parent_id back to the tests
  Make changelog more descriptive
  Improve tests text
  Rename members_count to members_count_with_descendants and expose only to group admins
  Fix a bug where an invalid sort param value was passed to Gitaly
  Drop default ORDER scope when calling a find method on a Sortable model
  Add tests for project import state transition: [:started] => [:finished]
  Add CHANGELOG
  Perform housekeeping only when an import of a fresh project is completed
  Strip trailing whitespace in relative submodule URL
  Adjust projects spec on namespace fields
  Add "members_count" and "parent_id" data on namespaces API
  Removes redundant pending delete checks
  Fix gitaly ref encoding bugs
  Add ProjectWiki#ensure_repository
  ...

9 files changed, 30 insertions, 27 deletions

diff --git a/lib/api/v3/branches.rb b/lib/api/v3/branches.rb
index 0a877b960f6..81b13249892 100644
--- a/lib/api/v3/branches.rb
+++ b/lib/api/v3/branches.rb
@@ -26,8 +26,8 @@ module API
         delete ":id/repository/branches/:branch", requirements: { branch: /.+/ } do
           authorize_push_project
 
-          result = DeleteBranchService.new(user_project, current_user).
-                   execute(params[:branch])
+          result = DeleteBranchService.new(user_project, current_user)
+                   .execute(params[:branch])
 
           if result[:status] == :success
             status(200)
@@ -55,8 +55,8 @@ module API
         end
         post ":id/repository/branches" do
           authorize_push_project
-          result = CreateBranchService.new(user_project, current_user).
-            execute(params[:branch_name], params[:ref])
+          result = CreateBranchService.new(user_project, current_user)
+            .execute(params[:branch_name], params[:ref])
 
           if result[:status] == :success
             present result[:branch],
diff --git a/lib/api/v3/entities.rb b/lib/api/v3/entities.rb
index 7c5065dee90..c848f52723b 100644
--- a/lib/api/v3/entities.rb
+++ b/lib/api/v3/entities.rb
@@ -245,9 +245,9 @@ module API
         expose :job_events, as: :build_events
         # Expose serialized properties
         expose :properties do |service, options|
-          field_names = service.fields.
-            select { |field| options[:include_passwords] || field[:type] != 'password' }.
-            map { |field| field[:name] }
+          field_names = service.fields
+            .select { |field| options[:include_passwords] || field[:type] != 'password' }
+            .map { |field| field[:name] }
           service.properties.slice(*field_names)
         end
       end
diff --git a/lib/api/v3/files.rb b/lib/api/v3/files.rb
index c76acc86504..7b4b3448b6d 100644
--- a/lib/api/v3/files.rb
+++ b/lib/api/v3/files.rb
@@ -56,7 +56,7 @@ module API
           blob = repo.blob_at(commit.sha, params[:file_path])
           not_found!('File') unless blob
 
-          blob.load_all_data!(repo)
+          blob.load_all_data!
           status(200)
 
           {
diff --git a/lib/api/v3/helpers.rb b/lib/api/v3/helpers.rb
index d9e76560d03..4e63aa01c1a 100644
--- a/lib/api/v3/helpers.rb
+++ b/lib/api/v3/helpers.rb
@@ -38,7 +38,10 @@ module API
           projects = projects.where(visibility_level: Gitlab::VisibilityLevel.level_value(params[:visibility]))
         end
 
-        projects = projects.where(archived: params[:archived])
+        unless params[:archived].nil?
+          projects = projects.where(archived: to_boolean(params[:archived]))
+        end
+
         projects.reorder(params[:order_by] => params[:sort])
       end
     end
diff --git a/lib/api/v3/notes.rb b/lib/api/v3/notes.rb
index 009ec5c6bbd..23fe95e42e4 100644
--- a/lib/api/v3/notes.rb
+++ b/lib/api/v3/notes.rb
@@ -34,8 +34,8 @@ module API
                 # paginate() only works with a relation. This could lead to a
                 # mismatch between the pagination headers info and the actual notes
                 # array returned, but this is really a edge-case.
-                paginate(noteable.notes).
-                reject { |n| n.cross_reference_not_visible_for?(current_user) }
+                paginate(noteable.notes)
+                .reject { |n| n.cross_reference_not_visible_for?(current_user) }
               present notes, with: ::API::V3::Entities::Note
             else
               not_found!("Notes")
diff --git a/lib/api/v3/projects.rb b/lib/api/v3/projects.rb
index 20976b9dd08..eb090453b48 100644
--- a/lib/api/v3/projects.rb
+++ b/lib/api/v3/projects.rb
@@ -69,7 +69,7 @@ module API
           end
 
           params :filter_params do
-            optional :archived, type: Boolean, default: false, desc: 'Limit by archived status'
+            optional :archived, type: Boolean, default: nil, desc: 'Limit by archived status'
             optional :visibility, type: String, values: %w[public internal private],
                                   desc: 'Limit by visibility'
             optional :search, type: String, desc: 'Return list of authorized projects matching the search criteria'
diff --git a/lib/api/v3/services.rb b/lib/api/v3/services.rb
index 118c6df6549..2d13d6fabfd 100644
--- a/lib/api/v3/services.rb
+++ b/lib/api/v3/services.rb
@@ -608,7 +608,7 @@ module API
 
       trigger_services.each do |service_slug, settings|
         helpers do
-          def chat_command_service(project, service_slug, params)
+          def slash_command_service(project, service_slug, params)
             project.services.active.where(template: false).find do |service|
               service.try(:token) == params[:token] && service.to_param == service_slug.underscore
             end
@@ -633,7 +633,7 @@ module API
             # This is not accurate, but done to prevent leakage of the project names
             not_found!('Service') unless project
 
-            service = chat_command_service(project, service_slug, params)
+            service = slash_command_service(project, service_slug, params)
             result = service.try(:trigger, params)
 
             if result
diff --git a/lib/api/v3/tags.rb b/lib/api/v3/tags.rb
index c2541de2f50..7e5875cd030 100644
--- a/lib/api/v3/tags.rb
+++ b/lib/api/v3/tags.rb
@@ -22,8 +22,8 @@ module API
         delete ":id/repository/tags/:tag_name", requirements: { tag_name: /.+/ } do
           authorize_push_project
 
-          result = ::Tags::DestroyService.new(user_project, current_user).
-            execute(params[:tag_name])
+          result = ::Tags::DestroyService.new(user_project, current_user)
+            .execute(params[:tag_name])
 
           if result[:status] == :success
             status(200)
diff --git a/lib/api/v3/users.rb b/lib/api/v3/users.rb
index f4cda3b2eba..37020019e07 100644
--- a/lib/api/v3/users.rb
+++ b/lib/api/v3/users.rb
@@ -50,13 +50,13 @@ module API
           if user.persisted?
             present user, with: ::API::Entities::UserPublic
           else
-            conflict!('Email has already been taken') if User.
-                where(email: user.email).
-                count > 0
+            conflict!('Email has already been taken') if User
+                .where(email: user.email)
+                .count > 0
 
-            conflict!('Username has already been taken') if User.
-                where(username: user.username).
-                count > 0
+            conflict!('Username has already been taken') if User
+                .where(username: user.username)
+                .count > 0
 
             render_validation_error!(user)
           end
@@ -137,11 +137,11 @@ module API
           user = User.find_by(id: params[:id])
           not_found!('User') unless user
 
-          events = user.events.
-            merge(ProjectsFinder.new(current_user: current_user).execute).
-            references(:project).
-            with_associations.
-            recent
+          events = user.events
+            .merge(ProjectsFinder.new(current_user: current_user).execute)
+            .references(:project)
+            .with_associations
+            .recent
 
           present paginate(events), with: ::API::V3::Entities::Event
         end