diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-11 16:51:26 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-11 16:51:26 +0200 |
| commit | cd99255698354f3b5ec1c0d5d9bc1b4fb9bffdf3 (patch) | |
| tree | 0486b73191a98645e0620fefe8743f4a0c44bef5 /app/controllers/api | |
| parent | 65f625cf237feb55a21495606d5e2c258bbe50cc (diff) | |
| parent | bda0f7ac7353a63b42ca99b2e7d4e80a3b03b850 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 0b3735087..90f42251e 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -53,10 +53,6 @@ class Api::BaseController < ApplicationController [params[:limit].to_i.abs, default_limit * 2].min end - def truthy_param?(key) - ActiveModel::Type::Boolean.new.cast(params[key]) - end - def current_resource_owner @current_user ||= User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token end |