summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| * | | Update the example of CE build script.Marin Jankovski2015-03-051-4/+6
|/ / /
* | | Merge branch 'api_correction' into 'master'Valery Sizov2015-03-051-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | API correction (runner removing) See merge request !130
| * | api correction (runner removing)Valery Sizov2015-03-051-2/+2
|/ /
* | Update db/schemaDmitriy Zaporozhets2015-03-041-1/+1
| |
* | Update poltergeistDmitriy Zaporozhets2015-03-042-7/+7
| |
* | Fix 500 on runners pageDmitriy Zaporozhets2015-03-041-2/+2
| |
* | Write test for 500 error on runners pageDmitriy Zaporozhets2015-03-041-0/+3
| |
* | Merge branch 'scroll-btns' into 'master'Dmitriy Zaporozhets2015-03-043-1/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add up/down scroll buttons For easier navigation from mobile devices cc @valery See merge request !127
| * | Update CHANGELOGDmitriy Zaporozhets2015-03-041-0/+1
| | |
| * | Add up/down scroll buttonsDmitriy Zaporozhets2015-03-042-1/+20
| | | | | | | | | | | | For easier navigation from mobile devices
* | | Merge branch 'service_creator' into 'master'Valery Sizov2015-03-043-2/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Initialize services Fixes https://gitlab.com/gitlab-org/gitlab-ci/issues/106 See merge request !125
| * | Initialize servicesValery Sizov2015-03-043-2/+12
|/ /
* | fix random failing specValery Sizov2015-03-041-1/+1
| |
* | Merge branch 'jobs_tabs' into 'master'Dmitriy Zaporozhets2015-03-0415-44/+195
|\ \ | |/ |/| | | | | | | | | | | | | | | Deploy jobs Implements #153 ![joxi_screenshot_1425465268516](https://dev.gitlab.org/gitlab/gitlab-ci/uploads/23960cfff46ac6c7d1d0ded528917306/joxi_screenshot_1425465268516.png) See merge request !124
| * remove bindingValery Sizov2015-03-041-2/+0
| |
| * update changelogValery Sizov2015-03-021-1/+2
| |
| * Deploy jobsValery Sizov2015-03-0214-44/+196
| |
* | Merge branch 'token_instruction_page' into 'master'Dmitriy Zaporozhets2015-03-031-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | Token instruction page: improve with url Fixes #156 See merge request !119
| * | token instruction page: improve with urlValery Sizov2015-03-031-1/+3
| |/
* | Fix changelogValeriy Sizov2015-03-031-3/+3
| |
* | Merge pull request #553 from jvanbaarsen/fix-295Valeriy Sizov2015-03-032-1/+8
|\ \ | | | | | | Only update trace when trace is given
| * | Only update trace when trace is givenJeroen van Baarsen2015-02-282-1/+8
| | | | | | | | | | | | | | | | | | Fixes #295 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge pull request #558 from qqshfox/patch-1Valeriy Sizov2015-03-031-2/+2
|\ \ \ | | | | | | | | Fix coverage for a commit having more than one build
| * | | Fix coverage for a commit having more than one buildHanfei Shen2015-03-021-2/+2
| | | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlab-ciValery Sizov2015-03-0315-70/+100
|\ \ \ \
| * \ \ \ Merge pull request #556 from jvanbaarsen/rails-upgradeDmitriy Zaporozhets2015-03-0215-70/+100
| |\ \ \ \ | | |/ / / | |/| | | Upgrade to rails 4.1.9
| | * | | Upgrade to rails 4.1.9Jeroen van Baarsen2015-02-2815-70/+100
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciValery Sizov2015-03-0318-23/+349
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'feature_project_jobs_rest_api-1' into 'master'Valery Sizov2015-03-035-15/+265
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented api for project jobs with working tests and updated doc The rest API allows you to manipulate a project on gitlab-ci but there is no way to manipulate build jobs through the api. I tested it, implemented truly working tests & updated documentation http://feedback.gitlab.com/forums/176466-general/suggestions/7068630-expose-the-job-api-to-the-rest-api See merge request !39
| | * | | Fixed test for the projects jobs apiMichel Courtine2015-02-241-4/+12
| | | | |
| | * | | project jobs api: exposed active, build_branches, build_tags, tags. ↵Michel Courtine2015-02-124-4/+30
| | | | | | | | | | | | | | | | | | | | Implemented tests and updated documentation