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 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 #4594: Updates the references to the consumer cert RPM.

CV-rework: fix spacing on bastion content view routes.

Merge pull request #3784 from waldenraines/btn-primary

Bastion: reduce the number of .btn-primary buttons.

Content Views: handle composite content views.

Allow creation and update of composite content views.

Bastion: reduce the number of .btn-primary buttons.