summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* webhook spec improvementValery Sizov2015-04-071-1/+14
|
* Merge branch 'master' into 'master'Valery Sizov2015-04-072-0/+2
|\ | | | | | | | | | | Add job name to hook data See merge request !50
| * Add job name to hook datassytnic2015-03-312-0/+2
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciValery Sizov2015-04-077-11/+39
|\ \
| * \ Merge branch 'hook_for_empty_projects' into 'master'Dmitriy Zaporozhets2015-04-071-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide "Test hook" button for empty projects Fixes #132 See merge request !53
| | * | Hide Test hook button for empty projectshook_for_empty_projectsValery Sizov2015-04-021-1/+2
| | | |
| * | | Merge branch 'search-runners' into 'master'Valery Sizov2015-04-035-2/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search runners in admin area Should be reviewed after !54 because based on that branch Fixes https://dev.gitlab.org/gitlab/gitlab-ci/issues/172 See merge request !55
| | * | | Search runners by token or description on admin/runners pagesearch-runnersDmitriy Zaporozhets2015-04-025-2/+27
| | | | |
| * | | | Merge branch 'improve-ui' into 'master'Valery Sizov2015-04-031-8/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ui * Separate settings tab from others in project navigation * Put webhooks and service navs together for consistency with GitLab cc @vsizov See merge request !54
| | * | | Put webhooks and service navs together for consistency with GitLabimprove-uiDmitriy Zaporozhets2015-04-021-4/+4
| | | | |
| | * | | Separate settings tab from others in project navigationDmitriy Zaporozhets2015-04-021-4/+6
| | | | |
* | | | | Merge pull request #573 from pixel-shock/deploy-jobs-with-regexValeriy Sizov2015-04-073-7/+22
|\ \ \ \ \ | |/ / / / |/| | | | Jobs checking "run_for_ref" by glob pattern
| * | | | fixed camelCase styleTino Wehe2015-04-011-2/+2
| | | | |
| * | | | Changed RegExp to glob pattern like in project settingsTino Wehe2015-04-013-26/+14
| | | | |
| * | | | fixed houndci messagesTino Wehe2015-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | - "Redundant return detected." - "Pass &:strip as an argument to map instead of a block."
| * | | | Jobs checking "run_for_ref" by RegExp nowTino Wehe2015-04-013-7/+34
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | +- increased max length of refs in db +- changed ref-check to RegExp + added method to distinguish between RegExp given or normal string + added more tests +- changed "refs" description in FrontEnd
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciDmitriy Zaporozhets2015-04-026-14/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'deploy_without_tests' into 'master'Dmitriy Zaporozhets2015-04-016-14/+28
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Deploy without tests Fixes #127 See merge request !51
| | * | refactoring of deploy job creationdeploy_without_testsValery Sizov2015-04-015-34/+24
| | | |
| | * | Deploy without testsValery Sizov2015-03-314-4/+28
| | | |
* | | | Fix CHANGELOGDmitriy Zaporozhets2015-04-021-2/+2
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciValery Sizov2015-04-012-1/+2
|\ \ \
| * \ \ Merge branch 'project_consistency_with_gitlab' into 'master'Dmitriy Zaporozhets2015-04-012-1/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Project name collision between GitLab and CI Fixes #128 and #125 See merge request !49
| | * | update changelogproject_consistency_with_gitlabValery Sizov2015-03-301-0/+1
| | | |
| | * | GitLab project consistencyValery Sizov2015-03-301-1/+1
| | |/
* | | Merge branch 'shared_runners' into 'master'Dmitriy Zaporozhets2015-03-313-1/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared_runners_enabled = false if there are assigned runners https://gitlab.com/gitlab-org/gitlab-ci/issues/129 https://dev.gitlab.org/gitlab/gitlab-ci/issues/181 https://dev.gitlab.org/gitlab/gitlab-ci/issues/182 See merge request !148
| * | Disable running on shared runnersValery Sizov2015-03-313-1/+12
|/ /
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ciValery Sizov2015-03-313-8/+32
|\ \
| * | Move contribution mention to list.Marin Jankovski2015-03-271-2/+1
| | |
| * | Merge branch 'add_setup_examples' into 'master'Sytse Sijbrandij2015-03-282-7/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | Remove the file for configuring a runner to run gitlab ce. See merge request !147
| | * | Remove the file for configuring a runner to run gitlab ce.Marin Jankovski2015-03-272-7/+3
| | | |
| * | | Merge branch 'add_setup_examples' into 'master'Sytse Sijbrandij2015-03-282-2/+31
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | Add example for setting up ruby env using the cookbook-gitlab-test. See merge request !146
| | * Add example for setting up ruby env using the cookbook-gitlab-test.Marin Jankovski2015-03-272-2/+31
| |/
* | Merge pull request #559 from jvanbaarsen/remove-deprecated-api-pointValeriy Sizov2015-03-312-87/+0
|\ \ | |/ |/| Removed deprecated API behaviour
| * Removed deprecated API behaviourJeroen van Baarsen2015-03-052-87/+0
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ciDmitriy Zaporozhets2015-03-261-0/+19
|\ \
| * | Add a troubleshooting node in the ce build exampleMarin Jankovski2015-03-261-0/+19
| | |
* | | Update schemaDmitriy Zaporozhets2015-03-261-1/+1
|/ /
* | Merge branch 'events_list' into 'master'Dmitriy Zaporozhets2015-03-2619-2/+266
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events list fixes #134 ![joxi_screenshot_1426879556641](https://dev.gitlab.org/gitlab/gitlab-ci/uploads/bf8ca0686d0a8dc5b2f7e5a3d3543208/joxi_screenshot_1426879556641.png) ![joxi_screenshot_1427122511845](https://dev.gitlab.org/gitlab/gitlab-ci/uploads/0ca6c0f82050ec181423d43be3d95780/joxi_screenshot_1427122511845.png) See merge request !141
| * | adding indeces to events tableValery Sizov2015-03-262-0/+8
| | |
| * | event pagination fixValery Sizov2015-03-261-1/+1
| | |
| * | annotate eventValery Sizov2015-03-263-4/+29
| | |
| * | specs for eventsValery Sizov2015-03-265-1/+85
| | |
| * | update changelogValery Sizov2015-03-263-2/+4
| | |
| * | added event serviceValery Sizov2015-03-263-12/+35
| | |
| * | events for adminValery Sizov2015-03-269-0/+46
| | |
| * | eventsValery Sizov2015-03-269-2/+78
|/ /
* | Merge branch 'gitlab-test-config' into 'master'Valery Sizov2015-03-261-91/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | Move runner setup instructions to cookbook We have a cookbook that automates setting up a runner for the GitLab test suite, so we should deprecate the manual instructions. See merge request !142
| * | Move runner setup instructions to cookbookJacob Vosmaer2015-03-241-91/+4
| | |
* | | Include test coverage in testsDmitriy Zaporozhets2015-03-252-1/+11
| | |
View Lorry Controller Status