diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-02-06 13:28:13 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-02-06 13:28:13 -0600 |
| commit | 47f2754a14549ccd18e4be8b3b6604b378450d6d (patch) | |
| tree | f2235166a76bcf9e7761e1b613e63110961869da /spec/features/issues/spam_issues_spec.rb | |
| parent | e71a27f082c49a8e132be632cb8fe97f810af987 (diff) | |
| parent | e776096e84d01ab3d1d07a028b65e7430e195114 (diff) | |
| download | gitlab-ce-47f2754a14549ccd18e4be8b3b6604b378450d6d.tar.gz | |
Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480
* master: (242 commits)
Validate user namespace before saving so that errors persist on model
Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb
Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd
Downgrade google-protobuf
Close low level rugged repository in project cache worker
File upload UI obeys LFS filters
Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page"
Upgrade GitLab Workhorse to v3.6.0
Add sorting options for /users API (admin only)
improvements from feedback
[ci-skip] add changelog
remove file after `Upload#destroy`
Fix a hardcoded pipeline ID in a spinach step
Override group sidebar links
Replace "cluster" with "Kubernetes cluster"
Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently
Fix tests for Drop filename enforcement
Revert using expand_fixture_path in factory
Revert "Add FixtureHelpers for FactoryGirl"
Refactor :trace to :trace_live in spec
...
Diffstat (limited to 'spec/features/issues/spam_issues_spec.rb')
| -rw-r--r-- | spec/features/issues/spam_issues_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/issues/spam_issues_spec.rb b/spec/features/issues/spam_issues_spec.rb index c7cfd01f588..a75ca1d42b3 100644 --- a/spec/features/issues/spam_issues_spec.rb +++ b/spec/features/issues/spam_issues_spec.rb @@ -9,7 +9,7 @@ describe 'New issue', :js do before do stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') - current_application_settings.update!( + Gitlab::CurrentSettings.update!( akismet_enabled: true, akismet_api_key: 'testkey', recaptcha_enabled: true, |