diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /config/application.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 75befc8a248..e8aebec086b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,7 +28,7 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check') require_dependency Rails.root.join('lib/gitlab/middleware/same_site_cookies') require_dependency Rails.root.join('lib/gitlab/middleware/handle_ip_spoof_attack_error') - require_dependency Rails.root.join('lib/gitlab/middleware/handle_null_bytes') + require_dependency Rails.root.join('lib/gitlab/middleware/handle_malformed_strings') require_dependency Rails.root.join('lib/gitlab/runtime') # Settings in config/environments/* take precedence over those specified here. @@ -174,13 +174,17 @@ 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/alert_management_details.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/dev_ops_report.css" config.assets.precompile << "page_bundles/environments.css" + config.assets.precompile << "page_bundles/epics.css" config.assets.precompile << "page_bundles/error_tracking_details.css" config.assets.precompile << "page_bundles/error_tracking_index.css" - config.assets.precompile << "page_bundles/experimental_separate_sign_up.css" + config.assets.precompile << "page_bundles/signup.css" config.assets.precompile << "page_bundles/ide.css" config.assets.precompile << "page_bundles/issues_list.css" config.assets.precompile << "page_bundles/jira_connect.css" @@ -190,15 +194,18 @@ module Gitlab config.assets.precompile << "page_bundles/milestone.css" config.assets.precompile << "page_bundles/pipeline.css" config.assets.precompile << "page_bundles/pipelines.css" + config.assets.precompile << "page_bundles/pipeline_schedules.css" config.assets.precompile << "page_bundles/productivity_analytics.css" config.assets.precompile << "page_bundles/terminal.css" config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/reports.css" - config.assets.precompile << "page_bundles/xterm.css" + config.assets.precompile << "page_bundles/roadmap.css" config.assets.precompile << "page_bundles/wiki.css" + config.assets.precompile << "page_bundles/xterm.css" + config.assets.precompile << "page_bundles/alert_management_settings.css" config.assets.precompile << "lazy_bundles/cropper.css" + config.assets.precompile << "lazy_bundles/select2.css" config.assets.precompile << "performance_bar.css" - config.assets.precompile << "lib/ace.js" config.assets.precompile << "disable_animations.css" config.assets.precompile << "snippets.css" config.assets.precompile << "locale/**/app.js" @@ -254,7 +261,7 @@ module Gitlab config.middleware.insert_before ActionDispatch::RemoteIp, ::Gitlab::Middleware::HandleIpSpoofAttackError - config.middleware.use ::Gitlab::Middleware::HandleNullBytes + config.middleware.insert_after ActionDispatch::ActionableExceptions, ::Gitlab::Middleware::HandleMalformedStrings # Allow access to GitLab API from other domains config.middleware.insert_before Warden::Manager, Rack::Cors do |