Merge branch 'issue_12758' into 'master'

Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389

1 files changed, 8 insertions, 2 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 87da5e7178f..54f15e1ff17 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -123,10 +123,18 @@ Rails.application.routes.draw do
     end
   end
 
+  #
   # Spam reports
+  #
   resources :abuse_reports, only: [:new, :create]
 
   #
+  # Notification settings
+  #
+  resources :notification_settings, only: [:create, :update]
+
+
+  #
   # Import
   #
   namespace :import do
@@ -432,7 +440,6 @@ Rails.application.routes.draw do
 
       resource :avatar, only: [:destroy]
       resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
-      resource :notification_setting, only: [:update]
     end
   end
 
@@ -668,7 +675,6 @@ Rails.application.routes.draw do
 
         resources :forks, only: [:index, :new, :create]
         resource :import, only: [:new, :create, :show]
-        resource :notification_setting, only: [:update]
 
         resources :refs, only: [] do
           collection do