Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/5543'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Jan 24, 2025
2 parents 7d2ee0a + 47a8907 commit 959bc55
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 6 additions & 0 deletions app/controllers/api_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,10 @@ def check_rate_limit(new_changes = 1)

raise OSM::APIRateLimitExceeded if new_changes > max_changes
end

def scope_enabled?(scope)
doorkeeper_token&.includes_scope?(scope)
end

helper_method :scope_enabled?
end
6 changes: 0 additions & 6 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,4 @@ def safe_referer(referer)

referer&.to_s
end

def scope_enabled?(scope)
doorkeeper_token&.includes_scope?(scope)
end

helper_method :scope_enabled?
end

0 comments on commit 959bc55

Please sign in to comment.