diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-05 16:48:18 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-05 16:48:18 +0200 |
| commit | da6b53a80eea25371a976389f70ed5c78ce4c797 (patch) | |
| tree | dd05c0e9ec41b4906dd2a401cbc2be0955ae5b41 /lib/api/projects.rb | |
| parent | d5d9f1c5155fc5c5f8115cb54574a7a7e5349781 (diff) | |
| parent | cb2be3ce0ab27ac9aa25f0c3eb59047ad5a0153a (diff) | |
| download | gitlab-ce-da6b53a80eea25371a976389f70ed5c78ce4c797.tar.gz | |
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1
Conflicts:
app/observers/user_observer.rb
spec/observers/user_observer_spec.rb
Diffstat (limited to 'lib/api/projects.rb')
0 files changed, 0 insertions, 0 deletions