Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added ActionController::Instrumentation in TokensController #293

Merged
merged 2 commits into from
Oct 6, 2013
Merged

added ActionController::Instrumentation in TokensController #293

merged 2 commits into from
Oct 6, 2013

Conversation

arr-dev
Copy link
Contributor

@arr-dev arr-dev commented Oct 5, 2013

No description provided.

@@ -1,6 +1,8 @@
module Doorkeeper
class TokensController < ActionController::Metal
include Helpers::Controller
include ActionController::RackDelegation
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is RackDelegation for? I would have thought ::Instrumentation would manage its dependencies. maybe using it for something else?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought so too, but it didn't work without it.

I had trouble finding what was the problem, so I've added all modules from ActionController::Base and removed one by one, until I found the missing one.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alright, sounds fair.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to http://api.rubyonrails.org/classes/ActionController/Instrumentation.html it's an "Included Module" from Instrumentation, didn't check further. Thank you both for your help!

tute added a commit that referenced this pull request Oct 6, 2013
…tion

added ActionController::Instrumentation in TokensController
@tute tute merged commit 65dbd65 into doorkeeper-gem:master Oct 6, 2013
@arr-dev arr-dev deleted the tokens_controller_instrumentation branch October 7, 2013 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants