Add latest changes from gitlab-org/gitlab@master

27 files changed, 70 insertions, 70 deletions

diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake
index cb4d5abffbc..c380eb293b5 100644
--- a/lib/tasks/cache.rake
+++ b/lib/tasks/cache.rake
@@ -3,7 +3,7 @@ namespace :cache do
     REDIS_CLEAR_BATCH_SIZE = 1000 # There seems to be no speedup when pushing beyond 1,000
     REDIS_SCAN_START_STOP = '0'.freeze # Magic value, see http://redis.io/commands/scan
 
-    desc "GitLab | Clear redis cache"
+    desc "GitLab | Cache | Clear redis cache"
     task redis: :environment do
       Gitlab::Redis::Cache.with do |redis|
         cache_key_pattern = %W[#{Gitlab::Redis::Cache::CACHE_NAMESPACE}*
diff --git a/lib/tasks/ci/cleanup.rake b/lib/tasks/ci/cleanup.rake
index 2f4d11bd942..978a42be638 100644
--- a/lib/tasks/ci/cleanup.rake
+++ b/lib/tasks/ci/cleanup.rake
@@ -1,6 +1,6 @@
 namespace :ci do
   namespace :cleanup do
-    desc "GitLab CI | Clean running builds"
+    desc "GitLab | CI | Clean running builds"
     task builds: :environment do
       Ci::Build.running.update_all(status: 'canceled')
     end
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 0488f26318a..b3ba2434855 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -1,7 +1,7 @@
 task dev: ["dev:setup"]
 
 namespace :dev do
-  desc "GitLab | Setup developer environment (db, fixtures)"
+  desc "GitLab | Dev | Setup developer environment (db, fixtures)"
   task setup: :environment do
     ENV['force'] = 'yes'
     Rake::Task["gitlab:setup"].invoke
@@ -12,7 +12,7 @@ namespace :dev do
     Rake::Task["gitlab:shell:setup"].invoke
   end
 
-  desc "GitLab | Eager load application"
+  desc "GitLab | Dev | Eager load application"
   task load: :environment do
     Rails.configuration.eager_load = true
     Rails.application.eager_load!
diff --git a/lib/tasks/gitlab/artifacts/migrate.rake b/lib/tasks/gitlab/artifacts/migrate.rake
index 0d09fd0a4e3..871fdfb4fde 100644
--- a/lib/tasks/gitlab/artifacts/migrate.rake
+++ b/lib/tasks/gitlab/artifacts/migrate.rake
@@ -1,7 +1,7 @@
 require 'logger'
 require 'resolv-replace'
 
-desc "GitLab | Migrate files for artifacts to comply with new storage format"
+desc 'GitLab | Artifacts | Migrate files for artifacts to comply with new storage format'
 namespace :gitlab do
   namespace :artifacts do
     task migrate: :environment do
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index 2bf71701b57..8f34101ea15 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -3,18 +3,18 @@ require 'active_record/fixtures'
 namespace :gitlab do
   namespace :backup do
     # Create backup of GitLab system
-    desc "GitLab | Create a backup of the GitLab system"
+    desc 'GitLab | Backup | Create a backup of the GitLab system'
     task create: :gitlab_environment do
       warn_user_is_not_gitlab
 
-      Rake::Task["gitlab:backup:db:create"].invoke
-      Rake::Task["gitlab:backup:repo:create"].invoke
-      Rake::Task["gitlab:backup:uploads:create"].invoke
-      Rake::Task["gitlab:backup:builds:create"].invoke
-      Rake::Task["gitlab:backup:artifacts:create"].invoke
-      Rake::Task["gitlab:backup:pages:create"].invoke
-      Rake::Task["gitlab:backup:lfs:create"].invoke
-      Rake::Task["gitlab:backup:registry:create"].invoke
+      Rake::Task['gitlab:backup:db:create'].invoke
+      Rake::Task['gitlab:backup:repo:create'].invoke
+      Rake::Task['gitlab:backup:uploads:create'].invoke
+      Rake::Task['gitlab:backup:builds:create'].invoke
+      Rake::Task['gitlab:backup:artifacts:create'].invoke
+      Rake::Task['gitlab:backup:pages:create'].invoke
+      Rake::Task['gitlab:backup:lfs:create'].invoke
+      Rake::Task['gitlab:backup:registry:create'].invoke
 
       backup = Backup::Manager.new(progress)
       backup.pack
@@ -28,7 +28,7 @@ namespace :gitlab do
     end
 
     # Restore backup of GitLab system
-    desc 'GitLab | Restore a previously created backup'
+    desc 'GitLab | Backup | Restore a previously created backup'
     task restore: :gitlab_environment do
       warn_user_is_not_gitlab
 
diff --git a/lib/tasks/gitlab/bulk_add_permission.rake b/lib/tasks/gitlab/bulk_add_permission.rake
index c0d6cc8ca8e..56cbbae1f67 100644
--- a/lib/tasks/gitlab/bulk_add_permission.rake
+++ b/lib/tasks/gitlab/bulk_add_permission.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :import do
-    desc "GitLab | Add all users to all projects (admin users are added as maintainers)"
+    desc "GitLab | Import | Add all users to all projects (admin users are added as maintainers)"
     task all_users_to_all_projects: :environment  do |t, args|
       user_ids = User.where(admin: false).pluck(:id)
       admin_ids = User.where(admin: true).pluck(:id)
@@ -13,7 +13,7 @@ namespace :gitlab do
       ProjectMember.add_users_to_projects(project_ids, admin_ids, ProjectMember::MAINTAINER)
     end
 
-    desc "GitLab | Add a specific user to all projects (as a developer)"
+    desc "GitLab | Import | Add a specific user to all projects (as a developer)"
     task :user_to_projects, [:email] => :environment do |t, args|
       user = User.find_by(email: args.email)
       project_ids = Project.pluck(:id)
@@ -21,7 +21,7 @@ namespace :gitlab do
       ProjectMember.add_users_to_projects(project_ids, Array.wrap(user.id), ProjectMember::DEVELOPER)
     end
 
-    desc "GitLab | Add all users to all groups (admin users are added as owners)"
+    desc "GitLab | Import | Add all users to all groups (admin users are added as owners)"
     task all_users_to_all_groups: :environment do |t, args|
       user_ids = User.where(admin: false).pluck(:id)
       admin_ids = User.where(admin: true).pluck(:id)
@@ -35,7 +35,7 @@ namespace :gitlab do
       end
     end
 
-    desc "GitLab | Add a specific user to all groups (as a developer)"
+    desc "GitLab | Import | Add a specific user to all groups (as a developer)"
     task :user_to_groups, [:email] => :environment do |t, args|
       user = User.find_by_email args.email
       groups = Group.all
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index b594f150c3b..9e60a585330 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -5,35 +5,35 @@ namespace :gitlab do
   end
 
   namespace :app do
-    desc 'GitLab | Check the configuration of the GitLab Rails app'
+    desc 'GitLab | App | Check the configuration of the GitLab Rails app'
     task check: :gitlab_environment do
       SystemCheck::RakeTask::AppTask.run!
     end
   end
 
   namespace :gitlab_shell do
-    desc "GitLab | Check the configuration of GitLab Shell"
+    desc 'GitLab | GitLab Shell | Check the configuration of GitLab Shell'
     task check: :gitlab_environment do
       SystemCheck::RakeTask::GitlabShellTask.run!
     end
   end
 
   namespace :gitaly do
-    desc 'GitLab | Check the health of Gitaly'
+    desc 'GitLab | Gitaly | Check the health of Gitaly'
     task check: :gitlab_environment do
       SystemCheck::RakeTask::GitalyTask.run!
     end
   end
 
   namespace :sidekiq do
-    desc "GitLab | Check the configuration of Sidekiq"
+    desc 'GitLab | Sidekiq | Check the configuration of Sidekiq'
     task check: :gitlab_environment do
       SystemCheck::RakeTask::SidekiqTask.run!
     end
   end
 
   namespace :incoming_email do
-    desc "GitLab | Check the configuration of Reply by email"
+    desc 'GitLab | Incoming Email | Check the configuration of Reply by email'
     task check: :gitlab_environment do
       SystemCheck::RakeTask::IncomingEmailTask.run!
     end
@@ -48,17 +48,17 @@ namespace :gitlab do
   end
 
   namespace :orphans do
-    desc 'Gitlab | Check for orphaned namespaces and repositories'
+    desc 'Gitlab | Orphans | Check for orphaned namespaces and repositories'
     task check: :gitlab_environment do
       SystemCheck::RakeTask::OrphansTask.run!
     end
 
-    desc 'GitLab | Check for orphaned namespaces in the repositories path'
+    desc 'GitLab | Orphans | Check for orphaned namespaces in the repositories path'
     task check_namespaces: :gitlab_environment do
       SystemCheck::RakeTask::Orphans::NamespaceTask.run!
     end
 
-    desc 'GitLab | Check for orphaned repositories in the repositories path'
+    desc 'GitLab | Orphans | Check for orphaned repositories in the repositories path'
     task check_repositories: :gitlab_environment do
       SystemCheck::RakeTask::Orphans::RepositoryTask.run!
     end
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 1961f64659c..e72c5f51ada 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :db do
-    desc 'GitLab | Manually insert schema migration version'
+    desc 'GitLab | DB | Manually insert schema migration version'
     task :mark_migration_complete, [:version] => :environment do |_, args|
       unless args[:version]
         puts "Must specify a migration version as an argument".color(:red)
@@ -22,7 +22,7 @@ namespace :gitlab do
       end
     end
 
-    desc 'Drop all tables'
+    desc 'GitLab | DB | Drop all tables'
     task drop_tables: :environment do
       connection = ActiveRecord::Base.connection
 
@@ -41,7 +41,7 @@ namespace :gitlab do
       tables.each { |t| connection.execute("DROP TABLE IF EXISTS #{connection.quote_table_name(t)} CASCADE") }
     end
 
-    desc 'Configures the database by running migrate, or by loading the schema and seeding if needed'
+    desc 'GitLab | DB | Configures the database by running migrate, or by loading the schema and seeding if needed'
     task configure: :environment do
       # Check if we have existing db tables
       # The schema_migrations table will still exist if drop_tables was called
@@ -55,7 +55,7 @@ namespace :gitlab do
       end
     end
 
-    desc 'Checks if migrations require downtime or not'
+    desc 'GitLab | DB | Checks if migrations require downtime or not'
     task :downtime_check, [:ref] => :environment do |_, args|
       abort 'You must specify a Git reference to compare with' unless args[:ref]
 
@@ -71,7 +71,7 @@ namespace :gitlab do
       Gitlab::DowntimeCheck.new.check_and_print(migrations)
     end
 
-    desc 'Sets up EE specific database functionality'
+    desc 'GitLab | DB | Sets up EE specific database functionality'
 
     if Gitlab.ee?
       task setup_ee: %w[geo:db:drop geo:db:create geo:db:schema:load geo:db:migrate]
diff --git a/lib/tasks/gitlab/exclusive_lease.rake b/lib/tasks/gitlab/exclusive_lease.rake
index 83722bf6d94..63b06d5251a 100644
--- a/lib/tasks/gitlab/exclusive_lease.rake
+++ b/lib/tasks/gitlab/exclusive_lease.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :exclusive_lease do
-    desc 'GitLab | Clear existing exclusive leases for specified scope (default: *)'
+    desc 'GitLab | Exclusive Lease | Clear existing exclusive leases for specified scope (default: *)'
     task :clear, [:scope] => [:environment] do |_, args|
       args[:scope].nil? ? Gitlab::ExclusiveLease.reset_all! : Gitlab::ExclusiveLease.reset_all!(args[:scope])
       puts 'All exclusive lease entries were removed.'
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index 80de3d2ef51..c63ddb62f2a 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :gitaly do
-    desc "GitLab | Install or upgrade gitaly"
+    desc 'GitLab | Gitaly | Install or upgrade gitaly'
     task :install, [:dir, :storage_path, :repo] => :gitlab_environment do |t, args|
       warn_user_is_not_gitlab
 
diff --git a/lib/tasks/gitlab/graphql.rake b/lib/tasks/gitlab/graphql.rake
index f8ce3cd46a8..c73691f3d45 100644
--- a/lib/tasks/gitlab/graphql.rake
+++ b/lib/tasks/gitlab/graphql.rake
@@ -21,7 +21,7 @@ namespace :gitlab do
   )
 
   namespace :graphql do
-    desc 'GitLab | Generate GraphQL docs'
+    desc 'GitLab | GraphQL | Generate GraphQL docs'
     task compile_docs: :environment do
       renderer = Gitlab::Graphql::Docs::Renderer.new(GitlabSchema.graphql_definition, render_options)
 
@@ -30,7 +30,7 @@ namespace :gitlab do
       puts "Documentation compiled."
     end
 
-    desc 'GitLab | Check if GraphQL docs are up to date'
+    desc 'GitLab | GraphQL | Check if GraphQL docs are up to date'
     task check_docs: :environment do
       renderer = Gitlab::Graphql::Docs::Renderer.new(GitlabSchema.graphql_definition, render_options)
 
@@ -44,7 +44,7 @@ namespace :gitlab do
       end
     end
 
-    desc 'GitLab | Check if GraphQL schemas are up to date'
+    desc 'GitLab | GraphQL | Check if GraphQL schemas are up to date'
     task check_schema: :environment do
       idl_doc = File.read(Rails.root.join(OUTPUT_DIR, 'gitlab_schema.graphql'))
       json_doc = File.read(Rails.root.join(OUTPUT_DIR, 'gitlab_schema.json'))
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index adfcc3cda22..701d40b7929 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -8,7 +8,7 @@ namespace :gitlab do
     # Notes:
     #  * The project owner will set to the first administator of the system
     #  * Existing projects will be skipped
-    desc "GitLab | Import bare repositories from repositories -> storages into GitLab project instance"
+    desc "GitLab | Import | Import bare repositories from repositories -> storages into GitLab project instance"
     task :repos, [:import_path] => :environment do |_t, args|
       unless args.import_path
         puts 'Please specify an import path that contains the repositories'.color(:red)
diff --git a/lib/tasks/gitlab/import_export.rake b/lib/tasks/gitlab/import_export.rake
index 5365bd3920f..adf696350d7 100644
--- a/lib/tasks/gitlab/import_export.rake
+++ b/lib/tasks/gitlab/import_export.rake
@@ -1,16 +1,16 @@
 namespace :gitlab do
   namespace :import_export do
-    desc "GitLab | Show Import/Export version"
+    desc 'GitLab | Import/Export | Show Import/Export version'
     task version: :environment do
       puts "Import/Export v#{Gitlab::ImportExport.version}"
     end
 
-    desc "GitLab | Display exported DB structure"
+    desc 'GitLab | Import/Export | Display exported DB structure'
     task data: :environment do
       puts Gitlab::ImportExport::Config.new.to_h['project_tree'].to_yaml(SortKeys: true)
     end
 
-    desc 'GitLab | Bumps the Import/Export version in fixtures and project templates'
+    desc 'GitLab | Import/Export | Bumps the Import/Export version in fixtures and project templates'
     task bump_version: :environment do
       archives = Dir['vendor/project_templates/*.tar.gz']
       archives.push('spec/features/projects/import_export/test_project_export.tar.gz')
diff --git a/lib/tasks/gitlab/import_export/import.rake b/lib/tasks/gitlab/import_export/import.rake
index a88fb88c7ef..1f38b31c1e0 100644
--- a/lib/tasks/gitlab/import_export/import.rake
+++ b/lib/tasks/gitlab/import_export/import.rake
@@ -11,7 +11,7 @@
 #
 namespace :gitlab do
   namespace :import_export do
-    desc 'EXPERIMENTAL | Import large project archives'
+    desc 'GitLab | Import/Export | EXPERIMENTAL | Import large project archives'
     task :import, [:username, :namespace_path, :project_path, :archive_path] => :gitlab_environment do |_t, args|
       # Load it here to avoid polluting Rake tasks with Sidekiq test warnings
       require 'sidekiq/testing'
diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake
index 8fadadccce9..5809f632c5a 100644
--- a/lib/tasks/gitlab/info.rake
+++ b/lib/tasks/gitlab/info.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :env do
-    desc "GitLab | Show information about GitLab and its environment"
+    desc 'GitLab | Env | Show information about GitLab and its environment'
     task info: :gitlab_environment do
       # check if there is an RVM environment
       rvm_version = run_and_match(%w(rvm --version), /[\d\.]+/).try(:to_s)
diff --git a/lib/tasks/gitlab/lfs/migrate.rake b/lib/tasks/gitlab/lfs/migrate.rake
index 6f11646c841..470a12c39cd 100644
--- a/lib/tasks/gitlab/lfs/migrate.rake
+++ b/lib/tasks/gitlab/lfs/migrate.rake
@@ -1,6 +1,6 @@
 require 'logger'
 
-desc "GitLab | Migrate LFS objects to remote storage"
+desc "GitLab | LFS | Migrate LFS objects to remote storage"
 namespace :gitlab do
   namespace :lfs do
     task migrate: :environment do
diff --git a/lib/tasks/gitlab/metrics.rake b/lib/tasks/gitlab/metrics.rake
index 8a57e400dbe..f2635c96638 100644
--- a/lib/tasks/gitlab/metrics.rake
+++ b/lib/tasks/gitlab/metrics.rake
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 namespace :metrics do
-  desc "GitLab | Setup common metrics"
+  desc "GitLab | Metrics | Setup common metrics"
   task setup_common_metrics: :gitlab_environment do
     ::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
   end
diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake
index a592015963d..ba3e19caf3b 100644
--- a/lib/tasks/gitlab/shell.rake
+++ b/lib/tasks/gitlab/shell.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :shell do
-    desc "GitLab | Install or upgrade gitlab-shell"
+    desc "GitLab | Shell | Install or upgrade gitlab-shell"
     task :install, [:repo] => :gitlab_environment do |t, args|
       warn_user_is_not_gitlab
 
@@ -54,12 +54,12 @@ namespace :gitlab do
       Gitlab::Shell.ensure_secret_token!
     end
 
-    desc "GitLab | Setup gitlab-shell"
+    desc "GitLab | Shell | Setup gitlab-shell"
     task setup: :gitlab_environment do
       setup
     end
 
-    desc "GitLab | Build missing projects"
+    desc "GitLab | Shell | Build missing projects"
     task build_missing_projects: :gitlab_environment do
       Project.find_each(batch_size: 1000) do |project|
         path_to_repo = project.repository.path_to_repo
diff --git a/lib/tasks/gitlab/sidekiq.rake b/lib/tasks/gitlab/sidekiq.rake
index f6bb0196236..15c6c930386 100644
--- a/lib/tasks/gitlab/sidekiq.rake
+++ b/lib/tasks/gitlab/sidekiq.rake
@@ -16,7 +16,7 @@ namespace :gitlab do
         File.write(path, banner + YAML.dump(object))
       end
 
-      desc 'GitLab | Generate all_queues.yml based on worker definitions'
+      desc 'GitLab | Sidekiq | Generate all_queues.yml based on worker definitions'
       task generate: :environment do
         foss_workers, ee_workers = Gitlab::SidekiqConfig.workers_for_all_queues_yml
 
@@ -27,7 +27,7 @@ namespace :gitlab do
         end
       end
 
-      desc 'GitLab | Validate that all_queues.yml matches worker definitions'
+      desc 'GitLab | Sidekiq | Validate that all_queues.yml matches worker definitions'
       task check: :environment do
         if Gitlab::SidekiqConfig.all_queues_yml_outdated?
           raise <<~MSG
diff --git a/lib/tasks/gitlab/two_factor.rake b/lib/tasks/gitlab/two_factor.rake
index 6b22499a5c8..6a9e87e1541 100644
--- a/lib/tasks/gitlab/two_factor.rake
+++ b/lib/tasks/gitlab/two_factor.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :two_factor do
-    desc "GitLab | Disable Two-factor authentication (2FA) for all users"
+    desc "GitLab | 2FA | Disable Two-factor authentication (2FA) for all users"
     task disable_for_all_users: :gitlab_environment do
       scope = User.with_two_factor
       count = scope.count
@@ -25,12 +25,12 @@ namespace :gitlab do
         @rotator ||= Gitlab::OtpKeyRotator.new(ENV['filename'])
       end
 
-      desc "Encrypt user OTP secrets with a new encryption key"
+      desc "GitLab | 2FA | Rotate Key | Encrypt user OTP secrets with a new encryption key"
       task apply: :environment do |t, args|
         rotator.rotate!(old_key: ENV['old_key'], new_key: ENV['new_key'])
       end
 
-      desc "Rollback to secrets encrypted with the old encryption key"
+      desc "GitLab | 2FA | Rotate Key | Rollback to secrets encrypted with the old encryption key"
       task rollback: :environment do
         rotator.rollback!
       end
diff --git a/lib/tasks/gitlab/web_hook.rake b/lib/tasks/gitlab/web_hook.rake
index 15cec80b6a6..0b98755a77c 100644
--- a/lib/tasks/gitlab/web_hook.rake
+++ b/lib/tasks/gitlab/web_hook.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :web_hook do
-    desc "GitLab | Adds a webhook to the projects"
+    desc "GitLab | Webhook | Adds a webhook to the projects"
     task add: :environment do
       web_hook_url = ENV['URL']
       namespace_path = ENV['NAMESPACE']
@@ -20,7 +20,7 @@ namespace :gitlab do
       end
     end
 
-    desc "GitLab | Remove a webhook from the projects"
+    desc "GitLab | Webhook | Remove a webhook from the projects"
     task rm: :environment do
       web_hook_url = ENV['URL']
       namespace_path = ENV['NAMESPACE']
@@ -44,7 +44,7 @@ namespace :gitlab do
       puts "#{count} webhooks were removed."
     end
 
-    desc "GitLab | List webhooks"
+    desc "GitLab | Webhook | List webhooks"
     task list: :environment do
       namespace_path = ENV['NAMESPACE']
 
diff --git a/lib/tasks/gitlab/workhorse.rake b/lib/tasks/gitlab/workhorse.rake
index b917a293095..bae3e4e8001 100644
--- a/lib/tasks/gitlab/workhorse.rake
+++ b/lib/tasks/gitlab/workhorse.rake
@@ -1,6 +1,6 @@
 namespace :gitlab do
   namespace :workhorse do
-    desc "GitLab | Install or upgrade gitlab-workhorse"
+    desc "GitLab | Workhorse | Install or upgrade gitlab-workhorse"
     task :install, [:dir, :repo] => :gitlab_environment do |t, args|
       warn_user_is_not_gitlab
 
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index f912f521dfb..500891df43d 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -138,7 +138,7 @@ class GithubRepos
 end
 
 namespace :import do
-  desc 'Import a GitHub project - Example: import:github[ToKeN,root,root/blah,my/github_repo] (optional my/github_repo)'
+  desc 'GitLab | Import | Import a GitHub project - Example: import:github[ToKeN,root,root/blah,my/github_repo] (optional my/github_repo)'
   task :github, [:token, :gitlab_username, :project_path] => :environment do |_t, args|
     abort 'Project path must be: namespace(s)/project_name'.color(:red) unless args.project_path.include?('/')
 
diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake
index 42a9c027b6a..91e7031744a 100644
--- a/lib/tasks/lint.rake
+++ b/lib/tasks/lint.rake
@@ -4,7 +4,7 @@ unless Rails.env.production?
       ENV['STATIC_VERIFICATION'] = 'true'
     end
 
-    desc "GitLab | lint | Static verification"
+    desc "GitLab | Lint | Static verification"
     task static_verification: %w[
       lint:static_verification_env
       dev:load
@@ -12,19 +12,19 @@ unless Rails.env.production?
       Gitlab::Utils::Override.verify!
     end
 
-    desc "GitLab | lint | Lint JavaScript files using ESLint"
+    desc "GitLab | Lint | Lint JavaScript files using ESLint"
     task :javascript do
       Rake::Task['eslint'].invoke
     end
 
-    desc "GitLab | lint | Lint HAML files"
+    desc "GitLab | Lint | Lint HAML files"
     task :haml do
       Rake::Task['haml_lint'].invoke
     rescue RuntimeError # The haml_lint tasks raise a RuntimeError
       exit(1)
     end
 
-    desc "GitLab | lint | Run several lint checks"
+    desc "GitLab | Lint | Run several lint checks"
     task :all do
       status = 0
 
diff --git a/lib/tasks/migrate/composite_primary_keys.rake b/lib/tasks/migrate/composite_primary_keys.rake
index eb112434dd9..732dedf4d4f 100644
--- a/lib/tasks/migrate/composite_primary_keys.rake
+++ b/lib/tasks/migrate/composite_primary_keys.rake
@@ -1,12 +1,12 @@
 namespace :gitlab do
   namespace :db do
-    desc 'GitLab | Adds primary keys to tables that only have composite unique keys'
+    desc 'GitLab | DB | Adds primary keys to tables that only have composite unique keys'
     task composite_primary_keys_add: :environment do
       require Rails.root.join('db/optional_migrations/composite_primary_keys')
       CompositePrimaryKeysMigration.new.up
     end
 
-    desc 'GitLab | Removes previously added composite primary keys'
+    desc 'GitLab | DB | Removes previously added composite primary keys'
     task composite_primary_keys_drop: :environment do
       require Rails.root.join('db/optional_migrations/composite_primary_keys')
       CompositePrimaryKeysMigration.new.down
diff --git a/lib/tasks/pngquant.rake b/lib/tasks/pngquant.rake
index 56dfd5ed081..ceb4de55373 100644
--- a/lib/tasks/pngquant.rake
+++ b/lib/tasks/pngquant.rake
@@ -53,7 +53,7 @@ namespace :pngquant do
     end
   end
 
-  desc 'GitLab | pngquant | Compress all documentation PNG images using pngquant'
+  desc 'GitLab | Pngquant | Compress all documentation PNG images using pngquant'
   task :compress do
     check_executable
 
@@ -69,7 +69,7 @@ namespace :pngquant do
     end
   end
 
-  desc 'GitLab | pngquant | Checks that all documentation PNG images have been compressed with pngquant'
+  desc 'GitLab | Pngquant | Checks that all documentation PNG images have been compressed with pngquant'
   task :lint do
     check_executable
 
diff --git a/lib/tasks/sidekiq.rake b/lib/tasks/sidekiq.rake
index cb9f4c751ed..e281ebd5d60 100644
--- a/lib/tasks/sidekiq.rake
+++ b/lib/tasks/sidekiq.rake
@@ -8,28 +8,28 @@ namespace :sidekiq do
     WARNING
   end
 
-  desc "[DEPRECATED] GitLab | Stop sidekiq"
+  desc '[DEPRECATED] GitLab | Sidekiq | Stop sidekiq'
   task :stop do
     deprecation_warning!
 
     system(*%w(bin/background_jobs stop))
   end
 
-  desc "[DEPRECATED] GitLab | Start sidekiq"
+  desc '[DEPRECATED] GitLab | Sidekiq | Start sidekiq'
   task :start do
     deprecation_warning!
 
     system(*%w(bin/background_jobs start))
   end
 
-  desc '[DEPRECATED] GitLab | Restart sidekiq'
+  desc '[DEPRECATED] GitLab | Sidekiq | Restart sidekiq'
   task :restart do
     deprecation_warning!
 
     system(*%w(bin/background_jobs restart))
   end
 
-  desc "[DEPRECATED] GitLab | Start sidekiq with launchd on Mac OS X"
+  desc '[DEPRECATED] GitLab | Sidekiq | Start sidekiq with launchd on Mac OS X'
   task :launchd do
     deprecation_warning!