summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| * | | rename committer to pusherValery Sizov2015-03-1013-34/+39
| | | |
| * | | notifications: fix specValery Sizov2015-03-102-3/+4
| | | |
| * | | Notify only pusher instead of commiterValery Sizov2015-03-104-10/+14
| | | |
* | | | Merge branch 'deploy_integration_tests' into 'master'Valery Sizov2015-03-101-0/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Feature test for deploy job Fixes #164 See merge request !135
| * | | feature test for deploy jobValery Sizov2015-03-101-0/+10
| | | |
* | | | Merge branch 'deploy_build_refactoring' into 'master'Valery Sizov2015-03-103-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Rename method run_deploy_job to create_deploy_builds See merge request !134
| * | | rename method run_deploy_job to create_deploy_buildsValery Sizov2015-03-103-4/+4
|/ / /
* | | Merge branch 'text_improvements' into 'master'Valery Sizov2015-03-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | Minor text fixes See merge request !133
| * | | text fixesValery Sizov2015-03-101-2/+2
|/ / /
* | | Merge branch 'master' into 'master'Valery Sizov2015-03-102-1/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change canceled builds color Having the same color for the failed and canceled builds is not nice so I'm proposing the following change request which implement the new CSS class `.alert-disabled` and use it for canceled builds. Here is the result: ![Screen Shot 2015-03-04 at 15.40.21](https://gitlab.com/uploads/zedtux/gitlab-ci/df01775b25/Screen_Shot_2015-03-04_at_15.40.21.png) See merge request !43
| * | Change canceled builds colorGuillaume Hain2015-03-042-1/+10
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciValery Sizov2015-03-0615-13/+122
|\ \ \
| * \ \ Merge branch 'pause_runners' into 'master'Valery Sizov2015-03-0613-4/+90
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pause runners Please review and let me know what do you think. It's based on last_contact to make it simpler to merge. See merge request !45
| | * | | Allow to pause runners - when paused runner will not receive any new buildKamil Trzcinski2015-03-0613-4/+90
| | | | |
| * | | | Merge branch 'last_contact' into 'master'Valery Sizov2015-03-0610-11/+34
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | | | | | Last contact Added information about runner's last contact time. The information is updated at most once a minute to reduce database workload. See merge request !44
| | * | Added runner last contactKamil Trzcinski2015-03-0610-11/+34
| |/ /
* | | Merge branch 'improve-instructions' into 'master'Dmitriy Zaporozhets2015-03-061-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the deploy and job page instructions. /cc @valery See merge request !132
| * | | Improve the deploy and job page instructions.Sytse Sijbrandij2015-03-051-3/+3
|/ / /
* | | Merge branch 'update_example_of_ce_build_script' into 'master'Sytse Sijbrandij2015-03-061-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | Update the example of CE build script. See merge request !131
View Lorry Controller Status