OSDN Git Service

(root) / wvm / gitlab.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5d9f1c cb2be3c)
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into glipta...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 5 Mar 2013 14:48:18 +0000 (16:48 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 5 Mar 2013 14:48:18 +0000 (16:48 +0200)
commitda6b53a80eea25371a976389f70ed5c78ce4c797
treedd05c0e9ec41b4906dd2a401cbc2be0955ae5b41tree | snapshot
parentd5d9f1c5155fc5c5f8115cb54574a7a7e5349781commit | diff
parentcb2be3ce0ab27ac9aa25f0c3eb59047ad5a0153acommit | diff
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
app/observers/user_observer.rb diff1 | diff2 | blob | history
spec/observers/user_observer_spec.rb diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help