diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-04 14:38:18 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-04 14:38:18 +0200 |
| commit | b2954efd8797ba5cd487af3f272b69fb614c88c0 (patch) | |
| tree | 700660b10fd41effac47f1701a41bf37ed5f892e /config | |
| parent | 51d5656f936267c0537e8ffa13c2456dc42fbe7e (diff) | |
| parent | 46614d7539e46bc65d04cb2826c126f048cd4e6e (diff) | |
| download | gitlab-ce-b2954efd8797ba5cd487af3f272b69fb614c88c0.tar.gz | |
Merge remote-tracking branch 'origin/master' into ce-to-ee-2018-10-04
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/group.rb | 1 | ||||
| -rw-r--r-- | config/routes/project.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 3c2a0fe03a2..87c6afaf84c 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -102,6 +102,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do get 'members' get 'labels' get 'epics' + get 'commands' end end diff --git a/config/routes/project.rb b/config/routes/project.rb index 4e91b441843..fd12bb86946 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -351,6 +351,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do namespace :ci do resource :lint, only: [:show, :create] end + + ## EE-specific + resources :feature_flags + ## EE-specific end draw :legacy_builds |