Merge remote-tracking branch 'upstream/master' into roles #4027
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 PR changes all bastion pages to be served as a single page from / instead of multiple pages served from /katello/<resource>. This will speed up load time between the pages (since we won't have to reload the entire page for each Bastion page).
Fixes Katello#5408, display errors on new sync plan form.
Fixes Katello#5198 - make bastion a true single page application.
fixes Katello#5511 - renamed create_unlimited_supscription.rb
Fixes Katello#5508, allow alch-checkbox display values to be formatted.
Issue 5037: enable ISO repo sets
Fixes Katello#5515, adding Bastion config directory to whitelist for RPMs.
…e Foreman about page. Removes the Katello about page and uses deface to add two status widgets to the Foreman about page. The two widgets are the backend status information for services such as Pulp and Candlepin and a widget that lists installed packages.
Fixes Katello#5504: Consolidates Katello about page information to the Foreman ...
fixes 5512 - fixing content view delete performance issues
Fixes Katello#5518 - Repository.enabled no longer exists
Fixing uninitialized constant AngularRailsTemplates::Engine::Tilt
Fixing uninitialized constant AngularRailsTemplates::Engine::Tilt
Conflicts: app/controllers/katello/environments_controller.rb app/controllers/katello/gpg_keys_controller.rb app/controllers/katello/sync_plans_controller.rb config/routes.rb engines/bastion/app/controllers/bastion/bastion_controller.rb
|
APJ |
|
[test] |
waldenraines
pushed a commit
that referenced
this pull request
May 1, 2014
Merge remote-tracking branch 'upstream/master' into roles
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.
Conflicts:
app/controllers/katello/environments_controller.rb
app/controllers/katello/gpg_keys_controller.rb
app/controllers/katello/sync_plans_controller.rb
config/routes.rb
engines/bastion/app/controllers/bastion/bastion_controller.rb