diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-10 16:27:26 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-10 16:27:26 +0100 |
| commit | 82d2e5c3c561f213a59c1df36c6d5c4bb2eef7d0 (patch) | |
| tree | 0e6e0efcc6dc6ff1b517c82fb3b2a86cf78e8e4f /spec/lib/gitlab/o_auth/user_spec.rb | |
| parent | 5fd280f3d3264aec3656cb61cd8728f2ca4d61ce (diff) | |
| parent | 4e5897f51ef97d7c3ff6c57f81521f552979a3da (diff) | |
| download | gitlab-ce-82d2e5c3c561f213a59c1df36c6d5c4bb2eef7d0.tar.gz | |
Merge branch 'master' into copying-file-seen-as-licence
Diffstat (limited to 'spec/lib/gitlab/o_auth/user_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/o_auth/user_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/o_auth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb index fd3ab1fb7c8..925bc442a90 100644 --- a/spec/lib/gitlab/o_auth/user_spec.rb +++ b/spec/lib/gitlab/o_auth/user_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::OAuth::User do +describe Gitlab::OAuth::User, lib: true do let(:oauth_user) { Gitlab::OAuth::User.new(auth_hash) } let(:gl_user) { oauth_user.gl_user } let(:uid) { 'my-uid' } |