diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-09-06 14:35:58 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-09-06 14:35:58 +1000 |
| commit | b9aa55e1ea2ba226bd9bf4c6fb08fdec30e046c5 (patch) | |
| tree | b7770180f178086c78ef2ca25d6bb2267f739110 /config/routes | |
| parent | 74740604211dab6632771f1bfd7dd67902fea7ef (diff) | |
| parent | d68ff7f50a93ebbff537b5e795cf6bf80bd66a6e (diff) | |
| download | gitlab-ce-b9aa55e1ea2ba226bd9bf4c6fb08fdec30e046c5.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_backport
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/project.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 3c7c218c356..b36d13888cd 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -303,11 +303,13 @@ constraints(ProjectUrlConstrainer.new) do member do post :toggle_subscription post :mark_as_spam + post :move get :referenced_merge_requests get :related_branches get :can_create_branch get :realtime_changes post :create_merge_request + get :discussions, format: :json end collection do post :bulk_update |