projects
/
rails.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/pull/3416'
[rails.git]
/
app
/
controllers
/
api
/
user_preferences_controller.rb
diff --git
a/app/controllers/api/user_preferences_controller.rb
b/app/controllers/api/user_preferences_controller.rb
index 40ccfccbbc4a222a841c67f312d6665a13998a10..02a23095addd70ef9a72dde3d84cad35a257b308 100644
(file)
--- a/
app/controllers/api/user_preferences_controller.rb
+++ b/
app/controllers/api/user_preferences_controller.rb
@@
-1,4
+1,4
@@
-# Update and read user preferences, which are arbitra
yr
key/val pairs
+# Update and read user preferences, which are arbitra
ry
key/val pairs
module Api
class UserPreferencesController < ApiController
before_action :authorize