Plugins » Katello

initial cv publishing work

merging master

Merge remote-tracking branch 'origin/master' into dynflow

Merge pull request #3715 from daviddavis/cv-composites

Content Views: Create and edit composite content views

Content Views: Adding in composite content views

Merge branch 'master' into merge-to-cv-rework

Conflicts:
app/models/katello/glue/elastic_search/package_group.rb
config/routes/api/v2.rb

removing provider repo discovery model additions

this was causing errors with manifest import due to serialization
of discovered repos

Merge remote-tracking branch 'origin/master' into dynflow

fixing down migration

Merge pull request #3691 from bbuckingham/cv-rework-filters

Content Views Rework: Filters: change parameters hash to be separate rules models/schema.