1 files changed, 11 insertions, 25 deletions
diff --git a/config/application.rb b/config/application.rb
index a8b6bc937cf..7e15d02a6da 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -176,12 +176,15 @@ module Gitlab
     config.assets.precompile << "notify.css"
     config.assets.precompile << "mailers/*.css"
     config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
+    config.assets.precompile << "page_bundles/admin/application_settings_metrics_and_profiling.css"
+    config.assets.precompile << "page_bundles/admin/jobs_index.css"
     config.assets.precompile << "page_bundles/alert_management_details.css"
     config.assets.precompile << "page_bundles/alert_management_settings.css"
     config.assets.precompile << "page_bundles/boards.css"
     config.assets.precompile << "page_bundles/build.css"
     config.assets.precompile << "page_bundles/ci_status.css"
     config.assets.precompile << "page_bundles/cycle_analytics.css"
+    config.assets.precompile << "page_bundles/security_discover.css"
     config.assets.precompile << "page_bundles/dev_ops_report.css"
     config.assets.precompile << "page_bundles/environments.css"
     config.assets.precompile << "page_bundles/epics.css"
@@ -287,6 +290,14 @@ module Gitlab
           methods: :any,
           expose: headers_to_expose
       end
+
+      # Cross-origin requests must be enabled for the Authorization code with PKCE OAuth flow when used from a browser.
+      allow do
+        origins '*'
+        resource '/oauth/token',
+          credentials: false,
+          methods: [:post]
+      end
     end
 
     # Use caching across all environments
@@ -368,30 +379,5 @@ module Gitlab
         end
       end
     end
-
-    config.after_initialize do
-      # Devise (see initializers/8_devise.rb) already reloads routes if
-      # eager loading is enabled, so don't do this twice since it's
-      # expensive.
-      Rails.application.reload_routes! unless config.eager_load
-
-      project_url_helpers = Module.new do
-        extend ActiveSupport::Concern
-
-        Gitlab::Application.routes.named_routes.helper_names.each do |name|
-          next unless name.include?('namespace_project')
-
-          define_method(name.sub('namespace_project', 'project')) do |project, *args|
-            send(name, project&.namespace, project, *args)
-          end
-        end
-      end
-
-      # We add the MilestonesRoutingHelper because we know that this does not
-      # conflict with the methods defined in `project_url_helpers`, and we want
-      # these methods available in the same places.
-      Gitlab::Routing.add_helpers(project_url_helpers)
-      Gitlab::Routing.add_helpers(TimeboxesRoutingHelper)
-    end
   end
 end