Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobs

* master: (275 commits)
  Decrease Metrics/PerceivedComplexity threshold to 17
  Upgrade mail and nokogiri gems due to security issues
  Link out to stackoverflow answer on setting swappiness
  Document swappiness recomendations in the requirements doc
  Fix invalid attribute used for time-ago-tooltip component
  Update latest artifacts doc
  Add changelog entry for flipping verify_certificates
  Default LDAP config verify_certificates to true
  Update share project with groups docs
  remove accidental console.log from karma tests
  update specs to match reorganized monitoring components
  Remove tooltips from new sidebar
  Use `git update-ref --stdin -z` to delete refs
  Don't use public_send in destroy_conditionally! helper
  Remove unused expressions policy from ci/cd config
  Simplify code for appending strategies in CI/CD config
  Raise exception when simplifiable ci entry incomplete
  Add changelog entry
  Fix MySQL failure for emoji autocomplete
  max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably)
  ...

Conflicts:
	lib/gitlab/ci/config/entry/policy.rb

1 files changed, 0 insertions, 20 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/policy_spec.rb b/spec/lib/gitlab/ci/config/entry/policy_spec.rb
index a7dae11cee7..ab69a2e8bcc 100644
--- a/spec/lib/gitlab/ci/config/entry/policy_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/policy_spec.rb
@@ -56,26 +56,6 @@ describe Gitlab::Ci::Config::Entry::Policy do
     end
   end
 
-  context 'when using complex policy' do
-    context 'when it is an empty hash' do
-      let(:config) { {} }
-
-      it 'reports an error about configuration not being present' do
-        expect(entry.errors).to include /can't be blank/
-      end
-    end
-
-    context 'when it contains unknown keys' do
-      let(:config) { { refs: ['something'], invalid: 'master' } }
-
-      it 'is not valid entry' do
-        expect(entry).not_to be_valid
-        expect(entry.errors)
-          .to include /policy config contains unknown keys: invalid/
-      end
-    end
-  end
-
   context 'when policy strategy does not match' do
     let(:config) { 'string strategy' }