Plugins » Katello

Adapting new dynflow work to content views UI

fixing errors from merge from cv-rework

Merge remote-tracking branch 'upstream/cv-rework' into cv-rework-dynflow

Conflicts:
app/lib/actions/katello/system/create.rb
app/lib/actions/katello/user/create.rb
app/models/katello/content_view.rb
app/models/katello/glue/pulp/repo.rb
app/models/katello/repository.rb...

Merge remote-tracking branch 'origin/master' into cv-rework

Conflicts:
app/lib/actions/katello/environment/library_create.rb
app/models/katello/content_view_definition.rb
app/models/katello/content_view_version.rb
test/actions/headpin/library_create_test.rb

Merge pull request #3808 from iNecas/foreman-update-action

Fixes #4644: Create Foreman environment for all content views

Merge pull request #3788 from ehelms/fixes-4594

Fixes #4594: Updates the references to the consumer cert RPM.

Merge pull request #3799 from ehelms/fix-content-search

Content Views: Adding back auto complete for content views and fixing missing icons by switching to the FontAwesome equivalents.

Content Views: Adding back auto complete for content views
and fixing missing icons by switching to the FontAwesome equivalents.

Fix typo

Fixes #4646: hostgroup-akeys: fix regressions with activation keys on hostgroups page

This commit fixes a few small regressions with the activation keys
on the host groups page.

1. update so that activation keys pane will be correctly included
within the host group page...