Fix #3985 - foreman hardhat under inner top bar. #3596
Merged
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
This fix removes jQuery from the bastion productionincludes, instead relying on Foreman to include jQuery. We still include jQuery for javascript testing.
| @@ -12,7 +12,7 @@ module.exports = function(config) { | |||
| 'app/assets/javascripts/bastion/**/*.html': ['ng-html2js'] | |||
| }, | |||
| files: [ | |||
| 'vendor/assets/javascripts/bastion/jquery/jquery.js', | |||
| '.tmp/bower_components/jquery/jquery.js', | |||
There was a problem hiding this comment.
Yeah, that's where we store our dev-only stuff so it's ignored by github. Look further down in that file and you'll see the same thing with another file.
|
Do you not also need to fix this for the old Katello pages in |
|
@ehelms: this only happens on nutupane pages. Perhaps rails is smart enough to not include it twice? Perhaps it's because of the double engine structure? Not sure, but jquery is only included once on old katello pages. |
|
ACK |
waldenraines
pushed a commit
that referenced
this pull request
Jan 22, 2014
Fix #3985 - foreman hardhat under inner top bar.
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.
This fix removes jQuery from the bastion productionincludes, instead
relying on Foreman to include jQuery. We still include jQuery for
javascript testing.