summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* add tag_list param to runners apiAlexis Reigel2019-02-271-0/+6
|
* Merge branch 'danger-ignores-gitlab-pot' into 'master'Robert Speicher2019-02-271-0/+1
|\ | | | | | | | | Danger ignores gitlab.pot See merge request gitlab-org/gitlab-ce!25594
| * Danger ignores gitlab.potNick Thomas2019-02-271-0/+1
| |
* | Merge branch ↵Kamil Trzciński2019-02-271-3/+7
|\ \ | | | | | | | | | | | | | | | | | | '10014-ee-spec-models-ci-build_spec-rb-ee-spec-requests-api-runner_spec-rb-and-ee-spec-services-ci-process_pipeline_service_spec-rb-are-all-failing-ce' into 'master' Revert "Merge branch 'revert-8baf9e5f' into 'master'" See merge request gitlab-org/gitlab-ce!25584
| * | Revert "Merge branch 'revert-8baf9e5f' into 'master'"Matija Čupić2019-02-271-3/+7
| | | | | | | | | | | | | | | This reverts commit f5201a816f2eff9393e16f362403451e5d86ee6c, reversing changes made to 48e6db0dad6f256e8423e0bd6c9b254803f50ccf.
* | | Merge branch '42086-project-fetch-statistics-api-http-only' into 'master'57125-heatmap-chart-typeNick Thomas2019-02-273-0/+36
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Resolve "Project fetch statistics API (HTTP only)" Closes #42086 See merge request gitlab-org/gitlab-ce!23596
| * | Add project http fetch statistics APIJacopo2019-02-273-0/+36
| | | | | | | | | | | | | | | | | | The API get projects/:id/traffic/fetches allows user with write access to the repository to get the number of clones for the last 30 days.
* | | Add Project template for go-microJason Lenny2019-02-271-0/+1
| | |
* | | Merge branch 'osw-merge-refs-refreshing-api' into 'master'Douwe Maan2019-02-271-0/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API support for MR merge to temporary merge ref path Closes #57252 See merge request gitlab-org/gitlab-ce!24918
| * | | Add API support for refreshing merge ref pathOswaldo Ferreira2019-02-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Add a merge_requests/:iid/merge_to_ref API which make use of the groundwork to write merge results into refs/merge-requests/:iid/merge.
* | | | Prepare test suite for switch to Gitaly-embedded Git hooksJacob Vosmaer2019-02-272-6/+6
| | | |
* | | | Merge branch 'include-ci-yaml' into 'master'Grzegorz Bizon2019-02-273-0/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix: validate 'include' keywords in gitlab-ci.yml configuration files Closes #55863 See merge request gitlab-org/gitlab-ce!24098
| * | | | ci(config): validate 'include' keywordPaul B2019-02-193-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During `.gitlab-ci.yml` configuration file validation there are two cases: 1- either we are validating a file within a project context (a project and a sha is given in option parameters) 2- either we are validating a file with no project context (as in the api POST /ci/lint) In the first case, all `include:` keywords are replaced by the content of the included CI cnfiguration files. In the second case, the `include:` configuration is kept untouched. The current problem arises in the second case when one wants to validate a generic gitlab-ci configuration file with an `include:` keyword from the API. The following error will be raised by the API: `"jobs:include config should be a hash"`. This commit fixes the behavior by validating the `include:` keyword if its present to not parse it as a job definition. Fixes #55863 / #52822
* | | | | Reduce code duplicationAlexander Koval2019-02-271-46/+18
| | | | | | | | | | | | | | | | | | | | Move logic of obtaining Issuable data to separate method
* | | | | Persist source sha and target sha for merge pipelinesShinya Maeda2019-02-272-1/+3
| | | | | | | | | | | | | | | | | | | | source_sha and target_sha are used for merge request pipelines
* | | | | Added: Documentation for the APINermin Vehabovic2019-02-261-0/+17
| | | | | | | | | | | | | | | | | | | | Added: Specs for the API action
* | | | | Revert "Merge branch '56726-fix-n+1-in-issues-and-merge-requests-api' into ↵Heinrich Lee Yu2019-02-261-22/+50
| | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !25042
* | | | | Revert "Merge branch '13784-simple-masking-of-protected-variables-in-logs' ↵Kamil Trzciński2019-02-261-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master'" This reverts merge request !25293
* | | | | Reduce code duplicationAlexander Koval2019-02-261-50/+22
| |_|_|/ |/| | | | | | | | | | | Move logic of obtaining Issuable data to separate method
* | | | Merge branch 'ce-revert-d5ce84fd' into 'master'Lin Jen-Shin2019-02-262-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'revert-82d7b5a0-ce' into 'master'" Closes #57857 and #50747 See merge request gitlab-org/gitlab-ce!25559
| * | | | Merge branch 'filter-confidential-issues' into 'master'Kamil Trzciński2019-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to filter confidential issues Closes #50747 See merge request gitlab-org/gitlab-ce!24960
| * | | | Merge branch 'sh-fix-cpp-templates-404' into 'master'Nick Thomas2019-02-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404s when C++ .gitignore template selected Closes #57857 See merge request gitlab-org/gitlab-ce!25416
* | | | | Merge branch 'add_YouTrack_integration' into 'master'Sean McGivern2019-02-261-0/+21
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Added YouTrack integration Closes #42595 See merge request gitlab-org/gitlab-ce!25361
| * | | | Remove new_issue_url field from YouTrack integration serviceKotau Yauhen2019-02-211-6/+0
| | | | |
| * | | | Added YouTrack integrationYauhen Kotau2019-02-181-0/+27
| | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#42595
* | | | | Add Maskable concern for CI variablesMatija Čupić2019-02-261-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | This adds a concern that abstracts the concept of masking a variable, including the RegEx for validation.
* | | | | Merge branch 'osw-create-and-store-merge-ref-for-mrs' into 'master'Douwe Maan2019-02-262-0/+25
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Support merge ref writing (without merging to target branch) Closes #47110 See merge request gitlab-org/gitlab-ce!24692
| * | | | Support merge to ref for merge-commit and squashOswaldo Ferreira2019-02-252-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the ground work for writing into the merge ref refs/merge-requests/:iid/merge the merge result between source and target branches of a MR, without further side-effects such as mailing, MR updates and target branch changes.
* | | | | Merge branch '50313-use-kaniko-to-build-containers-in-autodevops' into 'master'Kamil Trzciński2019-02-261-49/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use auto-build-image in AutoDevOps See merge request gitlab-org/gitlab-ce!24279
| * | | | | Use auto-build-image for build stageJames Fargher2019-02-251-49/+3
| | | | | |
* | | | | | Merge branch '54417-improve-authorize-dsl' into 'master'Kamil Trzciński2019-02-263-24/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GraphQL Authorization DSL Closes #57828 See merge request gitlab-org/gitlab-ce!25328
| * | | | | | Improve GraphQL Authorization DSLLuke Duncalfe2019-02-263-24/+18
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously GraphQL field authorization happened like this: class ProjectType field :my_field, MyFieldType do authorize :permission end end This change allowed us to authorize like this instead: class ProjectType field :my_field, MyFieldType, authorize: :permission end A new initializer registers the `authorize` metadata keyword on GraphQL Schema Objects and Fields, and we can collect this data within the context of Instrumentation like this: field.metadata[:authorize] The previous functionality of authorize is still being used for mutations, as the #authorize method here is called at during the code that executes during the mutation, rather than when a field resolves. https://gitlab.com/gitlab-org/gitlab-ce/issues/57828
* | | | | | Revert "Merge branch 'sh-fix-cpp-templates-404' into 'master'"Michael Kozono2019-02-251-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4b282e9ce1ae246c4538b3ede18d1380ea778029, reversing changes made to b6f37434a7022be1be40c0d0519aea3ceca25ea5.
* | | | | | Revert "Merge branch ↵Michael Kozono2019-02-252-52/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49449-add-an-api-endpoint-for-bulk-updating-issues-and-mrs' into 'master'" This reverts commit 7981c0292b07a0138b096fa082341fcb13e9ce2b, reversing changes made to 9202bbd129537a698b986e6295d0c783b5a84815.
* | | | | | Revert "Merge branch 'filter-confidential-issues' into 'master'"Michael Kozono2019-02-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d133bf84c668df3dfc9938bb04150754cb873c8b, reversing changes made to 7981c0292b07a0138b096fa082341fcb13e9ce2b.
* | | | | | Merge branch 'zj-load-languages-from-database' into 'master'Nick Thomas2019-02-251-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load repository language from the DB if detected Closes #47390 See merge request gitlab-org/gitlab-ce!25518
| * | | | | | Load repository language from the DB if detectedZeger-Jan van de Weg2019-02-251-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository charts page used to detect the repository language for each request that was made to the page. Given the detection is an expensive operation and the same data is stored in the database the database is now serving the request. The same goes for an API endpoint that serves the languages. When a repository is empty or non-existent the languages will always be empty. And the language detection RPC isn't requested. Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/47390
* | | | | | Merge branch '58020-fix-merge-api-endpoint-param' into 'master'Lin Jen-Shin2019-02-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect the `should_remove_source_branch` parameter to the merge API Closes #58020 See merge request gitlab-org/gitlab-ce!25525
| * | | | | | Respect the should_remove_source_branch parameter to the merge APINick Thomas2019-02-251-2/+2
| |/ / / / /
* | | | | | Merge branch '57794-project-template-for-net' of ↵Jason Lenny2019-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 57794-project-template-for-net
* | | | | | Merge branch '57712-project-import-error-user-expected-got-hash' into 'master'Lin Jen-Shin2019-02-251-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project import error, User expected, got Hash" Closes #57712 See merge request gitlab-org/gitlab-ce!25495
| * | | | | Fix project import error on releasesJames Lopez2019-02-221-1/+0
| |/ / / /
* | | | | Merge branch 'expose-merge-ref-to-runner' into 'master'Kamil Trzciński2019-02-251-7/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose refspec and depth to runner See merge request gitlab-org/gitlab-ce!25233
| * | | | | Expose refspec and depth to runnerShinya Maeda2019-02-251-7/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix fix and fix Allow full ref specification for pipeline creation Add spec Support backward compatibility Use ref path Runner feature flag Simplify the things Support fork workflow (Public only) Expose ref spec Use refspec Glooming Decouple unrelated changes Add changelog Revert unrelated file Decouple unnecessary Add spec Use refspecs Fix changelog Simplify Fix coding offence Fix a ok ok ok ok ok a a Fix Add workaround for ignore_column Fix git depth Fix coding offence Fix spec Simplify more Do not set ignored column Fix tests Fix pipeline Fix spec fix fixture yes Revert nonsense fix Revert more ok Decouple mr pipelines fix spev Remove unrelated changes
* | | | | Merge branch '40795-set-project-name-on-fork-api' into 'master'Douwe Maan2019-02-251-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to set project path and name on fork using API Closes #40795 See merge request gitlab-org/gitlab-ce!25363
| * | | | | Let users set name/path on project fork using APIBalasankar "Balu" C2019-02-201-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '58098-auto-devops-postgres-version-variable' into 'master'Sean McGivern2019-02-251-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow configuring POSTGRES_VERSION in Auto DevOps Closes #58098 See merge request gitlab-org/gitlab-ce!25500
| * | | | | Allow configuring POSTGRES_VERSION in Auto DevOpsDylan Griffith2019-02-221-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | We set the default value to 9.6.2 since this was the previous default being used by `stable/postgresql --version=0.7.1` which is used in auto-deploy-app.
* | | | | Merge branch 'am-fix-pagination-relative-links' into 'master'Rémy Coutable2019-02-251-39/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly implement API pagination headers and add specs Closes #57684 See merge request gitlab-org/gitlab-ce!25267
| * | | | | Properly implement API pagination headers and add specsAdam Mulvany2019-02-211-39/+36
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>