diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-15 22:59:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-15 22:59:47 +0000 |
| commit | 7fef2f7b75e284b702f327cc073476724b51d5ac (patch) | |
| tree | 05929a1c38682ee0bb17856492ff424915f85029 /config/routes.rb | |
| parent | 12918b0b9e99449181ce6f24c9bdb5d58ae6b89a (diff) | |
| parent | 5994c11910822463faeabb7b5f11d6529036db9d (diff) | |
| download | gitlab-ce-7fef2f7b75e284b702f327cc073476724b51d5ac.tar.gz | |
Merge branch 'akismet-submittable' into 'master'
Submit to Akismet Part 1 (Issues)
Related to #5932 #5573 gitlab-com/infrastructure#14
See merge request !5538
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index cf6773917cf..1d2db91344f 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 @@ -813,6 +817,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 |