Add latest changes from gitlab-org/gitlab@master

9 files changed, 20 insertions, 25 deletions

diff --git a/lib/api/appearance.rb b/lib/api/appearance.rb
index 1eaa4167a7d..e599abf4aaf 100644
--- a/lib/api/appearance.rb
+++ b/lib/api/appearance.rb
@@ -5,6 +5,7 @@ module API
     before { authenticated_as_admin! }
 
     feature_category :navigation
+    urgency :low
 
     helpers do
       def current_appearance
diff --git a/lib/api/avatar.rb b/lib/api/avatar.rb
index bd9fb37e18b..0fb7a4cd435 100644
--- a/lib/api/avatar.rb
+++ b/lib/api/avatar.rb
@@ -3,7 +3,7 @@
 module API
   class Avatar < ::API::Base
     feature_category :users
-    urgency :high
+    urgency :medium
 
     resource :avatar do
       desc 'Return avatar url for a user' do
diff --git a/lib/api/badges.rb b/lib/api/badges.rb
index 68095fb2975..f969eec8431 100644
--- a/lib/api/badges.rb
+++ b/lib/api/badges.rb
@@ -32,7 +32,7 @@ module API
         params do
           use :pagination
         end
-        get ":id/badges", urgency: :default do
+        get ":id/badges", urgency: :low do
           source = find_source(source_type, params[:id])
 
           badges = source.badges
@@ -91,7 +91,7 @@ module API
           requires :image_url, type: String, desc: 'URL of the badge image'
           optional :name, type: String, desc: 'Name for the badge'
         end
-        post ":id/badges", urgency: :default do
+        post ":id/badges" do
           source = find_source_if_admin(source_type)
 
           badge = ::Badges::CreateService.new(declared_params(include_missing: false)).execute(source)
diff --git a/lib/api/broadcast_messages.rb b/lib/api/broadcast_messages.rb
index e081265b418..b5d68ca5de2 100644
--- a/lib/api/broadcast_messages.rb
+++ b/lib/api/broadcast_messages.rb
@@ -5,6 +5,7 @@ module API
     include PaginationParams
 
     feature_category :navigation
+    urgency :low
 
     resource :broadcast_messages do
       helpers do
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 60bb51bf48f..c17bc432404 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -417,7 +417,7 @@ module API
         requires :group_access, type: Integer, values: Gitlab::Access.all_values, desc: 'The group access level'
         optional :expires_at, type: Date, desc: 'Share expiration date'
       end
-      post ":id/share", feature_category: :subgroups do
+      post ":id/share", feature_category: :subgroups, urgency: :low do
         shared_with_group = find_group!(params[:group_id])
 
         group_link_create_params = {
diff --git a/lib/api/user_counts.rb b/lib/api/user_counts.rb
index 756901c5717..d0b1e458a27 100644
--- a/lib/api/user_counts.rb
+++ b/lib/api/user_counts.rb
@@ -3,6 +3,7 @@
 module API
   class UserCounts < ::API::Base
     feature_category :navigation
+    urgency :low
 
     resource :user_counts do
       desc 'Return the user specific counts' do
diff --git a/lib/api/users.rb b/lib/api/users.rb
index c7aa4b43d4d..5ef826ae628 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -10,7 +10,7 @@ module API
 
     feature_category :users, ['/users/:id/custom_attributes', '/users/:id/custom_attributes/:key']
 
-    urgency :high, ['/users/:id/custom_attributes', '/users/:id/custom_attributes/:key']
+    urgency :medium, ['/users/:id/custom_attributes', '/users/:id/custom_attributes/:key']
 
     resource :users, requirements: { uid: /[0-9]*/, id: /[0-9]*/ } do
       include CustomAttributesEndpoints
@@ -145,7 +145,7 @@ module API
         use :with_custom_attributes
       end
       # rubocop: disable CodeReuse/ActiveRecord
-      get ":id", feature_category: :users, urgency: :medium do
+      get ":id", feature_category: :users, urgency: :default do
         forbidden!('Not authorized!') unless current_user
 
         unless current_user.admin?
@@ -170,7 +170,7 @@ module API
       params do
         requires :user_id, type: String, desc: 'The ID or username of the user'
       end
-      get ":user_id/status", requirements: API::USER_REQUIREMENTS, feature_category: :users, urgency: :high do
+      get ":user_id/status", requirements: API::USER_REQUIREMENTS, feature_category: :users, urgency: :default do
         user = find_user(params[:user_id])
 
         not_found!('User') unless user && can?(current_user, :read_user, user)
@@ -921,7 +921,7 @@ module API
         desc 'Get the currently authenticated user' do
           success Entities::UserPublic
         end
-        get feature_category: :users, urgency: :medium do
+        get feature_category: :users, urgency: :default do
           entity =
             if current_user.admin?
               Entities::UserWithAdmin
diff --git a/lib/backup/gitaly_backup.rb b/lib/backup/gitaly_backup.rb
index a8b0e7ad157..077eabdd131 100644
--- a/lib/backup/gitaly_backup.rb
+++ b/lib/backup/gitaly_backup.rb
@@ -19,6 +19,10 @@ module Backup
     def start(type, backup_repos_path, backup_id: nil)
       raise Error, 'already started' if started?
 
+      if type == :create && !incremental?
+        FileUtils.rm_rf(backup_repos_path)
+      end
+
       command = case type
                 when :create
                   'create'
@@ -34,7 +38,7 @@ module Backup
       if Feature.enabled?(:incremental_repository_backup)
         args += ['-layout', 'pointer']
         if type == :create
-          args += ['-incremental'] if @incremental
+          args += ['-incremental'] if incremental?
           args += ['-id', backup_id] if backup_id
         end
       end
@@ -68,6 +72,10 @@ module Backup
 
     private
 
+    def incremental?
+      @incremental
+    end
+
     # Schedule a new backup job through a non-blocking JSON based pipe protocol
     #
     # @see https://gitlab.com/gitlab-org/gitaly/-/blob/master/doc/gitaly-backup.md
diff --git a/lib/sidebars/projects/menus/monitor_menu.rb b/lib/sidebars/projects/menus/monitor_menu.rb
index c35bc1f5481..311c44f5f80 100644
--- a/lib/sidebars/projects/menus/monitor_menu.rb
+++ b/lib/sidebars/projects/menus/monitor_menu.rb
@@ -10,7 +10,6 @@ module Sidebars
 
           add_item(metrics_dashboard_menu_item)
           add_item(logs_menu_item)
-          add_item(tracing_menu_item)
           add_item(error_tracking_menu_item)
           add_item(alert_management_menu_item)
           add_item(incidents_menu_item)
@@ -72,21 +71,6 @@ module Sidebars
           )
         end
 
-        def tracing_menu_item
-          if !Feature.enabled?(:monitor_tracing, context.project) ||
-            !can?(context.current_user, :read_environment, context.project) ||
-            !can?(context.current_user, :admin_project, context.project)
-            return ::Sidebars::NilMenuItem.new(item_id: :tracing)
-          end
-
-          ::Sidebars::MenuItem.new(
-            title: _('Tracing'),
-            link: project_tracing_path(context.project),
-            active_routes: { path: 'tracings#show' },
-            item_id: :tracing
-          )
-        end
-
         def error_tracking_menu_item
           unless can?(context.current_user, :read_sentry_issue, context.project)
             return ::Sidebars::NilMenuItem.new(item_id: :error_tracking)