diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-26 15:10:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-26 15:10:41 +0300 |
| commit | 04f9cef437b65b4a62624936a37a99cfbfb4d61c (patch) | |
| tree | 9edb887220b45ecd69f2aefa22a0fea09ed03ee1 /config | |
| parent | 47d07def1648ffc0787fe92ea5e351ccc5e9c4a4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml | 1 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml index 8e1129883ae..e9a534911bb 100644 --- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml +++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml @@ -14,4 +14,3 @@ distribution: - ee tier: - free -skip_validation: true diff --git a/config/routes/project.rb b/config/routes/project.rb index 935e816f73c..4213febc1fc 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -403,7 +403,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :feature_flags_client, only: [] do post :reset_token end - resources :feature_flags_user_lists, param: :iid, only: [:new, :edit, :show] + resources :feature_flags_user_lists, param: :iid, only: [:index, :new, :edit, :show] get '/schema/:branch/*filename', to: 'web_ide_schemas#show', |