summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-0520-116/+229
|\
| * Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-0514-79/+78
| * Merge branch '37970-timestamped-ci' into 'master'Kamil Trzciński2017-10-031-0/+1
| |\
| | * Expose GitLab features to the CI runner37970-timestamped-ciAlessio Caiazza2017-10-031-0/+1
| * | Merge branch '38571-fix-exception-in-raven-report' into 'master'Sean McGivern2017-10-021-3/+5
| |\ \
| | * | Ensure no exception is raised when Raven tries to get the current user in API...38571-fix-exception-in-raven-reportRémy Coutable2017-09-291-3/+5
| * | | add username to authorized result, so that gitlab-shell can pass it to hooksDavid Turner2017-09-291-0/+7
| |/ /
| * | Support custom attributes on usersMarkus Koller2017-09-283-0/+84
| * | Merge branch 'dm-api-unauthorized' into 'master'Sean McGivern2017-09-282-16/+38
| |\ \
| | * | Make sure API responds with 401 when invalid authentication info is provideddm-api-unauthorizedDouwe Maan2017-09-282-16/+38
| * | | refactor emails servicerefactor-servicesJames Lopez2017-09-281-4/+4
| * | | refactor users update serviceJames Lopez2017-09-283-3/+3
| * | | refactor services to match EE signatureJames Lopez2017-09-283-7/+7
| |/ /
| * | Merge branch '37467-helper-method-from-users-endpoint-overrides-api-helper-me...Rémy Coutable2017-09-271-2/+2
| |\ \
| | * | find_user users helper method no longer overrides find_user API helper method.37467-helper-method-from-users-endpoint-overrides-api-helper-methodTiago Botelho2017-09-261-2/+2
| | |/
| * | Merge branch 'dm-simple-project-avatar-url' into 'master'Rémy Coutable2017-09-261-5/+6
| |\ \
| | * | Expose avatar_url when requesting list of projects from API with simple=truedm-simple-project-avatar-urlDouwe Maan2017-09-261-5/+6
| | |/
| * | Expose last pipeline details in API response when getting a single commitMehdi Lahmam2017-09-261-0/+1
| |/
* | fix calls to Emails::DestroyServiceBrett Walker2017-09-231-2/+2
* | Send a confirmation email when the user adds a secondary email address. Utili...Brett Walker2017-09-231-2/+0
|/
* Merge branch '20049-projects-api-forks' into 'master'Rémy Coutable2017-09-201-4/+19
|\
| * Add an API endpoint to determine the forks of a projectMark Fletcher2017-09-201-4/+19
* | Detect n+1 issues involving GitalyAndrew Newdigate2017-09-192-2/+8
|/
* fix #35290 Make read-only API for public merge requests available without aut...haseeb2017-09-181-1/+2
* Merge branch 'add_closed_at_attribute' into 'master'Rémy Coutable2017-09-181-0/+1
|\
| * Add 'closed_at' attribute to Issues APIVitaliy @blackst0ne Klachkov2017-09-161-0/+1
* | Ensure we use `Entities::User` for non-admin `users/:id` API requestsRobert Speicher2017-09-151-1/+1
|/
* Merge branch 'sh-exclude-api-responses' into 'master'Robert Speicher2017-09-131-1/+0
|\
| * Exclude logging of API responses to prevent leakage of confidential datash-exclude-api-responsesStan Hu2017-09-131-1/+0
* | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-131-1/+1
|\ \
| * | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-121-1/+1
| |/
* | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-1/+1
|/
* Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-081-1/+1
* Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-072-2/+7
* Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-071-0/+11
|\
| * Use a custom GrapeLogging formatter to get the timestampsh-add-grape-loggingStan Hu2017-09-071-2/+2
| * Fix Rubocop failures in API loggerStan Hu2017-09-071-3/+5
| * Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-061-0/+9
* | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-076-5/+6
|\ \
| * | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-076-5/+6
* | | Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-071-1/+1
|\ \ \
| * | | Restore some changes from !9199Rubén Dávila2017-09-061-1/+1
| | |/ | |/|
* | | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-072-2/+2
|\ \ \
| * | | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-062-2/+2
| | |/ | |/|
* | | Merge branch 'wiki_api' into 'master'Grzegorz Bizon2017-09-074-0/+106
|\ \ \ | |_|/ |/| |
| * | Add API support for wiki pagesblackst0ne2017-09-074-0/+106
* | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-064-73/+104
|\ \ \
| * | | Revert moving authorization hook in jobs APIfeature/gb/download-single-job-artifact-using-apiGrzegorz Bizon2017-09-061-2/+2
| * | | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-069-42/+265
| |\ \ \ | | | |/ | | |/|
| * | | Respond with a bad request if artifact path is invalidGrzegorz Bizon2017-09-062-2/+2
View Lorry Controller Status