Merge branch 'develop'

Author: toastercup

app/api/helpers/auth_helper.rb

@@ -32,8 +32,7 @@ def authenticate!
 
       def authorize!(action, subject)
         unless abilities.allowed?(current_user, action, subject)
-          # TODO: Un-comment on May 12, date of OAuth Scope Enforcement rollout
-          # forbidden!
+          forbidden!
         end
       end
 
@@ -42,7 +41,8 @@ def require_scope!(scopes)
         scopes = [scopes] unless scopes.kind_of? Array
 
         unless (find_access_token.scopes.to_a & scopes) == scopes
-          forbidden!
+          # TODO: Un-comment on May 12, date of OAuth Scope Enforcement rollout
+          # forbidden!
         end
       end