diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 18:41:25 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 18:41:25 +0000 |
| commit | b89fd7dd5b7e035e2576c0b18ee2670bf57433c2 (patch) | |
| tree | 72ba4231e28f1c5e5405db21e0611a55e6428145 /spec/requests/api/projects_spec.rb | |
| parent | 8fa2932dc5cc7687e7d85ae7b00c07fd9bcc24a4 (diff) | |
| parent | eaada9d7066a20b5af815f723e09cde60a5c8c10 (diff) | |
| download | gitlab-ce-b89fd7dd5b7e035e2576c0b18ee2670bf57433c2.tar.gz | |
Merge branch '37698-current-settings' into 'master'
use Gitlab::UserSettings directly as a singleton instead of including/extending it
Closes #37698
See merge request gitlab-org/gitlab-ce!16843
Diffstat (limited to 'spec/requests/api/projects_spec.rb')
| -rw-r--r-- | spec/requests/api/projects_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 97e7ffcd38e..f11cd638d96 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -2,8 +2,6 @@ require 'spec_helper' describe API::Projects do - include Gitlab::CurrentSettings - let(:user) { create(:user) } let(:user2) { create(:user) } let(:user3) { create(:user) } |