summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-users-api-500-error' into 'master' Rémy Coutable2017-01-061-7/+4
|\
| * Fix the failing spec in POST /users APIfix-users-api-500-errorRémy Coutable2017-01-051-7/+4
* | LDAP attributes needs default valuesDrew Blessing2017-01-063-7/+15
* | Merge branch '19966-api-call-to-move-project-to-different-group-fails-when-us...Rémy Coutable2017-01-051-3/+3
|\ \
| * | Fix groups API to accept path when transferring a projectMark Fletcher2017-01-031-3/+3
* | | Merge branch '26261-post-api-v3-projects-idorproject-commits-commits-does-not...Rémy Coutable2017-01-051-1/+0
|\ \ \
| * | | Fix Commits API to accept a Project path upon POSTMark Fletcher2017-01-031-1/+0
| |/ /
* | | Merge branch 'rs-absorb-gitlab_git' into 'master' Douwe Maan2017-01-0518-0/+2950
|\ \ \
| * | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_gitRobert Speicher2017-01-045-25/+25
| * | | Absorb gitlab_gitRobert Speicher2017-01-0418-0/+2950
| | |/ | |/|
* | | Merge branch 'zj-404-slack-error' into 'master' Kamil Trzciński2017-01-051-0/+7
|\ \ \ | |/ / |/| |
| * | Add API route slack slash commandszj-404-slack-errorZ.J. van de Weg2017-01-031-0/+7
* | | Merge branch 'api-refactor-issues-filter' into 'master' Sean McGivern2017-01-041-21/+8
|\ \ \
| * | | Add missing milestone parameterRobert Schilling2017-01-041-0/+1
| * | | Refactor issues filter in APIRobert Schilling2017-01-041-21/+7
* | | | Merge branch 'fix-api-project-hooks-params' into 'master' Sean McGivern2017-01-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix project hooks paramsfix-api-project-hooks-paramsRobert Schilling2017-01-031-1/+1
| |/ /
* | | Merge branch 'ldap_person_attributes' into 'master' include-uncovered-jasmineRobert Speicher2017-01-031-2/+17
|\ \ \ | |/ / |/| |
| * | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-031-2/+17
* | | Merge branch 'zj-revert-polymorphic-url' into 'master' Kamil Trzciński2017-01-031-3/+3
|\ \ \ | |/ / |/| |
| * | Revert specific URLzj-revert-polymorphic-urlZ.J. van de Weg2016-12-271-3/+3
* | | Merge branch 'fix/cross-project-ref-path' into 'master' Sean McGivern2017-01-031-1/+1
|\ \ \
| * | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-1/+1
| | |/ | |/|
* | | API: extern_uid is a stringapi-fix-extern-uid-validationRobert Schilling2017-01-031-1/+1
|/ /
* | Merge branch 'grapify-settings-api' into 'master' Sean McGivern2016-12-291-12/+106
|\ \
| * | Grapify the settings APIgrapify-settings-apiRobert Schilling2016-12-291-12/+106
* | | Merge branch 'clean-api-params' into 'master' Sean McGivern2016-12-281-2/+0
|\ \ \
| * | | Parameter already enforced via grapeclean-api-paramsRobert Schilling2016-12-281-2/+0
| |/ /
* | | Merge branch 'fix-api-deprecation' into 'master' Robert Schilling2016-12-281-1/+1
|\ \ \ | |/ / |/| |
| * | Fix a Grape deprecation, use `#request_method` instead of `#route_method`fix-api-deprecationRémy Coutable2016-12-231-1/+1
* | | Merge branch 'issues/8081' into 'master' Annabel Dunstone Gray2016-12-271-1/+1
|\ \ \
| * | | rename theme to match actual colorsBM5k2016-12-061-1/+1
* | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-276-81/+107
|\ \ \ \
| * | | | Rubocop prefers to indent this wayfeature/1376-allow-write-access-deploy-keysLin Jen-Shin2016-12-201-2/+2
| * | | | Use consistent names and move checks to the method,Lin Jen-Shin2016-12-201-39/+43
| * | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-2098-646/+2756
| |\ \ \ \
| * \ \ \ \ Merge CSSFilipa Lacerda2016-12-1234-233/+711
| |\ \ \ \ \
| * | | | | | Check project existence for push too, andLin Jen-Shin2016-12-101-16/+6
| * | | | | | Don't pass the actor for deploy key, feedback:Lin Jen-Shin2016-12-101-0/+2
| * | | | | | Prefer guest_can_download_code? and fix typoLin Jen-Shin2016-12-062-3/+3
| * | | | | | Prefer guest_can_downlod_code?Lin Jen-Shin2016-12-061-1/+1
| * | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0667-918/+982
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-2254-490/+1676
| |\ \ \ \ \ \ \
| * | | | | | | | Check download privilege more specifically andLin Jen-Shin2016-11-181-29/+29
| * | | | | | | | Still grant :download_code if guest could do thatLin Jen-Shin2016-11-181-5/+3
| * | | | | | | | Check if the key could really download, feedback:Lin Jen-Shin2016-11-181-1/+1
| * | | | | | | | We never check user privilege if it's a deploy keyLin Jen-Shin2016-11-182-12/+28
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-1766-565/+631
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Introduce no_user_or_blocked? and fix tests due toLin Jen-Shin2016-11-161-4/+12
| * | | | | | | | | Introduce has_access_to? so that we could reuse itLin Jen-Shin2016-11-162-3/+2