katellohammer-cli-katellohammer-cli-samkatello-agentkatello-certs-toolskatello-host-toolskatello-installerkatello-packagingkatello-selinuxkatello-websitepuppet-candlepinpuppet-capsulepuppet-certspuppet-commonpuppet-foreman_proxy_contentpuppet-katellopuppet-katello_develpuppet-pulppuppet-qpidpuppet-service_waitsmart_proxy_container_gatewaysmart_proxy_pulp
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 #3788 from ehelms/fixes-4594
Fixes #4594: Updates the references to the consumer cert RPM.
Merge branch 'master' into cv-rework
Conflicts: app/models/katello/content_view.rb app/models/katello/content_view_definition.rb app/models/katello/content_view_version.rb app/models/katello/kt_environment.rb app/views/katello/content_view_definitions/_publish.html.haml...
Fixes #4634: Set karma-coffee-preprocessor version to prevent newerversion which requires Karma 0.12.0.
CV-rework: fix spacing on bastion content view routes.
View revisions
Also available in: Atom