Refs #3809 - Using defaults for AndOr cop #3643
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daviddavis
changed the title
daviddavis
force-pushed
the
temp/20160712111803
branch
3 times, most recently
from
07935ed
to
83084a7
Compare
| @@ -35,7 +35,7 @@ class BaseController < ActionController::Base | |||
| rescue_from Foreman::MaintenanceException, :with => :service_unavailable | |||
|
|
|||
| def get_resource | |||
| instance_variable_get :"@#{resource_name}" or raise 'no resource loaded' | |||
| instance_variable_get(:"@#{resource_name}") || (raise 'no resource loaded') | |||
There was a problem hiding this comment.
adding the brackets to the method call, i.e. || raise('no resource loaded') is probably more typical
|
Please also rebase the PR. |
daviddavis
force-pushed
the
temp/20160712111803
branch
from
83084a7
to
d012a62
Compare
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
daviddavis
force-pushed
the
temp/20160712111803
branch
2 times, most recently
from
250ccff
to
5150775
Compare
daviddavis
force-pushed
the
temp/20160712111803
branch
from
5150775
to
b6ee4be
Compare
|
@domcleal updated. |
|
Merged as e263719, thanks @daviddavis. |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up PR to #3634