diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-02 17:01:02 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-02 17:01:02 +0100 |
commit | e27c720a2a14be615ff78f9f62dd2d6abbabc249 (patch) | |
tree | 8f3b10e364c807fb72a0f5ffdecce22ff89d86cf /config | |
parent | 5ed2465c1af700bd32242d0f1f04a1968ee65039 (diff) | |
parent | 98ae016ab207a7f4e27d151584156af6011d48d5 (diff) | |
download | gitlab-ce-e27c720a2a14be615ff78f9f62dd2d6abbabc249.tar.gz |
Merge remote-tracking branch 'origin/master' into balsalmiq-support
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/admin.rb | 6 | ||||
-rw-r--r-- | config/routes/project.rb | 4 | ||||
-rw-r--r-- | config/routes/snippets.rb | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 52ba10604d4..48993420ed9 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -50,8 +50,10 @@ namespace :admin do resources :deploy_keys, only: [:index, :new, :create, :destroy] - resources :hooks, only: [:index, :create, :destroy] do - get :test + resources :hooks, only: [:index, :create, :edit, :update, :destroy] do + member do + get :test + end end resources :broadcast_messages, only: [:index, :edit, :create, :update, :destroy] do diff --git a/config/routes/project.rb b/config/routes/project.rb index 115ae2324b3..aaad503eba4 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -44,7 +44,7 @@ constraints(ProjectUrlConstrainer.new) do resources :snippets, concerns: :awardable, constraints: { id: /\d+/ } do member do - get 'raw' + get :raw post :mark_as_spam end end @@ -185,7 +185,7 @@ constraints(ProjectUrlConstrainer.new) do end end - resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do + resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do member do get :test end diff --git a/config/routes/snippets.rb b/config/routes/snippets.rb index 56534f677be..dae83734fe6 100644 --- a/config/routes/snippets.rb +++ b/config/routes/snippets.rb @@ -1,10 +1,17 @@ resources :snippets, concerns: :awardable do member do - get 'raw' - get 'download' + get :raw post :mark_as_spam post :preview_markdown end + + scope module: :snippets do + resources :notes, only: [:index, :create, :destroy, :update], concerns: :awardable, constraints: { id: /\d+/ } do + member do + delete :delete_attachment + end + end + end end get '/s/:username', to: redirect('/u/%{username}/snippets'), |