Plugins » Katello

Merge branch 'master' into master-to-cv

Conflicts:
spec/controllers/content_view_definitions_controller_spec.rb
spec/controllers/filter_rules_controller_spec.rb
spec/controllers/filters_controller_spec.rb
test/controllers/api/v1/content_view_definitions_controller_test.rb
test/controllers/api/v1/content_views_controller_test.rb
test/controllers/api/v1/filter_rules_controller_test.rb
test/controllers/api/v1/filters_controller_test.rb
test/controllers/content_views_controller_test.rb
test/controllers/filter_rules_controller_test.rb
test/controllers/filters_controller_test.rb
test/fixtures/models/katello_content_view_definition_bases.yml
test/fixtures/models/katello_content_views.yml
test/models/authorization/content_view_definition_authorization_test.rb
test/models/content_view_version_test.rb
test/models/repository_test.rb