diff options
author | Robert Speicher <robert@gitlab.com> | 2016-01-14 18:39:49 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-01-14 18:39:49 +0000 |
commit | 65eae647a6adb293dd761541d7fa5910a821e842 (patch) | |
tree | 386341bb99fd5c6aa66d6ac38752a6f954a192cd /lib/api/api.rb | |
parent | 14695798fb7cc3e51c19d96df4a4dc5b14c2c6cf (diff) | |
parent | 255445c363cf06ceb5dd796dd856ac030b6eaa64 (diff) | |
download | gitlab-ce-65eae647a6adb293dd761541d7fa5910a821e842.tar.gz |
Merge branch 'backport-ee' into 'master'
Backport two commits from EE
Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110
See merge request !2424
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions