diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/graphql.rb | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 4 | ||||
| -rw-r--r-- | config/routes/group.rb | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 3 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 |
5 files changed, 8 insertions, 4 deletions
diff --git a/config/initializers/graphql.rb b/config/initializers/graphql.rb index 1ed93019329..e653556231d 100644 --- a/config/initializers/graphql.rb +++ b/config/initializers/graphql.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true GraphQL::Field.accepts_definitions(authorize: GraphQL::Define.assign_metadata_key(:authorize)) -Types::BaseField.accepts_definition(:authorize) +GraphQL::Schema::Field.accepts_definition(:authorize) diff --git a/config/locales/en.yml b/config/locales/en.yml index e8dbc033a7c..eb3b7771968 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,6 +10,10 @@ en: target: Target issue group: path: Group URL + project/error_tracking_setting: + token: "Auth Token" + project: "Project" + api_url: "Sentry API URL" errors: messages: label_already_exists_at_group_level: "already exists at group level for %{group}. Please choose another one." diff --git a/config/routes/group.rb b/config/routes/group.rb index a0aeebe4b91..b3015529c6e 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -67,7 +67,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do end end - resources :boards, only: [:index, :show] + resources :boards, only: [:index, :show], constraints: { id: /\d+/ } resources :runners, only: [:index, :edit, :update, :destroy, :show] do member do diff --git a/config/routes/project.rb b/config/routes/project.rb index b4ebc7df4fe..d60a5cc9ae8 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -394,8 +394,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get 'noteable/:target_type/:target_id/notes' => 'notes#index', as: 'noteable_notes' - # On CE only index and show are needed - resources :boards, only: [:index, :show] + resources :boards, only: [:index, :show], constraints: { id: /\d+/ } resources :todos, only: [:create] diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 1f40363e126..cef123b86ae 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -68,6 +68,7 @@ - [background_migration, 1] - [gcp_cluster, 1] - [project_migrate_hashed_storage, 1] + - [project_rollback_hashed_storage, 1] - [hashed_storage, 1] - [pages_domain_verification, 1] - [object_storage_upload, 1] |