summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-1717-48/+152
|\
| * Use relative git object paths to construct absolute ones before setting Envfix/git-env-repo-pathsAhmad Sherif2017-11-142-1/+15
| * Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-142-2/+2
| |\
| | * Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-newShinya Maeda2017-11-076-12/+25
| | |\
| | * | Add doc. Fix spec. Add erase_build in protected_ref ruleShinya Maeda2017-11-072-2/+0
| | * | Fix spec. Revert update check.Shinya Maeda2017-11-062-0/+2
| | * | Do not allow jobs to be erasedShinya Maeda2017-11-062-2/+2
| * | | Add administrative endpoint to list all pages domainsTravis Miller2017-11-133-3/+48
| * | | Add Gitlab::Utils::StrongMemoizeLin Jen-Shin (godfat)2017-11-131-3/+5
| * | | Add /groups/:id/subgroups endpoint to APIWinnie Hellmann2017-11-091-22/+44
| * | | Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master'Rémy Coutable2017-11-091-0/+6
| |\ \ \
| | * | | Fix acceptance of username for Mattermost service update via APIMark Fletcher2017-11-081-0/+6
| * | | | Merge branch '36099-api-responses-missing-x-content-type-options-header' into...Douwe Maan2017-11-081-1/+4
| |/ / /
| * | | Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-081-6/+6
| |\ \ \
| | * | | Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performanceSean McGivern2017-11-071-6/+6
| | | |/ | | |/|
| * | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-idDouwe Maan2017-11-082-2/+2
| |/ /
| * | Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1...Douwe Maan2017-11-073-11/+9
| |\ \
| | * | Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-requestRémy Coutable2017-11-061-4/+1
| | * | Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-063-8/+9
| * | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-073-1/+11
| |\ \ \
| | * | | Support custom attributes on groupsMarkus Koller2017-11-061-1/+8
| | * | | Support custom attributes on projectsMarkus Koller2017-11-062-0/+3
| | | |/ | | |/|
| * | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master'Rémy Coutable2017-11-071-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-apiSean McGivern2017-11-031-0/+4
| | |/
* | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0628-267/+508
|\ \ \ | |/ /
| * | Expose `duration` in Job API entityMehdi Lahmam2017-11-051-0/+1
| |/
| * Update specs for sudo behaviorDouwe Maan2017-11-021-5/+2
| * Add sudo API scopeDouwe Maan2017-11-022-74/+50
| * Remove authentication using user.private_tokenDouwe Maan2017-11-021-16/+6
| * Remove private_token from API user entityDouwe Maan2017-11-022-7/+1
| * Remove Session APIDouwe Maan2017-11-022-21/+0
| * Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' i...Rémy Coutable2017-10-311-1/+1
| |\
| | * Fix namespacing for MergeWhenPipelineSucceedsService in MR APIMark Fletcher2017-10-301-1/+1
| * | Merge branch 'add-packagist-project-service' into 'master'Kamil Trzciński2017-10-312-0/+41
| |\ \ | | |/ | |/|
| | * Add Packagist project serviceMatt Coleman2017-10-132-0/+41
| * | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-261-2/+2
| |\ \
| | * | Validate username/pw for Jiraservice, require them in the APIRobert Schilling2017-10-241-2/+2
| * | | Add pages domains API implementationTravis Miller2017-10-223-0/+122
| * | | Add pages domains API entitiesTravis Miller2017-10-221-0/+17
| |/ /
| * | Merge branch '37032-get-project-branch-invalid-name-message' into 'master'Rémy Coutable2017-10-181-8/+14
| |\ \
| | * | Get Project Branch API shows an helpful error message on invalid refnameJacopo2017-10-181-8/+14
| * | | Merge branch 'sha-handling' into 'master'Douwe Maan2017-10-166-22/+21
| |\ \ \
| | * | | Adds requirements that supports anything in sha paramsGuilherme Vieira2017-10-126-22/+21
| * | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-122-2/+2
| * | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-122-2/+2
| * | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-122-2/+2
| | |_|/ | |/| |
| * | | Move all API authentication code to APIGuardDouwe Maan2017-10-122-92/+93
| | |/ | |/|
| * | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-064-2/+9
| |\ \
| | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-037-33/+150
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-204-7/+30
| | |\ \ \ | | | | |/ | | | |/|