summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed project settings testsproject-settingsPhil Hughes2016-05-201-1/+1
* Project settings UI updatePhil Hughes2016-05-206-323/+273
* Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher2016-05-1922-98/+314
|\
| * Use migration helper to prevent downtime migrationfeature/runner-config-untagged-jobsGrzegorz Bizon2016-05-191-8/+10
| * Minor runner-related code refactoringsGrzegorz Bizon2016-05-194-21/+22
| * Rename method that validates runner tag constrainsGrzegorz Bizon2016-05-191-2/+2
| * Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-192-11/+17
| * Add minor corrections related to config of runnerGrzegorz Bizon2016-05-194-7/+6
| * Improve setting default runner attrs when using APIGrzegorz Bizon2016-05-191-2/+5
| * Move runner validator to separate private methodGrzegorz Bizon2016-05-191-6/+10
| * Use form errors helper in CI runner edit formGrzegorz Bizon2016-05-191-4/+1
| * Add not null constraint to run untagged runner optionGrzegorz Bizon2016-05-192-2/+2
| * Set run untagged option when registering a runnerGrzegorz Bizon2016-05-192-12/+38
| * Refactor CI API specs for creating runnerGrzegorz Bizon2016-05-191-17/+29
| * Add docs for a new configuration setting for runnerGrzegorz Bizon2016-05-191-1/+7
| * Extend runner options that are configurable via APIGrzegorz Bizon2016-05-193-5/+13
| * Add Changelog entry for new runner configurationGrzegorz Bizon2016-05-191-0/+1
| * Add method that check if build has tagsGrzegorz Bizon2016-05-192-3/+17
| * Extend CI runners specsGrzegorz Bizon2016-05-191-1/+31
| * Improve displaying validation messages for runnerGrzegorz Bizon2016-05-193-4/+13
| * Update specs to be valid only for tagged runnerGrzegorz Bizon2016-05-191-9/+13
| * Add custom validator to runner modelGrzegorz Bizon2016-05-192-1/+9
| * Add CI API tests for runner config and untagged jobsGrzegorz Bizon2016-05-191-0/+32
| * Disallow runner to pick untagged build if configuredGrzegorz Bizon2016-05-192-11/+31
| * Extend runner config options for untagged jobsGrzegorz Bizon2016-05-195-35/+51
| * Add form for runner config to run untagged jobsGrzegorz Bizon2016-05-191-0/+6
| * Add runner db field for ability to run untagged jobsGrzegorz Bizon2016-05-192-0/+12
* | Merge branch 'fix-ci-commit-creation' into 'master' Rémy Coutable2016-05-193-10/+24
|\ \
| * | Fix creation of Ci::Commit object which can lead to pending, failed in some s...Kamil Trzcinski2016-05-193-10/+24
* | | Merge branch 'fix-generator-templates-directory' into 'master' Jeroen van Baarsen2016-05-194-2/+4
|\ \ \
| * | | Updated Rubocop for generator_templates/fix-generator-templates-directoryYorick Peterse2016-05-191-1/+1
| * | | Move generator templates to generator_templates/Yorick Peterse2016-05-193-1/+3
* | | | Merge branch 'create-todo-on-failing-build' into 'master' Douwe Maan2016-05-1915-33/+237
|\ \ \ \
| * | | | Create a todo on failing MR buildSean McGivern2016-05-1715-33/+237
* | | | | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-1913-63/+135
|\ \ \ \ \
| * | | | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-1713-63/+135
* | | | | | Merge branch 'fix/after-script-documentation-update' into 'master' Jeroen van Baarsen2016-05-191-1/+1
|\ \ \ \ \ \
| * | | | | | Update 'after_script' introduction notefix/after-script-documentation-updateTomasz Maczukin2016-05-181-1/+1
* | | | | | | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-1932-100/+671
|\ \ \ \ \ \ \
| * | | | | | | Create pipeline objects with parameterswith-pipeline-viewKamil Trzcinski2016-05-184-11/+9
| * | | | | | | Use pipelines.errors when communicating the errorKamil Trzcinski2016-05-184-31/+41
| * | | | | | | Wrap textKamil Trzcinski2016-05-161-1/+0
| * | | | | | | Improve the pipeline boxKamil Trzcinski2016-05-163-12/+39
| * | | | | | | Fix spinach testsKamil Trzcinski2016-05-161-2/+2
| * | | | | | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-16118-749/+1814
| |\ \ \ \ \ \ \
| * | | | | | | | Improve design of commit_box with status of builds and pipelinesKamil Trzcinski2016-05-163-29/+37
| * | | | | | | | Improve the pipelines designKamil Trzcinski2016-05-168-17/+21
| * | | | | | | | Add method new_pipelineKamil Trzcinski2016-05-141-4/+6
| * | | | | | | | Remove testing delegateKamil Trzcinski2016-05-142-3/+2
| * | | | | | | | Fix spinach testsKamil Trzcinski2016-05-142-2/+2
View Lorry Controller Status