summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update changelogproject_consistency_with_gitlabValery Sizov2015-03-301-0/+1
|
* GitLab project consistencyValery Sizov2015-03-301-1/+1
|
* 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
| * Update changelogValery Sizov2015-03-171-0/+1
|/
* Merge branch 'update_documentation_with_new_req' into 'master'Marin Jankovski2015-03-172-11/+77
|\ | | | | | | | | | | Update installation and update documentation with nodejs dependency See merge request !138
| * Update references to 7.9 upgrade.Marin Jankovski2015-03-161-2/+2
| |
| * Update installation and update documentation with nodejs dependencyMarin Jankovski2015-03-162-11/+77
|/
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ciMarin Jankovski2015-03-162-7/+0
|\
| * Merge branch 'remove_rubyracer' into 'master'Marin Jankovski2015-03-162-7/+0
| |\ | | | | | | | | | | | | | | | Remove therubyracer gem. See merge request !137
| | * Remove therubyracer gem.Marin Jankovski2015-03-162-7/+0
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlab-ciMarin Jankovski2015-03-161-0/+30
|\ \ | |/ |/|
| * Merge pull request #561 from jpahullo/issue560Valeriy Sizov2015-03-161-0/+30
| |\ | | | | | | issue560 - added one line upgrade command
| | * issue560 - added one line upgrade commandJordi Pujol-Ahulló2015-03-151-0/+30
| |/
* | Merge branch 'brakeman' into 'master'Dmitriy Zaporozhets2015-03-116-5/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | Adding brakeman Fixes #163 See merge request !136
| * | Adding brakemanValery Sizov2015-03-116-5/+34
| | |
* | | Merge branch 'notify_based_on_pusher_email' into 'master'Dmitriy Zaporozhets2015-03-1016-46/+56
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Notify only pusher instead of commiter Fixes #161 !!! Dependent MR on GitLab - https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1630 See merge request !126