diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-02-19 15:58:05 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-02-19 15:58:05 +0300 |
| commit | 7e55a227a53feaf4c8af9585a395f189402fcbc3 (patch) | |
| tree | 732a42856686d58f5c54f9e32aa88539be38ee78 /spec/models/lfs_download_object_spec.rb | |
| parent | 61b606a803cf9c197eee3f1397562f94dd3df315 (diff) | |
Revert "Merge branch 'use_gitlab_current_settings' into 'master'"
This reverts merge request !25370
Diffstat (limited to 'spec/models/lfs_download_object_spec.rb')
| -rw-r--r-- | spec/models/lfs_download_object_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/models/lfs_download_object_spec.rb b/spec/models/lfs_download_object_spec.rb index 9e78d25ad33..88838b127d2 100644 --- a/spec/models/lfs_download_object_spec.rb +++ b/spec/models/lfs_download_object_spec.rb @@ -46,7 +46,9 @@ describe LfsDownloadObject do subject { described_class.new(oid: oid, size: size, link: 'http://192.168.1.1') } before do - stub_application_setting(allow_local_requests_from_hooks_and_services: setting) + allow(ApplicationSetting) + .to receive(:current) + .and_return(ApplicationSetting.build_from_defaults(allow_local_requests_from_hooks_and_services: setting)) end context 'are allowed' do |