diff options
author | Sean McGivern <sean@gitlab.com> | 2016-08-17 16:55:28 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2016-08-17 16:55:28 +0100 |
commit | e6f3461c0bb1cc5bb5501f1e451fff97268d87d6 (patch) | |
tree | e8bc4946c3b3354aac11814a7e12408eec1fd52d /config | |
parent | 2257fda38e37f5aa59a9ef83c6c6cff36bbcb182 (diff) | |
parent | fa576d38bb23e0f2804e3feba959e0c6191dbbb0 (diff) | |
download | gitlab-ce-e6f3461c0bb1cc5bb5501f1e451fff97268d87d6.tar.gz |
Merge remote-tracking branch 'origin/master' into mc-ui
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 46a05d9a1a9..343c1b614ed 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -252,7 +252,11 @@ Rails.application.routes.draw do resource :impersonation, only: :destroy resources :abuse_reports, only: [:index, :destroy] - resources :spam_logs, only: [:index, :destroy] + resources :spam_logs, only: [:index, :destroy] do + member do + post :mark_as_ham + end + end resources :applications @@ -524,6 +528,11 @@ Rails.application.routes.draw do put '/update/*id', to: 'blob#update', constraints: { id: /.+/ }, as: 'update_blob' post '/preview/*id', to: 'blob#preview', constraints: { id: /.+/ }, as: 'preview_blob' + # + # Templates + # + get '/templates/:template_type/:key' => 'templates#show', as: :template + scope do get( '/blob/*id/diff', @@ -815,6 +824,7 @@ Rails.application.routes.draw do member do post :toggle_subscription post :toggle_award_emoji + post :mark_as_spam get :referenced_merge_requests get :related_branches get :can_create_branch |