summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-264-57/+97
|\
| * Add more storage statisticsMarkus Koller2016-12-214-41/+81
| * Consistently use current_user in API entitiesMarkus Koller2016-12-213-21/+21
| * Don't expose all namespace fields in APIMarkus Koller2016-12-211-2/+2
* | Merge branch 'fixes-issues-api-reopen' into 'master' Rémy Coutable2016-12-231-2/+1
|\ \
| * | Fix state_event parameter to reopen an issuefixes-issues-api-reopenRobert Schilling2016-12-221-2/+1
| |/
* | Merge branch 'cache-last-commit-sha-for-path' into 'master' Yorick Peterse2016-12-221-1/+1
|\ \ | |/ |/|
| * Merge two methods.Hiroyuki Sato2016-12-201-1/+1
| * Rename sha to idHiroyuki Sato2016-12-201-1/+1
| * Use Repository#cache_last_commit_sha_for_path in APIHiroyuki Sato2016-12-201-1/+1
* | Merge branch 'fix/25843' into 'master' Sean McGivern2016-12-201-2/+2
|\ \
| * | Rename MattermostNotificationService back to MattermostServicefix/25843Douglas Barbosa Alexandre2016-12-201-1/+1
| * | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-201-1/+1
* | | Allow unauthenticated access to Repositories Files API GET endpointsRémy Coutable2016-12-201-2/+0
* | | Merge branch '4269-public-repositories-api' into 'master' Sean McGivern2016-12-201-6/+0
|\ \ \ | |/ / |/| |
| * | Allow Repositories API GET endpoints to be requested anonymouslyRémy Coutable2016-12-191-6/+0
| |/
* | Merge branch '25678-remove-user-build' into 'master' Rémy Coutable2016-12-201-1/+1
|\ \
| * | remove build_user from model UserArsenev Vladislav2016-12-181-1/+1
* | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-201-1/+8
|\ \ \ | |_|/ |/| |
| * | Improve after feedbackKamil Trzcinski2016-12-191-1/+8
* | | Merge branch '25301-git-2.11-force-push-bug' into 'master' Douglas Barbosa Alexandre2016-12-192-1/+13
|\ \ \
| * | | Accept environment variables from the `pre-receive` script.Timothy Andrew2016-12-162-1/+13
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-1846-1831/+2566
|\ \ \ | |/ /
| * | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-164-22/+50
| |\ \ | | |/ | |/|
| | * Convert AccessTokenValidationService into a class.Timothy Andrew2016-12-161-2/+2
| | * Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-161-11/+15
| | * Calls to the API are checked for scope.Timothy Andrew2016-12-164-30/+54
| * | Merge branch 'issue_22269' into 'master' Kamil Trzciński2016-12-161-1/+9
| |\ \ | | |/ | |/|
| | * Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-151-1/+9
| * | Add an environment slugNick Thomas2016-12-153-1/+18
| |/
| * Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-141-0/+28
| * Merge branch 'api-cherry-pick' into 'master' Rémy Coutable2016-12-131-1/+35
| |\
| | * API: Ability to cherry-pick a commitRobert Schilling2016-12-131-1/+35
| * | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-132-54/+77
| |\ \
| | * | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-131-13/+11
| | * | API: Memoize the current_user so that the sudo can work properlyRémy Coutable2016-12-122-54/+79
| | |/
| * | Merge branch 'api-simple-group-project' into 'master' Rémy Coutable2016-12-131-1/+4
| |\ \
| | * | API: Ability to get group's project in simple representationapi-simple-group-projectRobert Schilling2016-12-131-1/+4
| * | | Merge branch 'api-dont-allow-blank-mr-titles' into 'master' Sean McGivern2016-12-131-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titlesRobert Schilling2016-12-131-2/+2
| | |/
| * | Merge branch 'grapify-service-api' into 'master' Rémy Coutable2016-12-122-65/+572
| |\ \
| | * | Grapify the service APIRobert Schilling2016-12-092-65/+572
| * | | Merge branch 'api-fix-group-projects-filter' into 'master' Rémy Coutable2016-12-121-1/+10
| |\ \ \
| | * | | API: Fix groups filterRobert Schilling2016-12-121-1/+10
| * | | | Merge branch 'issue_25030' into 'master' Sean McGivern2016-12-121-8/+8
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Allow branch names with dots on API endpointissue_25030Felipe Artur2016-12-081-8/+8
| * | | | Merge branch 'features/api-snippets' into 'master' Sean McGivern2016-12-123-0/+151
| |\ \ \ \
| | * | | | API: Endpoint to expose personal snippets as /snippetsGuyzmo2016-12-013-0/+151
| * | | | | Merge branch 'api-remove-source-branch' into 'master' Rémy Coutable2016-12-091-2/+6
| |\ \ \ \ \
| | * | | | | API: Ability to remove source branchapi-remove-source-branchRobert Schilling2016-12-041-2/+6