summaryrefslogtreecommitdiff
path: root/lib/ci
Commit message (Expand)AuthorAgeFilesLines
* Resolve conflict with lib/ci/model.rb | lib/gitlab/ci/model.rbRémy Coutable2017-09-131-11/+0
* Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-13Rémy Coutable2017-09-135-708/+0
|\
| * move `lib/ci/mask_secret.rb` into `lib/gitlab/ci/mask_secret.rb`Maxim Rydkin2017-09-122-10/+0
| * move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-121-251/+0
| * move `lib/ci/model.rb` into `lib/gitlab/ci/model.rb`Maxim Rydkin2017-09-121-11/+0
| * move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`Maxim Rydkin2017-09-121-116/+0
| * move `lib/ci/ansi2html.rb` into `lib/gitlab/ci/ansi2html.rb`Maxim Rydkin2017-09-121-331/+0
* | Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-09-051-20/+29
|\ \ | |/
| * Remove an empty line from YAML processor classGrzegorz Bizon2017-09-011-1/+0
| * Check if service active when using CI/CD kubernetes policyGrzegorz Bizon2017-09-011-1/+1
| * Change kubernetes job policy allowed valuesGrzegorz Bizon2017-08-311-3/+2
| * Make some methods in CI/CD YAML processor privateGrzegorz Bizon2017-08-311-27/+29
| * Improve matching kubernetes job in CI/CD processorGrzegorz Bizon2017-08-311-3/+3
| * Remove unused method from CI/CD YAML processorGrzegorz Bizon2017-08-311-6/+0
| * Check if kubernetes required before creating a jobGrzegorz Bizon2017-08-261-2/+17
| * Use new complex only/except policy internal schemeGrzegorz Bizon2017-08-261-1/+1
* | [CE->EE] Resolve conflictsValery Sizov2017-08-222-310/+0
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2017-08-224-221/+0
|\ \ | |/
| * Remove CI API v1Zeger-Jan van de Weg2017-08-186-529/+0
| * Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-141-1/+1
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-082-3/+3
| * Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-011-2/+2
* | [EE] Whitelist or fix additional `Gitlab/PublicSend` cop violationsRobert Speicher2017-08-161-1/+1
* | Add rubocop-gitlab-security gemBrian Neel2017-08-082-3/+3
* | Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-011-2/+2
* | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-26Rémy Coutable2017-07-261-5/+6
|\ \ | |/
| * Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-251-5/+6
| |\
| | * Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-201-1/+2
| | |\
| | * | Use struct instead of hashLin Jen-Shin2017-07-201-2/+2
| | * | Use hash to return multiple objectsLin Jen-Shin2017-07-201-3/+3
| | * | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-171-0/+2
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-294-40/+78
| | |\ \ \
| | * | | | Try to report why it's failing and fix testsLin Jen-Shin2017-06-061-3/+4
* | | | | | Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-07-241-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix support for old CI API when image or services are not specifiedfix-old-ci-apiKamil Trzcinski2017-07-221-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-07-20Nick Thomas2017-07-201-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Add a new `retry` CI/CD configuration keywordGrzegorz Bizon2017-07-171-1/+2
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-07-171-0/+2
|\ \ \ \ | |/ / /
| * | | Pass before_script and script as-is preserving arrayspass-before-script-as-isKamil Trzcinski2017-07-071-0/+2
| | |/ | |/|
* | | Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-06-30Nick Thomas2017-06-301-1/+2
|\ \ \ | |/ /
| * | Fix current feature related specsTiago Botelho2017-06-281-1/+2
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream[ci ...Valery Sizov2017-06-271-9/+9
|\ \ \ | |/ /
| * | Remove references to build in pipeline chartsZ.J. van de Weg2017-06-231-4/+4
| * | Improve performance for pipeline chartsZ.J. van de Weg2017-06-231-5/+5
| * | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-13/+13
* | | Add Rubocop Style/DotPosition CopGrzegorz Bizon2017-06-211-13/+13
* | | Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-06-15Nick Thomas2017-06-151-1/+15
|\ \ \ | |/ /
| * | Refactor old formad handling in lib/ci/api/entities.rbTomasz Maczukin2017-06-121-6/+2
| * | Ensure that old API v1 generates still the same outputTomasz Maczukin2017-06-121-1/+19
* | | Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-06-121-20/+31
|\ \ \ | |/ /
View Lorry Controller Status