summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-1725-433/+373
|\
| * Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-162-36/+59
| |\
| | * Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-162-36/+59
| * | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-161-16/+1
| |\ \
| | * | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-161-16/+1
| * | | Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern2016-11-161-1/+12
| |\ \ \
| | * | | fix indentationFrancesco Coda Zabetta2016-11-141-7/+7
| | * | | fix labels API adding missing parameter (current_user)Francesco Coda Zabetta2016-11-141-1/+12
| * | | | Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable2016-11-151-1/+1
| |\ \ \ \
| | * | | | Add ref parameter for triggerring builds with gitlab webhook from other project.Dmitry Poray2016-11-151-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'grapify-notes-api' into 'master' Rémy Coutable2016-11-151-67/+57
| |\ \ \ \
| | * | | | Grapify the notes APIgrapify-notes-apiRobert Schilling2016-11-151-67/+57
| * | | | | Merge branch 'grapify-groups-api' into 'master' Rémy Coutable2016-11-151-82/+74
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Grapify the group APIRobert Schilling2016-11-151-82/+74
| | | |_|/ | | |/| |
| * | | | Merge branch 'grapify-merge-request-api' into 'master' Rémy Coutable2016-11-151-162/+110
| |\ \ \ \
| | * | | | Grapify the merge request APIgrapify-merge-request-apiRobert Schilling2016-11-151-162/+110
| | |/ / /
| * | | | Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-152-2/+4
| |\ \ \ \
| | * | | | Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-122-2/+4
| | | |_|/ | | |/| |
| * | | | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-0/+12
| |\ \ \ \
| | * | | | Add button to delete all merged branchesToon Claes2016-11-091-0/+12
| | | |_|/ | | |/| |
| * | | | Use declared_params helper in APIgrapify-declared-paramsRobert Schilling2016-11-1412-36/+20
| | |_|/ | |/| |
| * | | Merge branch 'grapify-to-h' into 'master' Rémy Coutable2016-11-143-7/+9
| |\ \ \
| | * | | Use #to_h to convert params to a hashgrapify-to-hRobert Schilling2016-11-143-7/+9
| | | |/ | | |/|
| * | | Merge branch 'grapify-subscription-api' into 'master' Rémy Coutable2016-11-141-23/+14
| |\ \ \ | | |/ / | |/| |
| | * | Grapify subscription APIRobert Schilling2016-11-141-23/+14
| | |/
* | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-1043-1254/+2048
|\ \ \ | |/ /
| * | Merge branch 'grapify-token-api' into 'master' Rémy Coutable2016-11-101-46/+30
| |\ \
| | * | Grapify token APIRobert Schilling2016-11-101-46/+30
| * | | Merge branch 'grapify-milestone-api' into 'master' Rémy Coutable2016-11-101-54/+57
| |\ \ \
| | * | | Grapify milestones APIgrapify-milestone-apiRobert Schilling2016-11-101-54/+57
| | | |/ | | |/|
| * | | Merge branch 'grapify-runners-api' into 'master' Rémy Coutable2016-11-101-53/+64
| |\ \ \
| | * | | Grapify runners APIRobert Schilling2016-11-101-53/+64
| | |/ /
| * | | Merge branch 'grapify-session-api' into 'master' Rémy Coutable2016-11-101-10/+9
| |\ \ \
| | * | | Grapify the session APIgrapify-session-apiRobert Schilling2016-11-091-10/+9
| | |/ /
| * | | Merge branch 'feature/api_owned_resource' into 'master' Sean McGivern2016-11-101-0/+10
| |\ \ \ | | |_|/ | |/| |
| | * | Added API endpoint groups/ownedBorja Aparicio2016-11-081-0/+10
| * | | Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta2016-11-081-1/+6
| * | | Merge branch 'fix-systemhook-api' into 'master' Rémy Coutable2016-11-081-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | API: Return 400 when creating a systemhook failsRobert Schilling2016-11-081-1/+1
| | |/
| * | Expose Label id to APIRares Sfirlogea2016-11-071-1/+1
| * | Ability to update labels priority via APIRobert Schilling2016-11-072-13/+31
| |/
| * Merge remote-tracking branch 'origin/labels-api'Rémy Coutable2016-11-041-3/+3
| |\
| | * Return conflict error in label API when title is taken by group labellabels-apiDouwe Maan2016-10-201-3/+3
| * | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-042-3/+7
| |\ \
| | * | Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-042-3/+7
| * | | Merge branch 'zj-grapify-project-hooks' into 'master' Rémy Coutable2016-11-041-84/+69
| |\ \ \ | | |/ / | |/| |
| | * | Move shared params to a helperzj-grapify-project-hooksZ.J. van de Weg2016-11-041-39/+19
| | * | GrapeDSL for project hooksZ.J. van de Weg2016-11-041-69/+74
| * | | Merge branch 'backport-ee-js-groups-api' into 'master' Robert Speicher2016-11-041-0/+3
| |\ \ \
| | * | | Backport Group API code that was added in EE onlybackport-ee-js-groups-apiRémy Coutable2016-10-311-0/+3
View Lorry Controller Status