diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-03 13:52:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-03 13:52:40 +0300 |
| commit | 596bf4c2a59434c35eabd2336e249ebc3eb03f56 (patch) | |
| tree | ab440378cc41e7581f3c5b57a9034f369bfc6c2b /lib/api/notes.rb | |
| parent | 00ccaed029efbbdff96a4b64628a3a2d9bf5125d (diff) | |
| parent | c0323b40ee5633f2808f52f98bde0509a2f3ee59 (diff) | |
| download | gitlab-ce-596bf4c2a59434c35eabd2336e249ebc3eb03f56.tar.gz | |
Merge branch 'feaure-ldap-oauth-tests'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/lib/gitlab/oauth/user_spec.rb
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions