diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 00:08:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 00:08:41 +0000 |
commit | e40710ab8a30f36d7c82d7d6497033291840eec9 (patch) | |
tree | aea450b24cb1bd8023c1d297e4f01de4e88926b2 /config | |
parent | 51612d3ef5be853289008694c40973b479e8547c (diff) | |
download | gitlab-ce-e40710ab8a30f36d7c82d7d6497033291840eec9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/feature_categories.yml | 11 | ||||
-rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
-rw-r--r-- | config/initializers/graphql.rb | 2 | ||||
-rw-r--r-- | config/routes/api.rb | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 1cae9875eac..ce6bc891d10 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -21,6 +21,7 @@ - cloud_native_installation - cluster_cost_optimization - cluster_monitoring +- code_analytics - code_quality - code_review - collection @@ -31,8 +32,8 @@ - container_scanning - continuous_delivery - continuous_integration -- data_loss_prevention - ddos_protection +- dependency_firewall - dependency_proxy - dependency_scanning - design_management @@ -42,8 +43,11 @@ - epics - error_tracking - feature_flags +- frontend_foundation - fuzzing +- gdk - geo_replication +- git_lfs - gitaly - gitlab_handbook - gitter @@ -52,11 +56,11 @@ - incident_management - incremental_rollout - infrastructure_as_code -- integration_testing - integrations - interactive_application_security_testing - internationalization - issue_tracking +- jupyter_notebooks - kanban_boards - kubernetes_management - language_specific @@ -65,6 +69,7 @@ - load_testing - logging - malware_scanning +- merge_trains - metrics - omnibus_package - package_registry @@ -93,6 +98,7 @@ - subgroups - synthetic_monitoring - system_testing +- teams - templates - threat_detection - time_tracking @@ -107,3 +113,4 @@ - web_ide - web_performance - wiki +- workspaces diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index d7d4bd9d3a1..a6fbb8608b3 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -192,6 +192,7 @@ Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username Settings.gitlab['issue_closing_pattern'] = '\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?: *,? +and +| *,? *)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil? Settings.gitlab['default_projects_features'] ||= {} Settings.gitlab['webhook_timeout'] ||= 10 +Settings.gitlab['graphql_timeout'] ||= 30 Settings.gitlab['max_attachment_size'] ||= 10 Settings.gitlab['session_expire_delay'] ||= 10080 Settings.gitlab['unauthenticated_session_expire_delay'] ||= 2.hours.to_i diff --git a/config/initializers/graphql.rb b/config/initializers/graphql.rb index 206c4daceac..44a9644f481 100644 --- a/config/initializers/graphql.rb +++ b/config/initializers/graphql.rb @@ -7,7 +7,7 @@ GraphQL::Schema::Object.accepts_definition(:authorize) GraphQL::Schema::Field.accepts_definition(:authorize) Gitlab::Application.config.after_initialize do - GitlabSchema.middleware << GraphQL::Schema::TimeoutMiddleware.new(max_seconds: ENV.fetch('GITLAB_RAILS_GRAPHQL_TIMEOUT', 30).to_i) do |timeout_error, query| + GitlabSchema.middleware << GraphQL::Schema::TimeoutMiddleware.new(max_seconds: Gitlab.config.gitlab.graphql_timeout) do |timeout_error, query| Gitlab::GraphqlLogger.error(message: timeout_error.to_s, query: query.query_string, query_variables: query.provided_variables) end end diff --git a/config/routes/api.rb b/config/routes/api.rb index d55bbdf6776..5dbfcc98f0f 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -1,5 +1,5 @@ post '/api/graphql', to: 'graphql#execute' -mount GraphiQL::Rails::Engine, at: '/-/graphql-explorer', graphql_path: '/api/graphql' +mount GraphiQL::Rails::Engine, at: '/-/graphql-explorer', graphql_path: Gitlab::Utils.append_path(Gitlab.config.gitlab.relative_url_root, '/api/graphql') ::API::API.logger Rails.logger # rubocop:disable Gitlab/RailsLogger mount ::API::API => '/' |