diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-12-18 12:59:09 +0000 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-12-18 12:59:09 +0000 |
| commit | a9d9895dc7b4c024471f49a61166a6bb402eab9e (patch) | |
| tree | a36edcc9449123a9fd4112dc18c5c18216ae07a1 /config/routes | |
| parent | b23f32a735459f1c76ac8232f9de06942b1d2f8a (diff) | |
| parent | 546fa165ff728bc2d25ed9b55b95dd1d48139d4a (diff) | |
| download | gitlab-ce-a9d9895dc7b4c024471f49a61166a6bb402eab9e.tar.gz | |
Merge branch 'master' into 'zj-mattermost-slash-config'
# Conflicts:
# config/gitlab.yml.example
# lib/mattermost/session.rb
# spec/lib/mattermost/session_spec.rb
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/project.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 3eddd3c2a0e..23d85368f1b 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -11,6 +11,18 @@ constraints(ProjectUrlConstrainer.new) do module: :projects, as: :project) do + resources :autocomplete_sources, only: [] do + collection do + get 'emojis' + get 'members' + get 'issues' + get 'merge_requests' + get 'labels' + get 'milestones' + get 'commands' + end + end + # # Templates # @@ -322,7 +334,6 @@ constraints(ProjectUrlConstrainer.new) do post :remove_export post :generate_new_export get :download_export - get :autocomplete_sources get :activity get :refs put :new_issue_address |