Plugins » Katello

Adapting new dynflow work to content views UI

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...

Content Views: handle composite content views.

Allow creation and update of composite content views.

Merge pull request #3774 from jlsherrill/cv-history

adding content view history ui

Merge remote-tracking branch 'origin/cv-rework' into cv-rework-dynflow-publish

Conflicts:
app/controllers/katello/api/v2/content_views_controller.rb
engines/bastion/app/assets/javascripts/bastion/content-views/details/content-view-publish.controller.js

adding content view history ui

Content Views Rework: prepend content_view on filter models, update routes

This commit addresses the following:

1. Rename the filter models/schema, prepending 'content_view_' to each.
This change is to be consistent with other models
(e.g. content_view_environments) as well as to ensure that there is...

Merge pull request #3754 from jlsherrill/cv-ui

Hooking up publish and promote properly

Hooking up publish and promote properly

• Versions tab now hits api for versions
• version columns have been reduced
• Promote now works (no polling)

Merge pull request #3762 from daviddavis/temp/20140228120326

Content Views: Adding composite info to content view version show