diff options
author | Rémy Coutable <remy@rymai.me> | 2019-08-05 08:55:16 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-08-05 08:55:16 +0000 |
commit | f74387d2982845b0fb5219ccf3fd128d75400472 (patch) | |
tree | 3cfbc60f1a62a1d308f1d1c98ad4a969721b873b /spec/models | |
parent | e6a05e5a63b3b336179a4ed67df76ba7ad08fadb (diff) | |
parent | 260225eb5753a18e9e33ec2bb9c1bfc76d613448 (diff) | |
download | gitlab-ce-f74387d2982845b0fb5219ccf3fd128d75400472.tar.gz |
Merge branch 'georgekoltsov/55474-outbound-setting-system-hooks' into 'master'
Add outbound setting for system hooks
See merge request gitlab-org/gitlab-ce!31177
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/clusters/platforms/kubernetes_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/lfs_download_object_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb index 471769e4aab..5811016ea4d 100644 --- a/spec/models/clusters/platforms/kubernetes_spec.rb +++ b/spec/models/clusters/platforms/kubernetes_spec.rb @@ -106,7 +106,7 @@ describe Clusters::Platforms::Kubernetes do before do allow(ApplicationSetting) .to receive(:current) - .and_return(ApplicationSetting.build_from_defaults(allow_local_requests_from_hooks_and_services: true)) + .and_return(ApplicationSetting.build_from_defaults(allow_local_requests_from_web_hooks_and_services: true)) end it { expect(kubernetes.save).to be_truthy } diff --git a/spec/models/lfs_download_object_spec.rb b/spec/models/lfs_download_object_spec.rb index effd8b08124..8b53effe98f 100644 --- a/spec/models/lfs_download_object_spec.rb +++ b/spec/models/lfs_download_object_spec.rb @@ -50,7 +50,7 @@ describe LfsDownloadObject do before do allow(ApplicationSetting) .to receive(:current) - .and_return(ApplicationSetting.build_from_defaults(allow_local_requests_from_hooks_and_services: setting)) + .and_return(ApplicationSetting.build_from_defaults(allow_local_requests_from_web_hooks_and_services: setting)) end context 'are allowed' do |