summaryrefslogtreecommitdiff
path: root/spec/models/ci
Commit message (Expand)AuthorAgeFilesLines
* Merge from master(Fix conflicts)Shinya Maeda2017-07-073-2/+85
|\
| * Basic BE changeShinya Maeda2017-07-073-2/+85
* | Remove a spec: validate_uniqueness_of for keyShinya Maeda2017-07-071-1/+0
* | merge from masterShinya Maeda2017-07-073-8/+49
|\ \ | |/
| * Add table for merge request commitsSean McGivern2017-07-061-1/+1
| * Backports for ee-2112Lin Jen-Shin2017-07-062-7/+4
| * Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-052-9/+21
| |\
| * | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-052-5/+5
| * | Add back Pipeline#ci_yaml_file_path due to all the troublesLin Jen-Shin2017-07-052-1/+23
| * | Fix config pathLin Jen-Shin2017-07-041-1/+1
| * | Follow feedback on the merge requestLin Jen-Shin2017-07-041-23/+2
| * | Introduce CI_CONFIG_PATHLin Jen-Shin2017-06-301-0/+11
| * | Update wordings, allow only full path, add testsLin Jen-Shin2017-06-301-19/+7
| * | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-06-302-39/+7
| |\ \
| * | | Fix the test and implement missing updateLin Jen-Shin2017-06-281-2/+16
| * | | Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Confi...15041-Add-Custom-CI-Config-PathLin Jen-Shin2017-06-289-141/+2969
| |\ \ \
| * | | | Add config option to project to allow custom .gitlab-ci.yml locationKeith Pope2016-10-081-0/+30
* | | | | Improve test on spec/models/ci/pipeline_schedule_spec.rbShinya Maeda2017-07-061-1/+1
* | | | | Revert unnecesarry changesShinya Maeda2017-07-051-7/+11
* | | | | zj nice catchies 3Shinya Maeda2017-07-051-1/+1
* | | | | Improve specShinya Maeda2017-07-052-1/+2
* | | | | Fix specShinya Maeda2017-07-052-0/+5
* | | | | Fix spec. Add PipelineScheduleVariable for import_exportShinya Maeda2017-07-051-1/+3
* | | | | zj nice catchesShinya Maeda2017-07-053-14/+7
* | | | | pipeline_schedule_variables model/dbShinya Maeda2017-07-052-21/+16
* | | | | Improve specShinya Maeda2017-07-052-1/+2
* | | | | Fix specShinya Maeda2017-07-052-0/+5
* | | | | Fix spec. Add PipelineScheduleVariable for import_exportShinya Maeda2017-07-051-1/+3
* | | | | zj nice catchesShinya Maeda2017-07-053-9/+18
* | | | | pipeline_schedule_variables model/dbShinya Maeda2017-07-053-0/+25
| |_|_|/ |/| | |
* | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-041-7/+11
|\ \ \ \
| * | | | fixed incorrect test case (for real), added another oneStefan Hanreich2017-06-191-1/+2
| * | | | fixed incorrect test caseStefan Hanreich2017-06-191-1/+1
| * | | | added additional test caseStefan Hanreich2017-06-181-0/+1
| * | | | remove trailing commaStefan Hanreich2017-06-181-1/+1
| * | | | fix typoStefan Hanreich2017-06-181-1/+1
| * | | | removed superfluos testsStefan Hanreich2017-06-181-7/+1
| * | | | Updated spec for build to include new ref_slug invariantsStefan Hanreich2017-06-181-8/+16
* | | | | We no longer test the presence of the keyLin Jen-Shin2017-06-291-1/+0
* | | | | Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm...Lin Jen-Shin2017-06-292-32/+7
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-291-0/+6
| |\ \ \ \
| | * | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-0/+6
| | | |_|/ | | |/| |
| * | | | Improve small thingsfeature/sm/34314-add-hasvariable-concernShinya Maeda2017-06-281-1/+1
| * | | | Remove PoC specShinya Maeda2017-06-281-34/+0
| * | | | Add a test for checking validates :key does not override by concernShinya Maeda2017-06-281-0/+34
| * | | | DecuplinShinya Maeda2017-06-281-39/+1
| |/ / /
* | | | Add environment_scope column to ci_variables tableLin Jen-Shin2017-06-211-6/+8
|/ / /
* | | Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master'Kamil Trzciński2017-06-211-37/+11
|\ \ \
| * | | Move expanded_environment_url to CreateDeploymentServiceLin Jen-Shin2017-06-211-36/+0
| * | | Don't expand CI_ENVIRONMENT_URL so runner would doLin Jen-Shin2017-06-211-3/+13
| |/ /