summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | refactor users update serviceJames Lopez2017-09-283-3/+3
| | | | | | |
| | * | | | | refactor services to match EE signatureJames Lopez2017-09-283-7/+7
| | |/ / / /
| | * | | | Merge branch ↵Rémy Coutable2017-09-271-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-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=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-urlDouwe Maan2017-09-261-5/+6
| | | |/ / /
| | * | | | Expose last pipeline details in API response when getting a single commitMehdi Lahmam2017-09-261-0/+1
| | |/ / / | | | | | | | | | | | | | | | Closes #35692.
| * | | | fix calls to Emails::DestroyServiceBrett Walker2017-09-231-2/+2
| | | | |
| * | | | Send a confirmation email when the user adds a secondary email address. ↵Brett Walker2017-09-231-2/+0
| |/ / / | | | | | | | | | | | | Utilizes the Devise `confirmable` capabilities. Issue #37385
* | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-254-7/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (168 commits) Update CHANGELOG.md for 10.0.1 Remove Grit settings from default settings Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Workaround for #38259 Workaround for n+1 in Projects::TreeController#show Removed old icons from project page Make branches page translatable fix typo in icons section Don't show it if there's no project. Update CHANGELOG.md for 10.0.0 Inform user that current shared projects will remain shared Allow the git circuit breaker to correctly handle missing repository storages Reserve refs/replace cos `git-replace` is using it Resolve "Better SVG Usage in the Frontend" Replace the 'project/service.feature' spinach test with an rspec analog Replace the 'project/shortcuts.feature' spinach test with an rspec analog Removed two legacy config options Fix rendering double note issue. IssueNotes: Switch back to Write pane when note cancel or submit. Upgrade Nokogiri because of CVE-2017-9050 ...
| * | | Merge branch '20049-projects-api-forks' into 'master'Rémy Coutable2017-09-201-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 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 ↵haseeb2017-09-181-1/+2
| | | | | | | | | | | | | | | | authentication
| * | | Merge branch 'add_closed_at_attribute' into 'master'Rémy Coutable2017-09-181-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 APIVitaliy @blackst0ne Klachkov2017-09-161-0/+1
| | |/
* | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-194-12/+10
| | |
* | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-184-0/+5
|/ /
* | 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 data See merge request !14245
| * 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
|\ \ | | | | | | | | | | | | | | | | | | 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 Rydkin2017-09-121-1/+1
| |/
* | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-1/+1
|/ | | This reverts merge request !14148
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-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-falseRuben Davila2017-09-072-2/+7
|
* Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-071-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-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
| | | | | | | | Closes #36189
* | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-076-5/+6
|\ \ | | | | | | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558
| * | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-076-5/+6
| | |
* | | Merge branch ↵Sean McGivern2017-09-071-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 !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 setup Closes #37241 See merge request !13932
| * | | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-062-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 Bizon2017-09-074-0/+106
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add API support for wiki pages Closes #12747 See merge request !13372
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-apiGrzegorz Bizon2017-09-061-2/+2
| | | |
| * | | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵Grzegorz Bizon2017-09-069-42/+265
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
| * | | Respond with a bad request if artifact path is invalidGrzegorz Bizon2017-09-062-2/+2
| | | |
| * | | Extract job artifacts API code to a separate fileGrzegorz Bizon2017-09-064-99/+99
| | | |
| * | | Do not require API authentication if artifacts are publicGrzegorz Bizon2017-09-051-36/+43
| | | |
| * | | Do not use artifacts metadata to access single artifactGrzegorz Bizon2017-09-051-3/+4
| | | |
| * | | Use API helper to send artifact file through WorkhorseGrzegorz Bizon2017-09-052-1/+5
| | | |
| * | | Add API endpoint for downloading single job artifactGrzegorz Bizon2017-09-041-0/+19
| | | |
* | | | Merge branch '35942_api_binary_encoding' into 'master'Sean McGivern2017-09-062-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API fix for non UTF-8 data Closes #35942 See merge request !14038
| * | | | revert to using a simple representationmicael.bergeron2017-09-061-1/+1
| | | | |
| * | | | wip: fake its a binary diffmicael.bergeron2017-09-062-2/+3
| | | | |
View Lorry Controller Status