Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Send API parameters as extra data for sentry errorsapi-sentry-extra | Alejandro Rodríguez | 2017-10-05 | 1 | -1/+1 |
| | |||||
* | Merge branch '38571-fix-exception-in-raven-report' into 'master' | Sean McGivern | 2017-10-02 | 1 | -3/+5 |
|\ | | | | | | | | | | | | | Ensure no exception is raised when Raven tries to get the current user in API context Closes #38571 See merge request gitlab-org/gitlab-ce!14580 | ||||
| * | Ensure no exception is raised when Raven tries to get the current user in ↵38571-fix-exception-in-raven-report | Rémy Coutable | 2017-09-29 | 1 | -3/+5 |
| | | | | | | | | | | | | API context Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | add username to authorized result, so that gitlab-shell can pass it to hooks | David Turner | 2017-09-29 | 1 | -0/+7 |
|/ | |||||
* | Support custom attributes on users | Markus Koller | 2017-09-28 | 3 | -0/+84 |
| | |||||
* | Merge branch 'dm-api-unauthorized' into 'master' | Sean McGivern | 2017-09-28 | 2 | -16/+38 |
|\ | | | | | | | | | | | | | Make sure API responds with 401 when invalid authentication info is provided Closes #38438 See merge request gitlab-org/gitlab-ce!14525 | ||||
| * | Make sure API responds with 401 when invalid authentication info is provideddm-api-unauthorized | Douwe Maan | 2017-09-28 | 2 | -16/+38 |
| | | |||||
* | | refactor emails servicerefactor-services | James Lopez | 2017-09-28 | 1 | -4/+4 |
| | | |||||
* | | refactor users update service | James Lopez | 2017-09-28 | 3 | -3/+3 |
| | | |||||
* | | refactor services to match EE signature | James Lopez | 2017-09-28 | 3 | -7/+7 |
|/ | |||||
* | Merge branch ↵ | Rémy Coutable | 2017-09-27 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master' find_user users helper method no longer overrides find_user API helper method. Closes #37467 See merge request gitlab-org/gitlab-ce!14418 | ||||
| * | find_user users helper method no longer overrides find_user API helper method.37467-helper-method-from-users-endpoint-overrides-api-helper-method | Tiago Botelho | 2017-09-26 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dm-simple-project-avatar-url' into 'master' | Rémy Coutable | 2017-09-26 | 1 | -5/+6 |
|\ \ | | | | | | | | | | | | | Expose avatar_url when requesting list of projects from API with simple=true See merge request gitlab-org/gitlab-ce!14498 | ||||
| * | | Expose avatar_url when requesting list of projects from API with simple=truedm-simple-project-avatar-url | Douwe Maan | 2017-09-26 | 1 | -5/+6 |
| |/ | |||||
* | | Expose last pipeline details in API response when getting a single commit | Mehdi Lahmam | 2017-09-26 | 1 | -0/+1 |
|/ | | | | Closes #35692. | ||||
* | Merge branch '20049-projects-api-forks' into 'master' | Rémy Coutable | 2017-09-20 | 1 | -4/+19 |
|\ | | | | | | | | | | | | | Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355 | ||||
| * | Add an API endpoint to determine the forks of a project | Mark Fletcher | 2017-09-20 | 1 | -4/+19 |
| | | |||||
* | | Detect n+1 issues involving Gitaly | Andrew Newdigate | 2017-09-19 | 2 | -2/+8 |
|/ | |||||
* | fix #35290 Make read-only API for public merge requests available without ↵ | haseeb | 2017-09-18 | 1 | -1/+2 |
| | | | | authentication | ||||
* | Merge branch 'add_closed_at_attribute' into 'master' | Rémy Coutable | 2017-09-18 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Add 'closed_at' attribute to Issues API Closes #5935 See merge request gitlab-org/gitlab-ce!14316 | ||||
| * | Add 'closed_at' attribute to Issues API | Vitaliy @blackst0ne Klachkov | 2017-09-16 | 1 | -0/+1 |
| | | |||||
* | | Ensure we use `Entities::User` for non-admin `users/:id` API requests | Robert Speicher | 2017-09-15 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'sh-exclude-api-responses' into 'master' | Robert Speicher | 2017-09-13 | 1 | -1/+0 |
|\ | | | | | | | | | Exclude logging of API responses to prevent leakage of confidential data See merge request !14245 | ||||
| * | Exclude logging of API responses to prevent leakage of confidential datash-exclude-api-responses | Stan Hu | 2017-09-13 | 1 | -1/+0 |
| | | |||||
* | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master' | Grzegorz Bizon | 2017-09-13 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078 | ||||
| * | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb` | Maxim Rydkin | 2017-09-12 | 1 | -1/+1 |
| |/ | |||||
* | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8 | Annabel Dunstone Gray | 2017-09-11 | 1 | -1/+1 |
|/ | | | This reverts merge request !14148 | ||||
* | Revert "Merge branch ↵revert-f2421b2b | Rubén Dávila | 2017-09-08 | 1 | -1/+1 |
| | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619 | ||||
* | Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-false | Ruben Davila | 2017-09-07 | 2 | -2/+7 |
| | |||||
* | Merge branch 'sh-add-grape-logging' into 'master' | Sean McGivern | 2017-09-07 | 1 | -0/+11 |
|\ | | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102 | ||||
| * | Use a custom GrapeLogging formatter to get the timestampsh-add-grape-logging | Stan Hu | 2017-09-07 | 1 | -2/+2 |
| | | |||||
| * | Fix Rubocop failures in API logger | Stan Hu | 2017-09-07 | 1 | -3/+5 |
| | | |||||
| * | Add JSON logger in `log/api_json.log` for Grape API endpoints | Stan Hu | 2017-09-06 | 1 | -0/+9 |
| | | | | | | | | Closes #36189 | ||||
* | | Merge branch '23079-remove-default-scope-in-sortable' into 'master' | Douwe Maan | 2017-09-07 | 6 | -5/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558 | ||||
| * | | Removes default scope from sortable23079-remove-default-scope-in-sortable | Tiago Botelho | 2017-09-07 | 6 | -5/+6 |
| | | | |||||
* | | | Merge branch ↵ | Sean McGivern | 2017-09-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619 | ||||
| * | | | Restore some changes from !9199 | Rubén Dávila | 2017-09-06 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'events-migration-cleanup' into 'master' | Sean McGivern | 2017-09-07 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932 | ||||
| * | | | Finish migration to the new events setupevents-migration-cleanup | Yorick Peterse | 2017-09-06 | 2 | -2/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241 | ||||
* | | | Merge branch 'wiki_api' into 'master' | Grzegorz Bizon | 2017-09-07 | 4 | -0/+106 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Add API support for wiki pages Closes #12747 See merge request !13372 | ||||
| * | | Add API support for wiki pages | blackst0ne | 2017-09-07 | 4 | -0/+106 |
| | | | |||||
* | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master' | Kamil Trzciński | 2017-09-06 | 4 | -73/+104 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027 | ||||
| * | | | Revert moving authorization hook in jobs APIfeature/gb/download-single-job-artifact-using-api | Grzegorz Bizon | 2017-09-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵ | Grzegorz Bizon | 2017-09-06 | 9 | -42/+265 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits) | ||||
| * | | | Respond with a bad request if artifact path is invalid | Grzegorz Bizon | 2017-09-06 | 2 | -2/+2 |
| | | | | |||||
| * | | | Extract job artifacts API code to a separate file | Grzegorz Bizon | 2017-09-06 | 4 | -99/+99 |
| | | | | |||||
| * | | | Do not require API authentication if artifacts are public | Grzegorz Bizon | 2017-09-05 | 1 | -36/+43 |
| | | | | |||||
| * | | | Do not use artifacts metadata to access single artifact | Grzegorz Bizon | 2017-09-05 | 1 | -3/+4 |
| | | | | |||||
| * | | | Use API helper to send artifact file through Workhorse | Grzegorz Bizon | 2017-09-05 | 2 | -1/+5 |
| | | | | |||||
| * | | | Add API endpoint for downloading single job artifact | Grzegorz Bizon | 2017-09-04 | 1 | -0/+19 |
| | | | |