summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-06-06 16:48:35 +0000
committerDouwe Maan <douwe@gitlab.com>2016-06-06 16:48:35 +0000
commit4d4a9b7c8a62b720e573a2bec67407acc455531a (patch)
tree2a05d52a8e0c3b13adbe8dbaa8fa33f9faff2e62 /config
parentac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff)
parent8dc1fa0d8dc9106ab95a3039723e9013c4eed00c (diff)
downloadgitlab-ce-4d4a9b7c8a62b720e573a2bec67407acc455531a.tar.gz
Merge branch 'notes-are-awardables' into 'master'
Notes are awardables ## What does this MR do? Makes sure we can :thunder_cloud_rain: comments/notes. ## What are the relevant issue numbers? Follows up upon !2901, depends on !3785 Closes #3655 ## Screenshots (if relevant) TODO See merge request !4291
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 27ab79d68f5..7e735541f7f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -758,6 +758,7 @@ Rails.application.routes.draw do
resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do
member do
+ post :toggle_award_emoji
delete :delete_attachment
end
end