Plugins » Katello

Content View Rework: fix api docs for filters

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

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

Merge Actions::Headpin into Actions::Katello

It's not clear what next version of Headpin will or will not include.
Having all Katello related actions under one namespace makes the
situation much easier for now.

Merge branch 'master' into cv-rework

Merge pull request #3794 from jlsherrill/cv-rework-merge

Cv rework merge

Fixes #4615: Add missing route that allows RHSM to update consumer facts
and update API authentication check to account for authentication order.

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

Content Views Rework: fix api docs for content view puppet modules