summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-31' into 'master'Stan Hu2019-04-111-0/+4
|\ | | | | | | | | | | | | Add missing provider_unauthorized method to import_github.rb Closes #60347 See merge request gitlab-org/gitlab-ce!27218
| * Return a `401` error codeBen2019-04-111-1/+1
| |
| * Fix trailing white spaceBen2019-04-101-1/+1
| |
| * Add missing provider_unauthroized method to import_github.rb Ben2019-04-101-0/+4
| |
* | Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-101-0/+40
|/ | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* Move Contribution Analytics related spec in ↵Imre Farkas2019-04-093-3/+9
| | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* Merge branch 'osw-multi-assignees-merge-requests' into 'master'Nick Thomas2019-04-092-1/+9
|\ | | | | | | | | [Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
| * [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-082-1/+9
| | | | | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* | Add new permission model `read-pipeline-variable`Agustin Henze2019-04-091-0/+13
| | | | | | | | | | | | | | Used to get the variables via the API endpoint `/projects/:id/pipelines/:pipeline_id/variables` Signed-off-by: Agustin Henze <tin@redhat.com>
* | Merge branch '43263-git-push-option-to-create-mr' into 'master'Nick Thomas2019-04-092-8/+38
|\ \ | | | | | | | | | | | | | | | | | | Git push options to create a merge request, set target_branch and set merge when pipeline succeeds Closes #53198 and #43263 See merge request gitlab-org/gitlab-ce!26752
| * | Feature flag for merge requestion push optionsLuke Duncalfe2019-04-091-2/+4
| | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/43263 https://gitlab.com/gitlab-org/gitlab-ce/issues/53198
| * | Refactor PushOptionsHandlerService from reviewLuke Duncalfe2019-04-092-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exceptions are no longer raised, instead all errors encountered are added to the errors property. MergeRequests::BuildService is used to generate attributes of a new merge request. Code moved from Api::Internal to Api::Helpers::InternalHelpers.
| * | Use Gitlab::PushOptions for `ci.skip` push optionLuke Duncalfe2019-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the raw push option Array was sent to Pipeline::Chain::Skip. This commit updates this class (and the chain of classes that pass the push option parameters from the API internal `post_receive` endpoint to that class) to treat push options as a Hash of options parsed by GitLab::PushOptions. The GitLab::PushOptions class takes options like this: -o ci.skip -o merge_request.create -o merge_request.target=branch and turns them into a Hash like this: { ci: { skip: true }, merge_request: { create: true, target: 'branch' } } This now how Pipeline::Chain::Skip is determining if the `ci.skip` push option was used.
| * | Support merge request create with push optionsLuke Duncalfe2019-04-092-7/+34
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To create a new merge request: git push -u origin -o merge_request.create To create a new merge request setting target branch: git push -u origin -o merge_request.create \ -o merge_request.target=123 To update an existing merge request with a new target branch: git push -u origin -o merge_request.target=123 A new Gitlab::PushOptions class handles parsing and validating the push options array. This can be the start of the standard of GitLab accepting push options that follow namespacing rules. Rules are discussed in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/43263. E.g. these push options: -o merge_request.create -o merge_request.target=123 Become parsed as: { merge_request: { create: true, target: '123', } } And are fetched with the class via: push_options.get(:merge_request) push_options.get(:merge_request, :create) push_options.get(:merge_request, :target) A new MergeRequests::PushOptionsHandlerService takes the `merge_request` namespaced push options and handles creating and updating merge requests. Any errors encountered are passed to the existing `output` Hash in Api::Internal's `post_receive` endpoint, and passed to gitlab-shell where they're output to the user. Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/43263
* | Add new API endpoint to expose single environmentKrasimir Angelov2019-04-092-4/+20
|/ | | | | | | | This is resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/30157. Implement new API endpoint `/projects/:id/environments/:environment_id` to expose single environment. Include information for environment's last deployment if there is one.
* Fix `updated_at` doesn't apply to `state_event` updates of issues via APISean McGivern2019-04-081-3/+7
|
* Merge branch 'duplicate-related-mrs' into 'master'Michael Kozono2019-04-051-1/+1
|\ | | | | | | | | Remove duplicates from issue related merge requests See merge request gitlab-org/gitlab-ce!27067
| * Remove duplicates from issue related merge requestsduplicate-related-mrsAlexandru Croitor2019-04-051-1/+1
| | | | | | | | | | | | | | | | Remove duplicates returned by Issues#related_merge_requests API that relies on ReferencedMergeRequestsService which returns 2 arrays one of related MRs and one of related MRs that close the issue(i.e. a subset of first one). We only need related MRs in this case so just pick the first array.
* | Add part of needed codeGosia Ksionek2019-04-051-1/+2
|/ | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"Andreas Brandl2019-04-053-9/+3
| | | This reverts merge request !26823
* Move Contribution Analytics related spec in ↵Imre Farkas2019-04-053-3/+9
| | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* Fix IDE detecting MR from fork branchPaul Slaughter2019-04-051-0/+1
| | | | | | | | | **Why?** Currently the IDE loads a merge request based on only the `source_branch` name. This means it loads MR's from forks that have the same branch name (not good). - This required updating the BE API to accept `source_project_id`
* Merge branch ↵Douglas Barbosa Alexandre2019-04-051-1/+2
|\ | | | | | | | | | | | | '9217-warn-on-git-fetch-over-ssh-if-the-secondary-is-lagging-the-primary' into 'master' Display console messages, if available See merge request gitlab-org/gitlab-ce!26692
| * Allow console messages be sent to gitlab-shell9217-warn-on-git-fetch-over-ssh-if-the-secondary-is-lagging-the-primaryAsh McKenzie2019-04-041-1/+2
| | | | | | | | Currently a no-op for CE
* | Merge branch '3314-add-on-runner-minutes-for-gitlab-com-ce' into 'master'Douwe Maan2019-04-042-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Backport some changes from gitlab-ee!9815 Closes #3314 See merge request gitlab-org/gitlab-ce!25908
| * | Backport some changes from EE3314-add-on-runner-minutes-for-gitlab-com-ceRubén Dávila2019-04-022-0/+2
| | | | | | | | | | | | MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9815
* | | Expose head pipeline in the related merge requestsAlexandru Croitor2019-04-042-1/+10
| |/ |/| | | | | | | | | | | | | | | Expose head pipeline for the MR in the api when requesting related merge requests for an issue and show a detailed status for the pipeline, which would include: details_path, favicon, group, icon, label, text, tooltip. https://gitlab.com/gitlab-org/gitlab-ce/issues/57662#note_152023412
* | Add port section to CI Image objectFrancisco Javier López2019-04-031-0/+5
|/ | | | | | | | | | | In order to implement https://gitlab.com/gitlab-org/gitlab-ee/issues/10179 we need several modifications on the CI config file. We are adding a new ports section in the default Image object. Each of these ports will accept: number, protocol and name. By default this new configuration will be only enabled in the Web IDE config file.
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-021-5/+3
|\ | | | | | | jarv/dev-to-gitlab-2019-04-02
| * Merge branch 'security-id-potential-denial-languages' into 'master'GitLab Release Tools Bot2019-04-021-5/+3
| |\ | | | | | | | | | | | | Return cached languages if they've been detected before See merge request gitlab/gitlabhq!2998
| | * Return cached languages if they've been detected beforeIgor Drozdov2019-03-201-5/+3
| | |
* | | Include cluster domain into Project Cluster APIMayra Cabrera2019-04-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Domain was introduced on 11.8 and was not included on the Project Cluster API. With this change user will be able to include domain when adding and updating a cluster. Domain will also be included on the GET calls. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59441
* | | Fix API /project/:id/branches not returning correct merge statusStan Hu2019-03-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24034 introduced a regression where only the first 20 branches were used to determine whether a branch has been merged because the pagination was applied incorrectly. Requesting the second page of branches via the API would always have the wrong merge status. We fix this by properly paginating the branches before requesting their merge status. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56250
* | | Merge branch 'osw-multi-line-suggestions-creation-strategy' into 'master'Andreas Brandl2019-03-271-2/+0
|\ \ \ | | | | | | | | | | | | | | | | Prepares suggestion implementation for multi-line support See merge request gitlab-org/gitlab-ce!26057
| * | | Prepare suggestion implementation for multi-lineOswaldo Ferreira2019-03-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Adds the groundwork needed in order to persist multi-line suggestions, while providing the parsing strategy which will be reused for the **Preview** as well.
* | | | Resolve "Get milestone by title via API"Fabio Busatto2019-03-272-0/+8
| | | |
* | | | Merge branch 'bvl-allow-more-repos-per-resource-ce' into 'master'James Lopez2019-03-272-8/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Allow multiple repositories per project See merge request gitlab-org/gitlab-ce!26539
| * | | Allow multiple repositories per projectBob Van Landuyt2019-03-262-8/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | This changes the repository type from a binary `wiki?` to a type. So we can have more than 2 repository types. Now everywhere we called `.wiki?` and expected a boolean, we check that type.
* | | Merge branch 'backport-api-parameters' into 'master'Robert Speicher2019-03-269-48/+183
|\ \ \ | | | | | | | | | | | | | | | | Backport EE API parameters in lib/api See merge request gitlab-org/gitlab-ce!26369
| * | | Backport parameters for API::ParametersYorick Peterse2019-03-261-0/+8
| | | | | | | | | | | | | | | | | | | | This backports the EE specific parameters for API::Parameters, wrapping them in a conditional.
| * | | Backport parameters for API::UsersYorick Peterse2019-03-261-0/+8
| | | | | | | | | | | | | | | | | | | | This backports the EE specific parameters for API::Users, and wraps them in a conditional.
| * | | Backport API parameters for API::SettingsYorick Peterse2019-03-261-0/+36
| | | | | | | | | | | | | | | | | | | | This backports the API parameters from API::Settings that were added in EE, wrapping them in a conditional.
| * | | Backport changes to API::ProtectedBranchesYorick Peterse2019-03-261-0/+24
| | | | | | | | | | | | | | | | | | | | This backports EE specific parameters EE adds to API::ProtectedBranches, and wraps them in a conditional.
| * | | Backport parameters from API::ProjectsYorick Peterse2019-03-262-35/+44
| | | | | | | | | | | | | | | | | | | | This backports various parameter changes EE makes to API::Projects, along with moving some code around to make it easier to extend in EE.
| * | | Backport API::Issues parameters from EEYorick Peterse2019-03-262-13/+37
| | | | | | | | | | | | | | | | | | | | This backports the parameters that EE adds to API::Issues, and wraps them in conditionals so they are only used in EE.
| * | | Backport API::Helpers::ProjectsHelpers from EEYorick Peterse2019-03-261-0/+11
| | | | | | | | | | | | | | | | | | | | This backports all changes made to this module in EE to CE, and wraps EE specific code in a conditional.
| * | | Backport EE API parameters for API::GroupsYorick Peterse2019-03-261-0/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the API parameters for API::Groups from EE to CE, ensuring both implementations use the same code. EE specific parameters are wrapped in an `if` statement for two reasons: 1. It allows us to completely disable the parameters in CE. 2. It removes the need for adding a source comment to signal that the parameters are EE only.
* | | Show statistics also when repository is disabledPeter Marko2019-03-231-1/+1
|/ /
* | Add highest_role method to UserThiago Presa2019-03-222-1/+5
| |
* | Apply suggestion to lib/api/search.rbAlexis Reigel2019-03-151-1/+1
| |