diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-04 11:21:40 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-04 11:21:40 +0100 |
commit | d34f6764146add6a9fc928f3a87b902c02b43742 (patch) | |
tree | e133d45819379bedefd3411a246c218e18d05027 /config | |
parent | 77bbc1c4af087d009fdfa3d7d4c9a720b7cc9c5b (diff) | |
parent | ef71bf6278759aafb1a480916cfafb9c9650eddc (diff) | |
download | gitlab-ce-d34f6764146add6a9fc928f3a87b902c02b43742.tar.gz |
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/group.rb | 8 | ||||
-rw-r--r-- | config/routes/project.rb | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 73f69d76995..7b29e0e807c 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -10,7 +10,13 @@ scope(path: 'groups/*group_id', end resource :avatar, only: [:destroy] - resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create] + resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create] do + member do + get :merge_requests + get :participants + get :labels + end + end resources :labels, except: [:show] do post :toggle_subscription, on: :member diff --git a/config/routes/project.rb b/config/routes/project.rb index 894faeb6188..956afe4faa3 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -207,6 +207,9 @@ constraints(ProjectUrlConstrainer.new) do member do put :sort_issues put :sort_merge_requests + get :merge_requests + get :participants + get :labels end end @@ -231,6 +234,7 @@ constraints(ProjectUrlConstrainer.new) do get :related_branches get :can_create_branch get :rendered_title + post :create_merge_request end collection do post :bulk_update |