glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update restful_controller.rb

Browse source
This commit is contained in:
Connor Turland 2017-02-11 18:19:02 -05:00 • committed by GitHub
parent 1374da35da
commit c38afbbeb0
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/api/v2/restful_controller.rb
View file

@ -5,7 +5,6 @@ module Api
include Pundit include Pundit
include PunditExtra include PunditExtra
protect_from_forgery with: :exception
snorlax_used_rest! snorlax_used_rest!
before_action :load_resource, only: [:show, :update, :destroy] before_action :load_resource, only: [:show, :update, :destroy]
@ -46,7 +45,7 @@ module Api
end end
def current_user def current_user
token_user || doorkeeper_user || super token_user || doorkeeper_user
end end
def load_resource def load_resource