summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Remove the mr_push_options feature flagLuke Duncalfe2019-05-172-6/+4
| | | | | | | | | | | | | | | | `Gitlab::QueryLimiting.whitelist` has been moved from being inside the feature flag conditional check to the `process_mr_push_options` `Api::Internal` helper. https://gitlab.com/gitlab-org/gitlab-ce/issues/60250
* | Add allow_failure attribute to Job APIFabio Pitino2019-05-211-1/+1
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50813
* | Revert "Merge branch ↵revert-47e5eedcKerri Miller2019-05-201-4/+0
| | | | | | | | | | '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' into 'master'" This reverts merge request !27978
* | CE port of Move EE specific lines in API::GroupsImre Farkas2019-05-202-14/+19
| |
* | Added filtering jobs by age to jobs/request API endpointDmitry Chepurovskiy2019-05-201-0/+1
| |
* | Merge branch 'ce-57402-add-issues-statistics-api-endpoints' into 'master'Rémy Coutable2019-05-204-38/+147
|\ \ | | | | | | | | | | | | Add issues_statistics api endpoints See merge request gitlab-org/gitlab-ce!27366
| * | Review updates and cleanupce-57402-add-issues-statistics-api-endpointsAlexandru Croitor2019-05-174-40/+24
| | | | | | | | | | | | | | | | | | | | | * Cleaned issues and issues_statistics docs * Renamed param with_labels_data to with_labels_details * Added spec for N+1 check when retrieving labels from issue * Refactoed CheckAssigneesCount validation class
| * | Add params validations and remove extra params supportAlexandru Croitor2019-05-153-19/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove label_name and milestone_title params support Add mutually_exclusive validation for author_id and author_username Add mutually_exclusive validation for assignee_id and assignee_username Add validation to allow single value for asignee_username on CE Add separate issue_stats_params helper for statistics params and reuse in issues_params.
| * | Move issue details to from IssueBasic to Issue entityAlexandru Croitor2019-05-153-14/+26
| | | | | | | | | | | | | | | Cleanup IssueBasic entity to keep it basic and move extra attributes to Issue entity which contains more details
| * | Changes to issues apiAlexandru Croitor2019-05-153-28/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When issues_controller endpoint was used for search, the parameters passed to the controller were slightly different then the ones passed to API. Because the searchbar UI is reused in different places and builds the parameters passed to request in same way we need to account for old parameter names. Add issues_statistics api endpoints Adds issue_statistics api endpoints for issue lists and returns counts of issues for all, closed and opened states. Expose more label attributes based on a param When requesting issues list through API expose more attributes for labels, like color, description if with_labels_data param is being passed, avoiding this way to change response schema for users that already use API. https://gitlab.com/gitlab-org/gitlab-ce/issues/57402
* | | #46469 - Added ref querystring parameter to project search to allow ↵Lee Tickett2019-05-171-1/+2
|/ / | | | | | | searching on branches other than master
* | Rename methods that conflict in Rails 5.255583-rename-method-conflictsHeinrich Lee Yu2019-05-121-1/+1
|/ | | | | Adds suffix to enum methods and changes `in_groups` to `of_groups`
* Confirm existence of head_pipeline if pipeline success requiredKerri Miller2019-05-071-0/+4
| | | | | | | | | Pipelines are created by an async worker, so a rapid sequence of API calls can trigger a state where the pipeline, whose existence is part of determining if we wait for the pipeline to successfully complete before merging, can trigger the MR to be immediately merged instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55127
* Use a path for the related merge requests endpointsh-fix-related-merge-requests-pathStan Hu2019-05-071-0/+4
| | | | | | | | | | Hosts using a non-standard configuration may have a different hostname/port/scheme than what may be configured on the GitLab server. While expose_url should generate a proper URL, there are cases where it may not work. Since we don't need the full URL, we can use the relative path. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61280
* Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-apiSean McGivern2019-05-061-1/+5
| | | | | | If you can do this in the UI, you should be able to do it in the API. If a discussion is not a single note discussion, or it is replyable, you can reply to it.
* Implement support for CI variables of type fileKrasimir Angelov2019-05-064-1/+7
| | | | | | | | | Add env_var and file as supported types for CI variables. Variables of type file expose to users existing gitlab-runner behaviour - save variable value into a temp file and set the path to this file in an ENV var named after the variable key. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/46806.
* Merge branch 'ce-11225-es_limited_namespaces_removal' into 'master'Nick Thomas2019-05-061-0/+6
|\ | | | | | | | | Backport "Fix namespace/project removal elasticsearch limit" to CE See merge request gitlab-org/gitlab-ce!27933
| * Backport of 328-versioned-es-schemace-11225-es_limited_namespaces_removalMario de la Ossa2019-05-021-0/+6
| |
* | Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-051-1/+1
| |
* | Allow guests users to access project releasesKrasimir Angelov2019-05-032-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is step one of resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/56838. Here is what changed: - Revert the security fix from bdee9e8412d. - Do not leak repository information (tag name, commit) to guests in API responses. - Do not include links to source code in API responses for users that do not have download_code access. - Show Releases in sidebar for guests. - Do not display links to source code under Assets for users that do not have download_code access. GET ':id/releases/:tag_name' still do not allow guests to access releases. This is to prevent guessing tag existence.
* | Whitelist query limits for internal APIStan Hu2019-05-031-0/+2
| | | | | | | | | | | | | | | | | | When creating a merge request for push options, there may be over 100 queries that are run to create a merge request. Even after we reduce the number of queries by disabling the Sidekiq jobs, it appears we still hover near this limit. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11450
* | Add gitlab-managed option to clusters formMayra Cabrera2019-05-031-0/+1
|/ | | | | | | | When this option is enabled, GitLab will create namespaces and service accounts as usual. When disabled, GitLab wont create any project specific kubernetes resources Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
* Merge branch 'secure-disallow-read-user-scope-to-read-project-events' into ↵GitLab Release Tools Bot2019-04-294-47/+63
|\ | | | | | | | | | | | | 'master' Disallow read user scope to read project events See merge request gitlab/gitlabhq!3067
| * Add new api class for projects eventsMałgorzata Ksionek2019-04-244-47/+63
| | | | | | | | | | | | | | | | | | | | | | | | Refactor api events class to use external helper Move specs from old class Add changelog and magic string Refactor events class to be more explicit Remove blank line