diff options
| author | Simon Knox <simon@gitlab.com> | 2018-03-15 21:30:00 +0000 |
|---|---|---|
| committer | Simon Knox <simon@gitlab.com> | 2018-03-15 21:30:00 +0000 |
| commit | 8278b8d91ec9b183a8cf9e1afc233803c19449b5 (patch) | |
| tree | ddd57e6c1c93ac62f5b35ed6d4f87e1be8506268 /spec/features/admin/admin_users_spec.rb | |
| parent | 345443bc4a4e61db48b098addc6d02a234a260ae (diff) | |
| parent | 618b6dd45101cf7f8f6e143259d2b1f25e7c14c2 (diff) | |
| download | gitlab-ce-42880-loss-of-input-text-on-comments-after-preview.tar.gz | |
Merge branch 'master' into '42880-loss-of-input-text-on-comments-after-preview'42880-loss-of-input-text-on-comments-after-preview
# Conflicts:
# app/assets/javascripts/lib/utils/text_markdown.js
Diffstat (limited to 'spec/features/admin/admin_users_spec.rb')
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 2 |
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 |