summaryrefslogtreecommitdiff
path: root/spec/features/admin/admin_users_spec.rb
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-03-06 11:32:27 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-03-06 11:32:27 +0000
commit8975bd3a66d726e6f5ff85d6c55a707d5c7dceb6 (patch)
tree04c6e567b8a533d3b814d5e383013571aaa489b6 /spec/features/admin/admin_users_spec.rb
parente4bb25f04bcbd2249da2ef55b1ce6b3df18d42fe (diff)
parentce12b60e97a9a4518dd99b990e20e55ec8da22bc (diff)
downloadgitlab-ce-8975bd3a66d726e6f5ff85d6c55a707d5c7dceb6.tar.gz
[ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-action-to-an-axios-request
* master: (163 commits) Resolve "Group Leave action is broken on Groups Dashboard and Homepage" So that it's consistent with other entries and EE Fix race condition when previewing docs Resolve "Enable privileged mode for Runner installed on Kubernetes" Change column to file_sha256. Add test. Add changelog Add checksum at runner grape api Revert logic of calculating checksum Add post migration for checksum calculation Add ObjectStorageQueue concern and test Import use_file method from EE and use it for calculation of checksum Change column type to binary from string Add checksum to ci_job_artifacts Make oauth provider login generic Don't error out in system hook if user has `nil` datetime columns Use host URL to build JIRA remote link icon CI/CD-only projects FE Resolve "SSH key add text" Changes after review Projects and groups badges API Remove default scope from todos ...
Diffstat (limited to 'spec/features/admin/admin_users_spec.rb')
-rw-r--r--spec/features/admin/admin_users_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 2307ba5985e..8f0a3611052 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -382,7 +382,7 @@ describe "Admin::Users" do
describe 'update user identities' do
before do
- allow(Gitlab::OAuth::Provider).to receive(:providers).and_return([:twitter, :twitter_updated])
+ allow(Gitlab::Auth::OAuth::Provider).to receive(:providers).and_return([:twitter, :twitter_updated])
end
it 'modifies twitter identity' do