Plugins » Katello

Merge branch 'master' into cv-rework

Conflicts:
app/assets/javascripts/katello/content_view_definitions/content_view_definition.js
app/views/katello/content_view_definitions/_publish.html.haml
engines/fort/app/models/node.rb
engines/fort/lib/fort/actions/content_view_refresh.rb
engines/fort/lib/fort/actions/node_metadata_generate.rb
lib/katello/tasks/test.rake
spec/controllers/api/v1/content_view_definitions_controller_spec.rb
spec/controllers/api/v1/content_views_controller_spec.rb
spec/controllers/content_view_definitions_controller_spec.rb
spec/controllers/system_groups_controller_spec.rb
spec/models/changeset_spec.rb
test/controllers/api/v1/content_view_definitions_controller_test.rb
test/controllers/systems_controller_test.rb
test/factories/changeset_factory.rb
test/factories/content_view_definition_factory.rb
test/factories/filter_factory.rb
test/factories/filter_rule_factory.rb
test/models/authorization/content_view_definition_authorization_test.rb
test/models/changeset_test.rb
test/models/content_view_definition_test.rb
test/models/content_view_test.rb
test/models/content_view_version_test.rb
test/models/erratum_rule_test.rb
test/models/filter_test.rb
test/models/package_group_filter_rule_test.rb
test/models/package_rule_test.rb