diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 00:08:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 00:08:18 +0300 |
| commit | 692f4b734f1976b690dccb5458c198b5205c51b5 (patch) | |
| tree | c6af56b7127850615b9dc5626cefbe665fd96ea9 /config | |
| parent | 592223823c8ebf6e32d98e4b12620ba8ff043cca (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/dependency_decisions.yml | 6 | ||||
| -rw-r--r-- | config/routes/project.rb | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index 9256b902634..2f0d9066a7a 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -313,3 +313,9 @@ :why: "https://github.com/cure53/DOMPurify/blob/main/LICENSE and https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31928#note_346604841" :versions: [] :when: 2020-08-13 13:42:46.508082000 Z +- - :whitelist + - Apache-2.0 WITH LLVM-exception + - :who: Nathan Friend + :why: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40670#note_403946372 + :versions: [] + :when: 2020-08-28 15:01:59.329048917 Z diff --git a/config/routes/project.rb b/config/routes/project.rb index 8c9b1f7f5cd..4ba1f14222e 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -367,6 +367,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do post :mark_as_spam end end + + resources :feature_flags, param: :iid do + resources :feature_flag_issues, only: [:index, :create, :destroy], as: 'issues', path: 'issues' + end + resource :feature_flags_client, only: [] do + post :reset_token + end + resources :feature_flags_user_lists, param: :iid, only: [:new, :edit, :show] end # End of the /-/ scope. |