summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Start to remove config processor from Ci::Pipeline"kamil-refactor-ci-builds-v3Kamil Trzciński2018-09-042-0/+21
| | | | This reverts commit d6c3446df5d238480d479861f2f3985f8e593306.
* Fix ci/lints viewKamil Trzciński2018-09-041-3/+4
|
* Fix internalId testKamil Trzciński2018-09-041-2/+4
|
* fix failuresKamil Trzciński2018-09-041-3/+3
|
* Fix import exportKamil Trzciński2018-09-042-0/+2
|
* Fix complementary logicKamil Trzciński2018-09-041-4/+8
|
* Fix specsKamil Trzciński2018-09-042-2/+6
|
* Remove validationKamil Trzciński2018-09-041-1/+0
|
* Fix specsKamil Trzciński2018-09-042-4/+4
|
* Start to remove config processor from Ci::PipelineKamil Trzciński2018-09-043-27/+0
|
* Fix spec failuresKamil Trzciński2018-09-048-128/+27
|
* Fix codestyleKamil Trzciński2018-09-041-6/+6
|
* Fix bugKamil Trzciński2018-09-042-1/+2
|
* Use `metadata` instead of new model `build_config`.Kamil Trzciński2018-09-045-61/+19
|
* Add dependent model `build_config` that stores all dynamic job configurationKamil Trzciński2018-09-0426-67/+155
|
* Merge branch '50101-add-artifact-information-to-job-api' into 'master'Kamil Trzciński2018-09-049-8/+137
|\ | | | | | | | | Add artifact information in job API See merge request gitlab-org/gitlab-ce!21328
| * Add JSON schema validation for job APISteve Azzopardi2018-09-037-6/+61
| | | | | | | | | | | | | | | | Start validating against the exciting JSON schema for the job controller JSON response. The JSON schema is not complete since there is quite a lot missing, this will be done in a separate issue.
| * Add artifact information for job controllerSteve Azzopardi2018-09-033-3/+77
| | | | | | | | gitlab-org/gitlab-ce#50101
* | Merge branch 'move-cache-vs-artifacts' into 'master'Sid Sijbrandij2018-09-041-57/+58
|\ \ | | | | | | | | | | | | Make cache vs artifacts section more visible, and minor enhancements to text. See merge request gitlab-org/gitlab-ce!21491
| * | Make cache vs artifacts section more visible, and minor enhancements to text.Evan Read2018-09-041-57/+58
| | |
* | | Merge branch '44750-should-we-still-use-flay' into 'master'Robert Speicher2018-09-047-61/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Resolve "Should we still use Flay?" Closes #44750 See merge request gitlab-org/gitlab-ce!21476
| * | Stop using FlayRémy Coutable2018-09-037-61/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Only GCPSid Sijbrandij2018-09-031-8/+3
| | |
* | | Merge branch 'bvl-update-install-docs-11-3' into 'master'Achilleas Pipinellis2018-09-032-4/+382
|\ \ \ | |/ / |/| | | | | | | | Update installation and update docs for 11.3 See merge request gitlab-org/gitlab-ce!21481
| * | Update installation and update docs for 11.3Bob Van Landuyt2018-09-032-4/+382
|/ /
* | Merge branch 'Ravlen-Repos/gitlab-ee-ee-ce-application-settings-docs' into ↵Rémy Coutable2018-09-031-102/+134
|\ \ | | | | | | | | | | | | | | | | | | 'master' Cleanup of api settings.md doc See merge request gitlab-org/gitlab-ce!21474
| * | Update api/settings.mdMarcel Amirault2018-09-031-102/+134
| | | | | | | | | | | | Fix spacing, typos, add missing settings, and remove deprecated ones.
* | | Merge branch 'winh-move-badge-settings' into 'master'Phil Hughes2018-09-0324-172/+242
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move badge settings to general settings Closes #46590 See merge request gitlab-org/gitlab-ce!21333
| * | | Move badge settings to general settingsWinnie Hellmann2018-09-0324-172/+242
|/ / /
* | | Merge branch ↵Douwe Maan2018-09-0312-12/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '6417-extract-ee-specific-files-lines-for-lib-gitlab-email-handler-rb' into 'master' Extract EE-specific lines from Gitlab::Email::Handler See merge request gitlab-org/gitlab-ce!21358
| * | | Remove requires from email handlersSean McGivern2018-09-031-5/+0
| | | |
| * | | Add frozen_string_literal: true to email handlersSean McGivern2018-09-0312-0/+24
| | | |
| * | | Extract EE-specific lines from Gitlab::Email::HandlerSean McGivern2018-09-032-8/+14
| | | |
* | | | Merge branch 'sh-improve-bitbucket-server-logging' into 'master'Rémy Coutable2018-09-034-3/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add JSON logging for Bitbucket Server importer See merge request gitlab-org/gitlab-ce!21378
| * | | | Add JSON logging for Bitbucket Server importerStan Hu2018-08-304-3/+83
| | | | | | | | | | | | | | | | | | | | Adds an importer.log so that it's easier to track what's happening with the import.
* | | | | Merge branch 'docs/junit-examples' into 'master'Rémy Coutable2018-09-031-0/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add JUnit Java examples in docs See merge request gitlab-org/gitlab-ce!21472
| * | | | | Refactor Java JUnit reports examplesAchilleas Pipinellis2018-09-031-8/+11
| | | | | |
| * | | | | Add Java Maven example to junit_test_reports.mdLeo2018-09-031-3/+19
| | | | | |
| * | | | | Update junit_test_reports.md by providing new example for java, using gradle ↵Maastiff2018-09-031-0/+20
| | |_|/ / | |/| | | | | | | | | | | | | build tool
* | | | | Merge branch 'sh-bump-gitlab-pages-v1.1.0' into 'master'Nick Thomas2018-09-032-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump GitLab Pages to v1.1.0 See merge request gitlab-org/gitlab-ce!21419
| * | | | | Bump GitLab Pages to v1.1.0Stan Hu2018-08-292-1/+6
| | |/ / / | |/| | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-pages/blob/master/CHANGELOG
* | | | | Merge branch 'fix-download-dropdown-link' into 'master'Nick Thomas2018-09-033-2/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide PAT creation advice for HTTP clone if PAT exists Closes #44111 See merge request gitlab-org/gitlab-ce!18208
| * | | | | Hide PAT creation advice for HTTP clone if PAT existGeorge Thomas2018-08-313-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user has a active Personal Access Token, hide the help text that appears when selecting the link for HTTP clone
* | | | | | Merge branch 'fj-2635-enable-rss-for-tags' into 'master'Sean McGivern2018-09-037-0/+112
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added atom feed for tags Closes #2635 See merge request gitlab-org/gitlab-ce!21428
| * | | | | Added atom feed for tagsFrancisco Javier López2018-09-037-0/+112
|/ / / / /
* | | | | Merge branch 'add-additional-ce-images-kube-doc' into 'master'Achilleas Pipinellis2018-09-031-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add updated ce images to kubernetes install doc See merge request gitlab-org/gitlab-ce!21418
| * | | | | Update the gitlab chart kubernetes install documentationDJ Mountney2018-08-291-0/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | With an updated list of the images you need to change when switching to the CE version.
* | | | | Merge branch 'docs-port-ee-community-contributions' into 'master'Achilleas Pipinellis2018-09-0325-39/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs port ee community contributions See merge request gitlab-org/gitlab-ce!21311
| * | | | | fixed small typoNikolaus Schlemm2018-08-291-1/+1
| | | | | |
| * | | | | Fixed link in doc/administration/high_availability/nfs.mdDavid McKay2018-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally submitted at https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6942. Signed-off-by: Rémy Coutable <remy@rymai.me>