Add latest changes from gitlab-org/gitlab@master

6 files changed, 14 insertions, 9 deletions

diff --git a/lib/api/concerns/packages/nuget/public_endpoints.rb b/lib/api/concerns/packages/nuget/public_endpoints.rb
index 740ff97e20c..a710e4acea8 100644
--- a/lib/api/concerns/packages/nuget/public_endpoints.rb
+++ b/lib/api/concerns/packages/nuget/public_endpoints.rb
@@ -48,7 +48,7 @@ module API
 
             namespace :symbolfiles do
               after_validation do
-                not_found! if Feature.disabled?(:nuget_symbolfiles_endpoint, project_or_group_without_auth)
+                forbidden! unless symbol_server_enabled?
               end
 
               desc 'The NuGet Symbol File Download Endpoint' do
@@ -56,6 +56,7 @@ module API
                 success code: 200
                 failure [
                   { code: 400, message: 'Bad Request' },
+                  { code: 403, message: 'Forbidden' },
                   { code: 404, message: 'Not Found' }
                 ]
                 headers Symbolchecksum: {
diff --git a/lib/api/nuget_group_packages.rb b/lib/api/nuget_group_packages.rb
index 7a6872ee82f..394f8911e9e 100644
--- a/lib/api/nuget_group_packages.rb
+++ b/lib/api/nuget_group_packages.rb
@@ -38,6 +38,10 @@ module API
       end
       strong_memoize_attr :project_or_group_without_auth
 
+      def symbol_server_enabled?
+        project_or_group_without_auth.package_settings.nuget_symbol_server_enabled
+      end
+
       def require_authenticated!
         unauthorized! unless current_user
       end
diff --git a/lib/api/nuget_project_packages.rb b/lib/api/nuget_project_packages.rb
index b061876b997..e25b47397a7 100644
--- a/lib/api/nuget_project_packages.rb
+++ b/lib/api/nuget_project_packages.rb
@@ -46,6 +46,10 @@ module API
       end
       strong_memoize_attr :project_or_group_without_auth
 
+      def symbol_server_enabled?
+        project_or_group_without_auth.namespace.package_settings.nuget_symbol_server_enabled
+      end
+
       def snowplow_gitlab_standard_context
         { project: project_or_group, namespace: project_or_group.namespace }
       end
diff --git a/lib/sidebars/projects/menus/project_information_menu.rb b/lib/sidebars/projects/menus/project_information_menu.rb
index ee06ed5314e..ce6e5f3b8d3 100644
--- a/lib/sidebars/projects/menus/project_information_menu.rb
+++ b/lib/sidebars/projects/menus/project_information_menu.rb
@@ -70,10 +70,7 @@ module Sidebars
             link: project_project_members_path(context.project),
             super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::ManageMenu,
             active_routes: { controller: :project_members },
-            item_id: :members,
-            container_html_options: {
-              id: 'js-onboarding-members-link'
-            }
+            item_id: :members
           )
         end
       end
diff --git a/lib/sidebars/projects/menus/repository_menu.rb b/lib/sidebars/projects/menus/repository_menu.rb
index 807ed72e85c..2bf4d782fda 100644
--- a/lib/sidebars/projects/menus/repository_menu.rb
+++ b/lib/sidebars/projects/menus/repository_menu.rb
@@ -64,7 +64,7 @@ module Sidebars
             super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::CodeMenu,
             active_routes: { controller: %w[commit commits] },
             item_id: :commits,
-            container_html_options: { id: 'js-onboarding-commits-link', class: 'shortcuts-commits' }
+            container_html_options: { class: 'shortcuts-commits' }
           )
         end
 
@@ -74,8 +74,7 @@ module Sidebars
             link: project_branches_path(context.project),
             super_sidebar_parent: ::Sidebars::Projects::SuperSidebarMenus::CodeMenu,
             active_routes: { controller: :branches },
-            item_id: :branches,
-            container_html_options: { id: 'js-onboarding-branches-link' }
+            item_id: :branches
           )
         end
 
diff --git a/lib/sidebars/user_settings/menus/password_menu.rb b/lib/sidebars/user_settings/menus/password_menu.rb
index e518e1f8bf7..d38d7e94746 100644
--- a/lib/sidebars/user_settings/menus/password_menu.rb
+++ b/lib/sidebars/user_settings/menus/password_menu.rb
@@ -6,7 +6,7 @@ module Sidebars
       class PasswordMenu < ::Sidebars::Menu
         override :link
         def link
-          edit_profile_password_path
+          edit_user_settings_password_path
         end
 
         override :title