diff options
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 67 |
1 files changed, 28 insertions, 39 deletions
diff --git a/config/application.rb b/config/application.rb index 1c11e347281..6d39e26b9ab 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,24 +1,24 @@ -require File.expand_path('boot', __dir__) +require File.expand_path("boot", __dir__) -require 'rails/all' +require "rails/all" Bundler.require(:default, Rails.env) module Gitlab class Application < Rails::Application - require_dependency Rails.root.join('lib/gitlab/redis/wrapper') - require_dependency Rails.root.join('lib/gitlab/redis/cache') - require_dependency Rails.root.join('lib/gitlab/redis/queues') - require_dependency Rails.root.join('lib/gitlab/redis/shared_state') - require_dependency Rails.root.join('lib/gitlab/request_context') - require_dependency Rails.root.join('lib/gitlab/current_settings') - require_dependency Rails.root.join('lib/gitlab/middleware/read_only') - require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check') + require_dependency Rails.root.join("lib/gitlab/redis/wrapper") + require_dependency Rails.root.join("lib/gitlab/redis/cache") + require_dependency Rails.root.join("lib/gitlab/redis/queues") + require_dependency Rails.root.join("lib/gitlab/redis/shared_state") + require_dependency Rails.root.join("lib/gitlab/request_context") + require_dependency Rails.root.join("lib/gitlab/current_settings") + require_dependency Rails.root.join("lib/gitlab/middleware/read_only") + require_dependency Rails.root.join("lib/gitlab/middleware/basic_health_check") # This needs to be loaded before DB connection is made # to make sure that all connections have NO_ZERO_DATE # setting disabled - require_dependency Rails.root.join('lib/mysql_zero_date') + require_dependency Rails.root.join("lib/mysql_zero_date") # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -32,18 +32,7 @@ module Gitlab # https://github.com/rails/rails/blob/v4.2.6/railties/lib/rails/engine.rb#L687 # This is a nice reference article on autoloading/eager loading: # http://blog.arkency.com/2014/11/dont-forget-about-eager-load-when-extending-autoload - config.eager_load_paths.push(*%W[#{config.root}/lib - #{config.root}/app/models/badges - #{config.root}/app/models/hooks - #{config.root}/app/models/members - #{config.root}/app/models/project_services - #{config.root}/app/workers/concerns - #{config.root}/app/policies/concerns - #{config.root}/app/services/concerns - #{config.root}/app/serializers/concerns - #{config.root}/app/finders/concerns - #{config.root}/app/graphql/resolvers/concerns - #{config.root}/app/graphql/mutations/concerns]) + config.eager_load_paths.push("#{config.root}/lib", "#{config.root}/app/models/badges", "#{config.root}/app/models/hooks", "#{config.root}/app/models/members", "#{config.root}/app/models/project_services", "#{config.root}/app/workers/concerns", "#{config.root}/app/policies/concerns", "#{config.root}/app/services/concerns", "#{config.root}/app/serializers/concerns", "#{config.root}/app/finders/concerns", "#{config.root}/app/graphql/resolvers/concerns", "#{config.root}/app/graphql/mutations/concerns") config.generators.templates.push("#{config.root}/generator_templates") @@ -98,7 +87,7 @@ module Gitlab # NOTE: It is **IMPORTANT** to also update gitlab-workhorse's filter when adding parameters here to not # introduce another security vulnerability: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/182 config.filter_parameters += [/token$/, /password/, /secret/, /key$/, /^note$/, /^text$/] - config.filter_parameters += %i( + config.filter_parameters += %i[ certificate encrypted_key hook @@ -108,7 +97,7 @@ module Gitlab trace variables content - ) + ] # Enable escaping HTML in JSON. config.active_support.escape_html_entities_in_json = true @@ -160,15 +149,15 @@ module Gitlab config.assets.precompile << "xterm.css" # Version of your assets, change this if you want to expire all your assets - config.assets.version = '1.0' + config.assets.version = "1.0" - config.action_view.sanitized_allowed_protocols = %w(smb) + config.action_view.sanitized_allowed_protocols = %w[smb] # Can be removed once upgraded to Rails 5.1 or higher config.action_controller.raise_on_unfiltered_parameters = true # Nokogiri is significantly faster and uses less memory than REXML - ActiveSupport::XmlMini.backend = 'Nokogiri' + ActiveSupport::XmlMini.backend = "Nokogiri" # This middleware needs to precede ActiveRecord::QueryCache and other middlewares that # connect to the database. @@ -180,21 +169,21 @@ module Gitlab config.middleware.insert_before Warden::Manager, Rack::Cors do allow do origins Gitlab.config.gitlab.url - resource '/api/*', + resource "/api/*", credentials: true, headers: :any, methods: :any, - expose: ['Link', 'X-Total', 'X-Total-Pages', 'X-Per-Page', 'X-Page', 'X-Next-Page', 'X-Prev-Page'] + expose: ["Link", "X-Total", "X-Total-Pages", "X-Per-Page", "X-Page", "X-Next-Page", "X-Prev-Page"] end # Cross-origin requests must not have the session cookie available allow do - origins '*' - resource '/api/*', + origins "*" + resource "/api/*", credentials: false, headers: :any, methods: :any, - expose: ['Link', 'X-Total', 'X-Total-Pages', 'X-Per-Page', 'X-Page', 'X-Next-Page', 'X-Prev-Page'] + expose: ["Link", "X-Total", "X-Total-Pages", "X-Per-Page", "X-Page", "X-Next-Page", "X-Prev-Page"] end end @@ -212,8 +201,8 @@ module Gitlab config.active_job.queue_adapter = :sidekiq # This is needed for gitlab-shell - ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH'] - ENV['GIT_TERMINAL_PROMPT'] = '0' + ENV["GITLAB_PATH_OUTSIDE_HOOK"] = ENV["PATH"] + ENV["GIT_TERMINAL_PROMPT"] = "0" # GitLab Read-only middleware support config.middleware.insert_after ActionDispatch::Flash, ::Gitlab::Middleware::ReadOnly @@ -225,17 +214,17 @@ module Gitlab config.after_initialize do Rails.application.reload_routes! - project_url_helpers = Module.new do + project_url_helpers = Module.new { extend ActiveSupport::Concern Gitlab::Application.routes.named_routes.helper_names.each do |name| - next unless name.include?('namespace_project') + next unless name.include?("namespace_project") - define_method(name.sub('namespace_project', 'project')) do |project, *args| + 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 |