summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Hide Test hook button for empty projectshook_for_empty_projectsValery Sizov2015-04-021-1/+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
| | |
* | | Convert shared runner to specific when assing to projectDmitriy Zaporozhets2015-03-252-0/+17
| | |
* | | More tests for register build serviceDmitriy Zaporozhets2015-03-252-15/+39
| | |
* | | Merge branch 'respect-shared-runner-option' into 'master'Dmitriy Zaporozhets2015-03-254-3/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | Repect project shared runners setting See merge request !47
| * | | Repect project shared runners settingDmitriy Zaporozhets2015-03-254-3/+39
|/ / /
* | | Annotate modelsDmitriy Zaporozhets2015-03-259-12/+56
| | |
* | | Bump versionDmitriy Zaporozhets2015-03-251-1/+1
| | |
* | | Fix schema.rbDmitriy Zaporozhets2015-03-251-12/+6
| | |
* | | Merge branch 'security_fix' into 'master'Dmitriy Zaporozhets2015-03-2510-19/+58
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security fix: added is_shared parameter #176 This fix does not do anything with shared runners on gitlab.com. It means that we need to: * clear all temporary data on our shared runners * remove shared runner which are not ours Consider to put to the blog that some users might want to disable this option: ![joxi_screenshot_1427221433910](https://dev.gitlab.org/gitlab/gitlab-ci/uploads/6283b3e293d898511a3ae5667cb71774/joxi_screenshot_1427221433910.png) See merge request !143
| * | | Security fix: added is_shared parameterValery Sizov2015-03-2510-19/+58
| |/ /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciDmitriy Zaporozhets2015-03-241-0/+5
|\ \ \
| * \ \ Merge branch 'feature/edit-project-button' into 'master'Valery Sizov2015-03-211-0/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Add `Edit project` button in project view Closes #49 See merge request !46
| | * | Add `Edit project` button in project viewLoìˆc Mahieu2015-03-181-0/+5
| | | | | | | | | | | | | | | | Closes #49
* | | | Add project search at runner pageDmitriy Zaporozhets2015-03-246-2/+43
|/ / /
* | | Merge branch 'commit_belongs_to_ref' into 'master'Dmitriy Zaporozhets2015-03-2011-13/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit url with ref FIxes #162 !!! Should be merged simultaneously with https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1638 See merge request !129
| * | | improve commit routingValery Sizov2015-03-209-15/+19
| | | |
| * | | Url to commit contain ref nameValery Sizov2015-03-2010-13/+13
|/ / /
* | | Merge branch 'sorting_projects' into 'master'Valery Sizov2015-03-197-8/+40
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Projects sorting by last_commit_date Fixes #168 See merge request !140
| * | projects sorting by last_commit_dateValery Sizov2015-03-197-8/+40
|/ /
* | Update install documentation to point to 7.9.Marin Jankovski2015-03-171-2/+2
| |
* | Merge branch 'update_changelog' into 'master'Valery Sizov2015-03-171-0/+1
|\ \ | | | | | | | | | | | | | | | Update changelog See merge request !139