summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Change HTTP Status Code when repository disabledSam Battalio2019-06-243-2/+12
|
* Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controllerStan Hu2019-06-241-1/+1
| | | | | Since this scope is used in both the controller and the API, we rename it to make it clear that it's used for both.
* Add name & search parameters to project environments APILee Tickett2019-06-241-1/+6
|
* Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-242-19/+7
|\ | | | | | | | | Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
| * Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-202-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-211-7/+8
|/ | | | | | | | | | | | | | | | | | | | Adds enum certificate_source to pages_domains table with default manually_uploaded Mark certificates as 'gitlab_provided' if the were obtained through Let's Encrypt Mark certificates as 'user_provided' if they were uploaded through controller or api Only show private key in domain edit form if it is 'user_provided' Only show LetsEncrypt option if is enabled by application settings (and feature flag) Refactor and fix some specs to match new logic Don't show Let's Encrypt certificates as well
* Updating CE repo to include new EE users API changesMichael Leopard2019-06-191-14/+1
| | | | | Updated users API documentation Moved API level changes to the service level
* Merge branch 'pderichs-52123' into 'master'Robert Speicher2019-06-195-29/+31
|\ | | | | | | | | Use NotesFinder to get Noteable See merge request gitlab-org/gitlab-ce!28205
| * Simplify result of find_noteablepderichs-52123Patrick Derichs2019-06-191-3/+1
| |
| * Use NotesFinder to fetch notes on API and ControllersPatrick Derichs2019-06-195-28/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing iid query on NotesFinder Changed parameters of find_noteable, so changes across a few files were needed. MergeRequest also requires iid instead of id query Make NotesFinder fail with RecordNotFound again Add specs for target_iid Using RSpec tablesyntax for target_iid specs Revert "Using RSpec tablesyntax for target_iid specs" This reverts commit ba45c7f569a. Allow find_by! here Fix variable name Add readable check Revert "Add readable check" This reverts commit 9e3a1a7aa39. Remove unnecessary assignment Add required changes for EE Fix parameter count Reduce code duplication by extracting a noteable module method The call to find_noteable was redundant so multiple files and lines have changed in that commit to use the newly introduced module method `noteable`. Replace casecmp with include check Add parent_type parameter Revert "Reduce code duplication by extracting a noteable module method" This reverts commit 8c0923babff16. Method is no longer needed Check whether noteable can be read by user
* | Add documentation and testsManoj MJ2019-06-192-2/+6
| | | | | | | | | | | | | | | | This commit adds - feature specs - to test the ability of a user with "developer" permission to delete tags in repositories. - documentation
* | 59702 Fix API notification flags for MS TeamsSeiji Suenaga2019-06-181-2/+3
| |
* | Add 2nd response for container api bulk deleteSteve Abrams2019-06-181-0/+10
|/ | | | | | | The bulk delete api endpoint for container registries can only be called once per hour. If a user calls the endpoint more than once per hour, they will now receive a 400 error with a descriptive message.
* Merge branch '56737-commits-and-mr-events-on-jira-api' into 'master'Stan Hu2019-06-171-1/+1
|\ | | | | | | | | | | | | Expose currently supported events properly on services API Closes #56737 See merge request gitlab-org/gitlab-ce!29736
| * 56737 Expose currently supported events properly on services APIZsolt Kovari2019-06-161-1/+1
| |
* | Allow Developer role to delete tags via container registry apiJason Goodman2019-06-171-5/+1
|/ | | | This brings the API permissions in line with the UI permissions
* Merge branch 'expose-project-git-depth-via-api' into 'master'Kamil Trzciński2019-06-122-0/+3
|\ | | | | | | | | | | | | Expose default_git_depth via project API Closes #62908 See merge request gitlab-org/gitlab-ce!29353
| * Expose ci_default_git_depth via project APIexpose-project-git-depth-via-apiFabio Pitino2019-06-122-0/+3
| | | | | | | | | | | | | | | | | | | | Enable Get and Update of ci_default_git_depth for Project API. Renaming Project#default_git_depth to :ci_default_git_depth to give more context through the API usage. Add API documentation
* | API issues - minor cleanup of permission checkJan Provaznik2019-06-111-8/+3
| | | | | | | | | | | | Adds `set_issue_updated_at` similar to `set_issue_created_at` permission and cleans up the related permission check in issues API.
* | Revert "Automatically update MR merge-ref along merge status"Oswaldo Ferreira2019-06-112-7/+19
|/
* Add task count and completed count to responses of Issue and MRPatrick Derichs2019-06-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for task_completion_status Add test cases for task_completion_status result Extracted shared samples Add new spec file for task completion status response Fix style errors Add changelog entry Changed samples to Hashes Remove test for successful request Remove not nil expectation Add task_completion_status to api documentation for issues Add task_completion_status to api documentation for merge_requests Refactor spec so it just requests one specific item Add task_completion_status to Taskable Simplified task completion status in entities Refactor spec so it separates status code check and content check Fix spec description text and field name
* Include the port in the URLs of the API Link headersRémy Coutable2019-06-061-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'bvl-design-diff-notes-ce' into 'master'Douwe Maan2019-06-041-1/+1
|\ | | | | | | | | Adjustments related to DiffNotes on diffs outside of a project's main repository See merge request gitlab-org/gitlab-ce!29023
| * Make `resolvable_types` a class methodBob Van Landuyt2019-06-031-1/+1
| | | | | | | | | | This turns Notable::RESOLVABLE_TYPES into a `Notable.resolvable_types`. That allows us to override it in EE.
* | Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-032-19/+7
|\ \ | | | | | | | | | | | | | | | | | | Automatically update MR merge-ref along merge status Closes #58495 See merge request gitlab-org/gitlab-ce!28513
| * | Add payload to the service responseOswaldo Ferreira2019-05-311-2/+2
| | | | | | | | | | | | | | | This introduces payload to the ServiceResponse with the merge ref HEAD commit data
| * | Simplify merge_ref_head methodsOswaldo Ferreira2019-05-311-2/+2
| | |
| * | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-05-312-19/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | Abstract auto merge processesShinya Maeda2019-06-031-7/+4
|/ | | | | | | | | | | | We have one auto merge strategy today - Merge When Pipeline Succeeds. In order to add more strategies for Merge Train feature, we abstract the architecture to be more extensible. Removed arguments Fix spec
* Add optional param :start_project to allow variable commit targetsKerri Miller2019-05-311-0/+10
| | | | | | | | This extends POST#:id/repository/commits to allow the optional parameter `:start_project`, which will allow targeting other projects besides the one derived from `:id`. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/50850
* Remove legacy artifact related coderemove-legacy-artifacts-related-codeShinya Maeda2019-05-311-1/+1
| | | | | | We've already migrated all the legacy artifacts to the new realm, which is ci_job_artifacts table. It's time to remove the old code base that is no longer used.
* CE port of Move EE specific lines in API::ProjectsImre Farkas2019-05-303-59/+42
|
* CE port of Move EE specific lines in API::SettingsImre Farkas2019-05-302-47/+24
|
* Add wiki size to project statisticsPeter Marko2019-05-291-0/+2
|
* CE port of Move EE specific lines in API::ProtectedBranchesImre Farkas2019-05-292-23/+16
|
* Updated heading for default state in Web IDEDenys Mishunov2019-05-291-0/+1
| | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/60107
* CE port of Move EE specific lines in API::IssuesImre Farkas2019-05-292-12/+10
|
* Add notify_only_default_branch option to PipelinesEmailServicePeter Marko2019-05-281-0/+6
|
* CE port of Move EE specific lines in API::VariablesImre Farkas2019-05-282-6/+17
|
* CE port of Move EE specific lines in API::UsersImre Farkas2019-05-282-8/+20
|
* Make protected attribute Boolean typeapi_make_protected_boolean_typeThong Kuah2019-05-281-2/+2
| | | | | | As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/api/project_level_variables.md#create-variable and it's a boolean in `db/schema.rb`
* Merge branch '51854-api-to-get-all-project-group-members-returns-duplicates' ↵Jan Provaznik2019-05-271-17/+2
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "API to get all project/group members returns duplicates" Closes #51854 See merge request gitlab-org/gitlab-ce!24005
| * Removes duplicated members from api/projects/:id/members/all51854-api-to-get-all-project-group-members-returns-duplicatesJacopo2019-05-271-17/+2
| | | | | | | | | | | | | | | | When using the members/all api the same user was returned multiple times when he was a member of the project/group and also of one of the ancestor groups. Now the member is returned only once giving priority to the membership on the project and maintaining the same behaviour of the members UI.
* | CE-port of Refactor EE specific params override in API::GroupsImre Farkas2019-05-272-26/+25
|/
* Merge branch 'chore/remove-circuit-breaker-api' into 'master'Bob Van Landuyt2019-05-272-40/+0
|\ | | | | | | | | | | | | Remove the circuit breaker API Closes #52467 See merge request gitlab-org/gitlab-ce!28669
| * Remove the circuit breaker APIchore/remove-circuit-breaker-apiMarkus Koller2019-05-242-40/+0
| | | | | | | | | | The circuit breaker itself was removed in 11.5, this removes the corresponding API endpoints which returned empty data since then.
* | Masked should be Boolean typevariables-boolean-typeThong Kuah2019-05-271-2/+2
|/ | | | | | As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/api/project_level_variables.md#create-variable and it's a boolean in `db/schema.rb`
* Merge branch 'api_masked_variables' into 'master'Bob Van Landuyt2019-05-232-0/+3
|\ | | | | | | | | | | | | API: Allow to get and set "masked" attribute for variables Closes #61754 See merge request gitlab-org/gitlab-ce!28381
| * API: Allow to get and set "masked" attribute for variablesMathieu Parent2019-05-222-0/+3
| |
* | Merge branch '60250-remove-mr_push_options-flag' into 'master'Stan Hu2019-05-222-6/+4
|\ \ | |/ |/| | | | | | | | | Remove the mr_push_options feature flag Closes #60250 See merge request gitlab-org/gitlab-ce!28278
View Lorry Controller Status