Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from master(Fix conflicts) | Shinya Maeda | 2017-07-07 | 3 | -2/+85 |
|\ | |||||
| * | Basic BE change | Shinya Maeda | 2017-07-07 | 3 | -2/+85 |
* | | Remove a spec: validate_uniqueness_of for key | Shinya Maeda | 2017-07-07 | 1 | -1/+0 |
* | | merge from master | Shinya Maeda | 2017-07-07 | 3 | -8/+49 |
|\ \ | |/ | |||||
| * | Add table for merge request commits | Sean McGivern | 2017-07-06 | 1 | -1/+1 |
| * | Backports for ee-2112 | Lin Jen-Shin | 2017-07-06 | 2 | -7/+4 |
| * | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf... | Lin Jen-Shin | 2017-07-05 | 2 | -9/+21 |
| |\ | |||||
| * | | Rename ci_config_file to ci_config_path | Lin Jen-Shin | 2017-07-05 | 2 | -5/+5 |
| * | | Add back Pipeline#ci_yaml_file_path due to all the troubles | Lin Jen-Shin | 2017-07-05 | 2 | -1/+23 |
| * | | Fix config path | Lin Jen-Shin | 2017-07-04 | 1 | -1/+1 |
| * | | Follow feedback on the merge request | Lin Jen-Shin | 2017-07-04 | 1 | -23/+2 |
| * | | Introduce CI_CONFIG_PATH | Lin Jen-Shin | 2017-06-30 | 1 | -0/+11 |
| * | | Update wordings, allow only full path, add tests | Lin Jen-Shin | 2017-06-30 | 1 | -19/+7 |
| * | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf... | Lin Jen-Shin | 2017-06-30 | 2 | -39/+7 |
| |\ \ | |||||
| * | | | Fix the test and implement missing update | Lin Jen-Shin | 2017-06-28 | 1 | -2/+16 |
| * | | | Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Confi...15041-Add-Custom-CI-Config-Path | Lin Jen-Shin | 2017-06-28 | 9 | -141/+2969 |
| |\ \ \ | |||||
| * | | | | Add config option to project to allow custom .gitlab-ci.yml location | Keith Pope | 2016-10-08 | 1 | -0/+30 |
* | | | | | Improve test on spec/models/ci/pipeline_schedule_spec.rb | Shinya Maeda | 2017-07-06 | 1 | -1/+1 |
* | | | | | Revert unnecesarry changes | Shinya Maeda | 2017-07-05 | 1 | -7/+11 |
* | | | | | zj nice catchies 3 | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
* | | | | | Improve spec | Shinya Maeda | 2017-07-05 | 2 | -1/+2 |
* | | | | | Fix spec | Shinya Maeda | 2017-07-05 | 2 | -0/+5 |
* | | | | | Fix spec. Add PipelineScheduleVariable for import_export | Shinya Maeda | 2017-07-05 | 1 | -1/+3 |
* | | | | | zj nice catches | Shinya Maeda | 2017-07-05 | 3 | -14/+7 |
* | | | | | pipeline_schedule_variables model/db | Shinya Maeda | 2017-07-05 | 2 | -21/+16 |
* | | | | | Improve spec | Shinya Maeda | 2017-07-05 | 2 | -1/+2 |
* | | | | | Fix spec | Shinya Maeda | 2017-07-05 | 2 | -0/+5 |
* | | | | | Fix spec. Add PipelineScheduleVariable for import_export | Shinya Maeda | 2017-07-05 | 1 | -1/+3 |
* | | | | | zj nice catches | Shinya Maeda | 2017-07-05 | 3 | -9/+18 |
* | | | | | pipeline_schedule_variables model/db | Shinya Maeda | 2017-07-05 | 3 | -0/+25 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master' | Rémy Coutable | 2017-07-04 | 1 | -7/+11 |
|\ \ \ \ | |||||
| * | | | | fixed incorrect test case (for real), added another one | Stefan Hanreich | 2017-06-19 | 1 | -1/+2 |
| * | | | | fixed incorrect test case | Stefan Hanreich | 2017-06-19 | 1 | -1/+1 |
| * | | | | added additional test case | Stefan Hanreich | 2017-06-18 | 1 | -0/+1 |
| * | | | | remove trailing comma | Stefan Hanreich | 2017-06-18 | 1 | -1/+1 |
| * | | | | fix typo | Stefan Hanreich | 2017-06-18 | 1 | -1/+1 |
| * | | | | removed superfluos tests | Stefan Hanreich | 2017-06-18 | 1 | -7/+1 |
| * | | | | Updated spec for build to include new ref_slug invariants | Stefan Hanreich | 2017-06-18 | 1 | -8/+16 |
* | | | | | We no longer test the presence of the key | Lin Jen-Shin | 2017-06-29 | 1 | -1/+0 |
* | | | | | Merge remote-tracking branch 'upstream/master' into add-ci_variables-environm... | Lin Jen-Shin | 2017-06-29 | 2 | -32/+7 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master' | Kamil Trzciński | 2017-06-29 | 1 | -0/+6 |
| |\ \ \ \ | |||||
| | * | | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelines | Z.J. van de Weg | 2017-06-27 | 1 | -0/+6 |
| | | |_|/ | | |/| | | |||||
| * | | | | Improve small thingsfeature/sm/34314-add-hasvariable-concern | Shinya Maeda | 2017-06-28 | 1 | -1/+1 |
| * | | | | Remove PoC spec | Shinya Maeda | 2017-06-28 | 1 | -34/+0 |
| * | | | | Add a test for checking validates :key does not override by concern | Shinya Maeda | 2017-06-28 | 1 | -0/+34 |
| * | | | | Decuplin | Shinya Maeda | 2017-06-28 | 1 | -39/+1 |
| |/ / / | |||||
* | | | | Add environment_scope column to ci_variables table | Lin Jen-Shin | 2017-06-21 | 1 | -6/+8 |
|/ / / | |||||
* | | | Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master' | Kamil Trzciński | 2017-06-21 | 1 | -37/+11 |
|\ \ \ | |||||
| * | | | Move expanded_environment_url to CreateDeploymentService | Lin Jen-Shin | 2017-06-21 | 1 | -36/+0 |
| * | | | Don't expand CI_ENVIRONMENT_URL so runner would do | Lin Jen-Shin | 2017-06-21 | 1 | -3/+13 |
| |/ / |