summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-021-15/+2
|\
| * Allow Member.add_user to handle access requestersRémy Coutable2016-09-281-15/+2
* | Merge branch '15356-filters-should-change-issue-counts' into 'master' Robert Speicher2016-09-301-2/+1
|\ \
| * | Small improvements thanks to Robert's feedbackRémy Coutable2016-09-301-2/+1
* | | Merge branch 'koding-setting-api' into 'master' Robert Speicher2016-09-301-0/+2
|\ \ \ | |/ / |/| |
| * | Expose the Koding application settings in the APIkoding-setting-apiDJ Mountney2016-09-291-0/+2
* | | Merge branch 'rc-new-access-requests-finder' into 'master' Douwe Maan2016-09-301-2/+2
|\ \ \ | |/ / |/| |
| * | New AccessRequestsFinderRémy Coutable2016-09-281-2/+2
| |/
* | Merge branch 'issue_22382' into 'master' Rémy Coutable2016-09-292-6/+7
|\ \
| * | Expose project share expiration_date field on APIissue_22382Felipe Artur2016-09-282-6/+7
* | | Merge branch '22367-add-pipeline-id-build' into 'master' Rémy Coutable2016-09-291-2/+7
|\ \ \
| * | | expose pipeline data in builds APIGuilherme Salazar2016-09-281-2/+7
| | |/ | |/|
* | | Handle LFS token creation and retrieval in the same method, and in the same R...lfs-ssh-authorization-fixPatricio Cano2016-09-281-1/+1
|/ /
* | Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-272-3/+5
|\ \
| * | Add User#organization to users apiDmitriy Zaporozhets2016-09-272-3/+5
* | | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-271-6/+1
|\ \ \ | |/ / |/| |
| * | New Members::ApproveAccessRequestServiceRémy Coutable2016-09-221-6/+1
| |/
* | Keep API mounts in alphabetical orderAchilleas Pipinellis2016-09-251-1/+2
|/
* API: Return 404 when trying to fork to unaccessible namespaceRémy Coutable2016-09-221-1/+3
* Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-211-12/+17
|\
| * Fix tests for Snippets toggling awardsZ.J. van de Weg2016-09-191-14/+9
| * API support for Award Emoji on SnippetsZ.J. van de Weg2016-09-191-10/+20
| * Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-191-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-218-73/+105
|\ \
| * \ Merge branch 'add_optional_author_for_commits' into 'master' Rémy Coutable2016-09-201-5/+7
| |\ \
| | * | Add optional 'author' param when making commitsDan Dunckel2016-09-191-5/+7
| | |/
| * | Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-201-0/+13
| |\ \
| | * | Revert "Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab...lfs-supportKamil Trzcinski2016-09-191-0/+13
| * | | Merge branch '22065-group-members-api-returning-null-user-details' into 'mast...Robert Speicher2016-09-203-8/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Ensure invitees are not returned in Members APIRémy Coutable2016-09-163-8/+8
| * | | Merge branch 'issue_20978' into 'master' Rémy Coutable2016-09-193-54/+63
| |\ \ \ | | |_|/ | |/| |
| | * | Allow to set request_access_enabled for groups and projects using APIFelipe Artur2016-09-193-54/+63
| * | | Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merg...Kamil Trzcinski2016-09-191-13/+0
| * | | Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-193-7/+11
| |\ \ \ | | |/ /
| | * | Fix API notes endpoint when posting only emojiZ.J. van de Weg2016-09-161-4/+4
| | |/
| * | Rename capabilities to authentication_abilitiesKamil Trzcinski2016-09-161-3/+3
| * | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-151-0/+13
| |\ \
| | * | Better authentication handling, syntax fixes and better actor handling for LF...Patricio Cano2016-09-151-8/+1
| | * | Refactored handling of the `LfsToken` and added functionality to it to simpli...Patricio Cano2016-09-151-9/+11
| | * | Refactored LFS auth logic when using SSH to use its own API endpoint `/lfs_au...Patricio Cano2016-09-151-12/+18
| | * | Refactor LFS token logic to use a Redis key instead of a DB field, making it ...Patricio Cano2016-09-152-5/+6
| | * | Added LFS support to SSHPatricio Cano2016-09-152-2/+13
| * | | Fix existing authorization specsKamil Trzcinski2016-09-151-10/+8
| * | | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-152-26/+32
| |\ \ \ | | |/ /
| * | | Add access specsKamil Trzcinski2016-09-151-2/+12
* | | | Enable Warden for the Grape APINick Thomas2016-09-191-3/+20
* | | | Remove some dead code from the Grape APINick Thomas2016-09-191-43/+13
| |_|/ |/| |
* | | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-151-2/+4
* | | Added group-specific setting for LFS.Patricio Cano2016-09-152-3/+5
| |/ |/|
* | Change response for /ci/api/v1/builds/register.json from 404 to 204Tomasz Maczukin2016-09-131-0/+4
View Lorry Controller Status