Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Build registering fix"7-12-stable_revert | Valery Sizov | 2015-07-03 | 4 | -37/+9 |
| | | | | This reverts commit 891a003c7f85bd99a4401a1abce5d9cb2cd98891. | ||||
* | Version 7.12.1v7.12.1 | Jacob Vosmaer | 2015-07-01 | 1 | -1/+1 |
| | |||||
* | Merge branch 'only_section_to_stable' into '7-12-stable' | Jacob Vosmaer | 2015-06-29 | 3 | -2/+14 |
|\ | | | | | | | | | | | Fix list of branches in only section See merge request !175 | ||||
| * | fix list of branches in only section | Valery Sizov | 2015-06-29 | 3 | -2/+14 |
|/ | |||||
* | Merge branch 'update_doc' into '7-12-stable' | Jacob Vosmaer | 2015-06-29 | 3 | -3/+115 |
|\ | | | | | | | | | | | Update documentation See merge request !169 | ||||
| * | update documentationupdate_doc | Valery Sizov | 2015-06-26 | 3 | -3/+115 |
|/ | |||||
* | Merge branch 'update_changelog' into '7-12-stable' | Jacob Vosmaer | 2015-06-26 | 1 | -7/+5 |
|\ | | | | | | | | | | | update changelog See merge request !168 | ||||
| * | update changelog | Valery Sizov | 2015-06-26 | 1 | -7/+5 |
|/ | |||||
* | Merge branch 'to_stable' into '7-12-stable' | Jacob Vosmaer | 2015-06-25 | 11 | -8/+51 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From master to stable Here is presented: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/161 https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/162 https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/163 https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/164 See merge request !165 | ||||
| * | spec fix | Valery Sizov | 2015-06-25 | 1 | -11/+0 |
| | | |||||
| * | warning when .gitlab-ci.yml not found | Valery Sizov | 2015-06-25 | 5 | -3/+35 |
| | | | | | | | | | | Conflicts: spec/features/commits_spec.rb | ||||
| * | improved lint stability | Valery Sizov | 2015-06-25 | 5 | -3/+18 |
| | | |||||
| * | update webhook example | Valery Sizov | 2015-06-25 | 2 | -1/+4 |
| | | |||||
| * | update changelog | Valery Sizov | 2015-06-25 | 1 | -0/+4 |
| | | |||||
| * | lint relative path | Valery Sizov | 2015-06-25 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'upstream_to_stable' into '7-12-stable' | Jacob Vosmaer | 2015-06-23 | 4 | -9/+39 |
|\ | | | | | | | | | | | Upstream to stable See merge request !157 | ||||
| * | Build registering fix | Valery Sizov | 2015-06-23 | 4 | -9/+39 |
|/ | |||||
* | Version 7.12.0v7.12.0 | Jacob Vosmaer | 2015-06-22 | 1 | -1/+1 |
| | |||||
* | Fix: show builds for public users | Valery Sizov | 2015-06-22 | 2 | -2/+4 |
| | |||||
* | Merge branch 'master' into '7-12-stable' | Valery Sizov | 2015-06-19 | 8 | -73/+36 |
|\ | | | | | | | | | | | Master to 7-12-stable See merge request !153 | ||||
| * | Merge branch 'better_yaml_validation_step2' into 'master' | Valery Sizov | 2015-06-19 | 8 | -73/+36 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yaml refactoring and fixes This refactoring also fixes some bugs with validation. https://dev.gitlab.org/gitlab/gitlab-ci/issues/281 See merge request !152 | ||||
| | * | yaml refactoring | Valery Sizov | 2015-06-19 | 8 | -73/+36 |
| |/ | |||||
* | | Version 7.12.0.rc3v7.12.0.rc3 | Jacob Vosmaer | 2015-06-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into '7-12-stable' | Valery Sizov | 2015-06-18 | 1 | -5/+9 |
|\ \ | |/ | | | | | | | | | Upstream to stable See merge request !151 | ||||
| * | Merge branch 'yaml_generator_fix' into 'master' | Valery Sizov | 2015-06-18 | 1 | -5/+9 |
| |\ | | | | | | | | | | | | | | | | Job to Yaml migrator: `only` section fix See merge request !150 | ||||
| | * | yaml migrator: only section | Valery Sizov | 2015-06-18 | 1 | -5/+9 |
| |/ | |||||
* | | Merge branch 'master_to-7_12_stable' into '7-12-stable' | Valery Sizov | 2015-06-18 | 5 | -11/+36 |
|\ \ | | | | | | | | | | | | | | | | Master to 7-12 stable See merge request !161 | ||||
| * \ | Merge branch 'master' into master_to-7_12_stable | Valery Sizov | 2015-06-18 | 5 | -11/+36 |
| |\ \ |/ / / | | _ | |||||
| * | Merge branch 'extend_yaml_generator' into 'master' | Valery Sizov | 2015-06-18 | 1 | -3/+13 |
| |\ | | | | | | | | | | | | | | | | skip_refs to each jobs See merge request !149 | ||||
| | * | skip_refs to each jobs | Valery Sizov | 2015-06-18 | 1 | -3/+13 |
| |/ | |||||
| * | Merge branch 'doc_ci_skip' into 'master' | Valery Sizov | 2015-06-18 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | | | | Added note about [ci skip] to doc See merge request !148 | ||||
| | * | added note about [ci skip] to doc | Valery Sizov | 2015-06-18 | 1 | -0/+3 |
| |/ | |||||
| * | Merge branch 'doc_examples' into 'master' | Valery Sizov | 2015-06-18 | 3 | -8/+20 |
| |\ | | | | | | | | | | | | | | | | Update documantation See merge request !147 | ||||
| | * | update changelog | Valery Sizov | 2015-06-18 | 1 | -0/+1 |
| | | | |||||
| | * | update documentation | Valery Sizov | 2015-06-18 | 2 | -8/+19 |
| |/ | |||||
* | | Merge branch 'master_to_7.12-stable' into '7-12-stable' | Valery Sizov | 2015-06-17 | 14 | -50/+150 |
|\ \ | | | | | | | | | | | | | | | | Master to 7.12 stable See merge request !146 | ||||
| * \ | Merge branch 'master' into master_to_7.12-stable | Valery Sizov | 2015-06-17 | 14 | -50/+150 |
| |\ \ |/ / / | | _ | |||||
| * | code style | Valery Sizov | 2015-06-17 | 2 | -6/+2 |
| | | |||||
| * | Merge branch 'web_editor_link' into 'master' | Valery Sizov | 2015-06-17 | 3 | -0/+14 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Link to webeditor with .gitlab-ci.yml https://dev.gitlab.org/gitlab/gitlab-ci/issues/265 See merge request !145 | ||||
| | * | update changelog | Valery Sizov | 2015-06-17 | 1 | -0/+1 |
| | | | |||||
| | * | Link to webeditor with .gitlab-ci.yml | Valery Sizov | 2015-06-17 | 2 | -0/+13 |
| |/ | |||||
| * | Merge branch 'api_fix' into 'master' | Valery Sizov | 2015-06-17 | 3 | -3/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Fix API: create project https://gitlab.com/gitlab-org/gitlab-ci/issues/168 See merge request !144 | ||||
| | * | fix API: project create | Valery Sizov | 2015-06-17 | 3 | -3/+4 |
| |/ | |||||
| * | Merge branch 'rails_update' into 'master' | Valery Sizov | 2015-06-17 | 3 | -27/+28 |
| |\ | | | | | | | | | | | | | | | | Rails update to 4.1.11 See merge request !143 | ||||
| | * | rails update | Valery Sizov | 2015-06-17 | 3 | -27/+28 |
| |/ | |||||
| * | Merge branch 'better_yaml_validation' into 'master' | Dmitriy Zaporozhets | 2015-06-17 | 6 | -11/+102 |
| |\ | | | | | | | | | | | | | | | | Better yaml validation See merge request !160 | ||||
| | * | better yaml validation | Valery Sizov | 2015-06-17 | 6 | -11/+102 |
| | | | |||||
| * | | Merge branch 'fix_migration_builds' into 'master' | Valery Sizov | 2015-06-17 | 1 | -4/+1 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Prevent job_id removing I would prefer to keep field job_id in the builds table. It will allow us much room for manoeuvre. Of course it is not the best practice to change migration because it can lead to different database states for users but we will remove this filed soon anyway. We will need to put condition there if this field exist. See merge request !142 | ||||
| | * | Prevent job_id removing | Valery Sizov | 2015-06-17 | 1 | -4/+1 |
| |/ | |||||
* | | Version 7.12.0.rc2v7.12.0.rc2 | Jacob Vosmaer | 2015-06-16 | 1 | -1/+1 |
| | |