diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-20 00:34:38 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-20 03:50:58 +0300 |
commit | 48e86ec6105b879dffe30408f265b478ec21b706 (patch) | |
tree | 670c23492cc24f56887ca8ae4682fb5b7fef61f4 /config | |
parent | 978f0bac8a4ea5cd695e43d35d88f767936f1399 (diff) |
Merge branch 'emoji_votes' into 'master'
Award Emoji
This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.
For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker.
See merge request !1825
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 0bc2c173453..ac81a2aac76 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -664,6 +664,10 @@ Gitlab::Application.routes.draw do member do delete :delete_attachment end + + collection do + post :award_toggle + end end resources :uploads, only: [:create] do |