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

Better check for Rails application #216

Merged
merged 2 commits into from
Jun 17, 2016
Merged

Better check for Rails application #216

merged 2 commits into from
Jun 17, 2016

Conversation

PavelPenkov
Copy link
Contributor

Don't trigger loading of railtie when there's only Rails constant present. Previous version of the code tried to load it when there only was stuff like rails-observers of rails-html-sanitizer (which is a part of ActionMailer)

@rails-bot
Copy link

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @rafaelfranca (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@@ -42,5 +42,5 @@ module ActiveResource
autoload :Collection
end

require 'active_resource/railtie' if defined? Rails
require 'active_resource/railtie' if defined?(Rails) && defined?(Rails.application)
Copy link
Member

Choose a reason for hiding this comment

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

only defined?(Rails.application) is fine.

@rafaelfranca rafaelfranca merged commit 6d99ea3 into rails:master Jun 17, 2016
rafaelfranca added a commit that referenced this pull request Jun 17, 2016
wkrsz added a commit to dropstream/wicked_pdf that referenced this pull request Jan 26, 2017
Gems like rails-html-sanitizer open Rails namespace without
requiring Rails. Instead check if Rails.env is defined.

Similar to: rails/activeresource#216
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.

3 participants