diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:08:01 +0300 |
| commit | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (patch) | |
| tree | 55f2a32e5fd3d67597fc8c6cc2a01793ee15c87a /spec/views | |
| parent | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/admin/application_settings/integrations.html.haml_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/views/admin/application_settings/integrations.html.haml_spec.rb b/spec/views/admin/application_settings/integrations.html.haml_spec.rb index e51cbb9fbfe..392d43ef2d4 100644 --- a/spec/views/admin/application_settings/integrations.html.haml_spec.rb +++ b/spec/views/admin/application_settings/integrations.html.haml_spec.rb @@ -11,7 +11,6 @@ describe 'admin/application_settings/integrations.html.haml' do before do assign(:application_setting, app_settings) allow(Gitlab::Sourcegraph).to receive(:feature_available?).and_return(sourcegraph_flag) - allow(License).to receive(:feature_available?).with(:elastic_search).and_return(false) if defined?(License) end context 'when sourcegraph feature is enabled' do |