summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Expose the Koding application settings in the APIkoding-setting-apiDJ Mountney2016-09-291-0/+2
| | | | This will allow the Koding app to enable the integration itself once is has authorized an admin user using the application secrets.
* Merge branch 'issue_22382' into 'master' Rémy Coutable2016-09-292-6/+7
|\ | | | | | | | | | | | | Expose project share expiration_date field on API closes #22382 See merge request !6484
| * Expose project share expiration_date field on APIissue_22382Felipe Artur2016-09-282-6/+7
| |
* | Merge branch '22367-add-pipeline-id-build' into 'master' Rémy Coutable2016-09-291-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose pipeline data in builds API Exposes pipeline data in builds API, as suggested by #22367. The fields exposed were 'id', 'status', 'ref', and 'sha'. Closes #22367 See merge request !6502
| * | expose pipeline data in builds APIGuilherme Salazar2016-09-281-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add pipeline ref, sha, and status to the build API response add tests of build API (pipeline data) change API documentation for builds API log change to builds API in CHANGELOG CHANGELOG: add reference to pull request and contributor's name
* | | Handle LFS token creation and retrieval in the same method, and in the same ↵lfs-ssh-authorization-fixPatricio Cano2016-09-281-1/+1
|/ / | | | | | | | | | | Redis connection. Reset expiry time of token, if token is retrieved again before it expires.
* | Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-272-3/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add organization field to the user profile ## What does this MR do? Add organization field to the user profile ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So we can let users fill organization information separately ## Screenshots (if relevant) ![Screen_Shot_2016-09-26_at_7.32.27_PM](/uploads/d11a9a86aa22227f9c9915d195106c5f/Screen_Shot_2016-09-26_at_7.32.27_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21903 See merge request !6526
| * | Add User#organization to users apiDmitriy Zaporozhets2016-09-272-3/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-271-6/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New `Members::ApproveAccessRequestService` Part of #21979. ## Does this MR meet the acceptance criteria? - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6266
| * | New Members::ApproveAccessRequestServiceRémy Coutable2016-09-221-6/+1
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Keep API mounts in alphabetical orderAchilleas Pipinellis2016-09-251-1/+2
|/
* API: Return 404 when trying to fork to unaccessible namespaceRémy Coutable2016-09-221-1/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-211-12/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And Snippets get awards ## What does this MR do? Makes snippets more awesome, by making them awardables ## Why was this MR needed? Because Snippets were left behind. ## What are the relevant issue numbers? Closes #17878 See merge request !4456
| * Fix tests for Snippets toggling awardsZ.J. van de Weg2016-09-191-14/+9
| | | | | | | | Also incorporate feedback
| * API support for Award Emoji on SnippetsZ.J. van de Weg2016-09-191-10/+20
| |
| * Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-191-1/+1
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-218-73/+105
|\ \
| * \ Merge branch 'add_optional_author_for_commits' into 'master' Rémy Coutable2016-09-201-5/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add optional 'author' param when making commits This fulfills https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 by adding the ability to specify a user's ID to be used as the author of a commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 See merge request !5822
| | * | Add optional 'author' param when making commitsDan Dunckel2016-09-191-5/+7
| | |/
| * | Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-201-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LFS support for ssh enabled ## What does this MR do? This is follow-up after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 which is falsely shown as merged due to: https://gitlab.com/gitlab-org/gitlab-ce/issues/22334 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6413
| | * | Revert "Revert all changes introduced by ↵lfs-supportKamil Trzcinski2016-09-191-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b7011ec7ec4600e00bdc8df76bb39813c.
| * | | Merge branch '22065-group-members-api-returning-null-user-details' into ↵Robert Speicher2016-09-203-8/+8
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure invitees are not returned in Members API ## What are the relevant issue numbers? Closes #22065 See merge request !6370
| | * | Ensure invitees are not returned in Members APIRémy Coutable2016-09-163-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'issue_20978' into 'master' Rémy Coutable2016-09-193-54/+63
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Allow to set request_access_enabled for groups and projects using API Closes #20978 See merge request !6359
| | * | Allow to set request_access_enabled for groups and projects using APIFelipe Artur2016-09-193-54/+63
| | | |
| * | | Revert all changes introduced by ↵Kamil Trzcinski2016-09-191-13/+0
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
| * | | Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-193-7/+11
| |\ \ \ | | |/ /
| | * | Fix API notes endpoint when posting only emojiZ.J. van de Weg2016-09-161-4/+4
| | |/
| * | Rename capabilities to authentication_abilitiesKamil Trzcinski2016-09-161-3/+3
| | |
| * | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-151-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/git_http_client_controller.rb # app/helpers/lfs_helper.rb # lib/gitlab/auth.rb # spec/requests/lfs_http_spec.rb
| | * | Better authentication handling, syntax fixes and better actor handling for ↵Patricio Cano2016-09-151-8/+1
| | | | | | | | | | | | | | | | LFS Tokens
| | * | Refactored handling of the `LfsToken` and added functionality to it to ↵Patricio Cano2016-09-151-9/+11
| | | | | | | | | | | | | | | | simplify external code.
| | * | Refactored LFS auth logic when using SSH to use its own API endpoint ↵Patricio Cano2016-09-151-12/+18
| | | | | | | | | | | | | | | | `/lfs_authenticate` and added tests.
| | * | Refactor LFS token logic to use a Redis key instead of a DB field, making it ↵Patricio Cano2016-09-152-5/+6
| | | | | | | | | | | | | | | | a 1 use only token.
| | * | Added LFS support to SSHPatricio Cano2016-09-152-2/+13
| | | | | | | | | | | | | | | | - Required on the GitLab Rails side is mostly authentication and API related.
| * | | Fix existing authorization specsKamil Trzcinski2016-09-151-10/+8
| | | |
| * | | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-152-26/+32
| |\ \ \ | | |/ / | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | Add access specsKamil Trzcinski2016-09-151-2/+12
| | | |
* | | | Enable Warden for the Grape APINick Thomas2016-09-191-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The practical effect of this commit is to make the API check the Rails session cookie for authentication details. If the cookie is present and valid, it will be used to authenticate. The API now has several authentication options for users. They follow in this order of precedence: * Authentication token * Personal access token * OAuth2 Bearer token (Doorkeeper - application access) * Rails session cookie
* | | | Remove some dead code from the Grape APINick Thomas2016-09-191-43/+13
| |_|/ |/| | | | | | | | | | | | | | The `guard_all!` method is never called, and `guard!` is not implemented. The `doorkeeper_guard!` method is also never called, and is mostly the same as its non-bang counterpart.
* | | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-151-2/+4
| | |
* | | Added group-specific setting for LFS.Patricio Cano2016-09-152-3/+5
| |/ |/| | | | | Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
* | Change response for /ci/api/v1/builds/register.json from 404 to 204Tomasz Maczukin2016-09-131-0/+4
| |
* | Fix an error where we were unable to create a CommitStatus for running statefix-commit-statusKamil Trzcinski2016-09-121-26/+28
|/
* Merge branch 'rc-api-use-search-globalservice-in-projects-search-api' into ↵Rémy Coutable2016-09-121-12/+3
|\ | | | | | | | | | | | | | | 'master' API: Use Search::GlobalService in projects search API See merge request !6280
| * Use Search::GlobalService.new in the `GET /projects/search/:query` endpointrc-api-use-search-globalservice-in-projects-search-apiRémy Coutable2016-09-121-12/+3
| | | | | | | | | | | | | | | | | | | | Also streamline the sorting part while we're at it. That being done, there's currently a duplication between `GET /projects/search/:query` and `GET /projects?search=:search` so we might want to keep only the latter for 9.0... Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Search should compare only the lowercase versions of the project namesRazzeee2016-09-091-1/+1
| |
* | Merge branch 'fix-api-sorting' into 'master' Douwe Maan2016-09-121-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API issues sorting ## What does this MR do? Fix the sorting of issues in the API. ## Are there points in the code the reviewer needs to double check? Instead of removing the '_at' suffix manually, we could add those versions to the `Sortable` concern instead. ## Why was this MR needed? There were a couple of bugs: * The global and project-specific issues endpoints wouldn't sort at all. * Group sorting would work, but only if you applied two undocumented workarounds: * Always pass both `order_by` and `sort` (both are optional, so only one should be needed to change ordering). * Instead of passing `created_at` or `updated_at`, you needed to pass `created` or `updated`. This makes the API implementation match the docs. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/983. See merge request !6281
| * | Fix API issues sortingfix-api-sortingSean McGivern2016-09-091-3/+9
| |/
* | Add notification_settings API callsMarc Siegfriedt2016-09-093-1/+114
|/ | | | Use NotificationSetting::EMAIL_EVENTS for params
View Lorry Controller Status