summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'services-notice' into 'master'Valery Sizov2015-02-111-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Added notice splash when updating services Continuation of https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/30 See merge request !36
| * | Added notice splash when updating servicesKamil Trzcinski2015-02-091-1/+1
|/ /
* | Merge pull request #540 from lutuh/masterValeriy Sizov2015-02-041-0/+3
|\ \ | | | | | | Add test coverage parsing example for pytest-cov
| * | Add test coverage parsing example for pytest-covLucas Eisenzimmer2015-02-041-0/+3
| | |
* | | Merge branch 'master' of github.com:gitlabhq/gitlab-ciValery Sizov2015-02-042-2/+2
|\ \ \ | |_|/ |/| |
| * | Merge pull request #534 from dblessing/upgrade_raindropsValeriy Sizov2015-02-041-1/+1
| |\ \ | | | | | | | | Upgrade raindrops gem
| | * | Upgrade raindrops gemDrew Blessing2015-01-281-1/+1
| | | |
| * | | Merge pull request #538 from lowstz/lowstz-patch-1Valeriy Sizov2015-02-041-1/+1
| |\ \ \ | | |_|/ | |/| | Update index.html.haml
| | * | Update index.html.hamlZhanpeng Chen2015-02-041-1/+1
| |/ /
* | | Merge branch 'topic/settings-email' into 'master'Valery Sizov2015-02-0413-124/+324
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate E-mail notification to Services menu As discussed earlier e-mail notifications lives now under Services menu. Let me know if this is right direction. I think now that maybe I shouldn't migrate email_add_committer and email_recipients to MailService and instead use parameters from Project. What guys do you think? Tests results are here: https://semaphoreapp.com/ayufan/gitlab-ci/branches/topic-settings-email See merge request !30
| * | | Fixed testsKamil Trzcinski2015-01-294-15/+138
| | | |
| * | | Migrate E-mail notification to ServicesKamil Trzcinski2015-01-2910-71/+148
| | | |
* | | | Merge branch 'allow_regex_for_project_skip_ref' into 'master'Valery Sizov2015-02-043-2/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Project#skip_refs to accept & match regex Added support to allow regex in the skip refs attribute on the Project model. See merge request !35
| * | | | Allow Project#skip_refs to accept & match regexallow_regex_for_project_skip_refAndrew Ang2015-02-043-2/+25
|/ / / / | | | | | | | | | | | | | | | | | | | | * Added rspec tests for #skip_ref? * Allow regex matching * Added hints on Project form
* | | | Merge branch 'runner_api_description' into 'master'Valery Sizov2015-02-043-4/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Rename hostname to description in Runner's API Continuation of: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/28 See merge request !34
| * | | Rename hostname in Runner's API to descriptionKamil Trzcinski2015-01-283-4/+4
| |/ /
* | | Update CHANGELOG with 5.4.2Dmitriy Zaporozhets2015-01-291-0/+3
|/ /
* | Merge branch 'tag_list' into 'master'Valery Sizov2015-01-283-2/+16
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | Allow to receive tag_list from Runner This enables CI to receive tag_list from Runner's during registration. Test results are here: https://semaphoreapp.com/ayufan/gitlab-ci/branches/tag_list This MR requires gitlab-org/gitlab-ci-runner!11 See merge request !32
| * Allow runner to pass tag_list during registrationKamil Trzcinski2015-01-273-2/+16
| |
* | Merge branch 'doc_update' into 'master'Valery Sizov2015-01-271-2/+2
|\ \ | | | | | | | | | | | | | | | Doc update See merge request !111
| * | fix docValery Sizov2015-01-271-2/+2
| | |
* | | Merge branch 'doc_update' into 'master'Valery Sizov2015-01-272-5/+24
|\ \ \ | |/ / | | | | | | | | | | | | Documentation update See merge request !110
| * | updated install&update guidesValery Sizov2015-01-272-5/+24
|/ /
* | Merge branch 'b98-doc-callback' into 'master'Valery Sizov2015-01-271-1/+4
|\ \ | |/ |/| | | | | | | #98 Updated documentation with callback URL details. See merge request !33
| * Fixes #98. Updated documentation with callback URL details.Aleks Bunin2015-01-271-1/+4
|/
* Update CHANGELOG with new versionDmitriy Zaporozhets2015-01-261-2/+2
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciDmitriy Zaporozhets2015-01-262-10/+23
|\
| * Merge branch 'redesign-services' into 'master'Valery Sizov2015-01-252-10/+23
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign services I'm just copycat here, but it looks really nice. ![Screen Shot 2015-01-24 at 12.14.02](https://gitlab.com/uploads/ayufan/gitlab-ci/c5cf8c4f75/Screen_Shot_2015-01-24_at_12.14.02.png) See merge request !31
| | * Redesign servicesKamil Trzcinski2015-01-242-10/+23
| |/ | | | | | | | | | | Taken from: - a6bdf7d8769c1726084f42a510b6aed097fffbf2 - 5e98293b0e21a7fd9d62ce7272afef31b8414abb
* | GitLab CI has same version as GitLab since now. So it is 7.8.0.preDmitriy Zaporozhets2015-01-262-3/+9
|/
* Add CI project url to project advanced settingsDmitriy Zaporozhets2015-01-231-0/+4
|
* Refactor help text and remove integration pageDmitriy Zaporozhets2015-01-237-76/+58
|
* Improve setup CI instructionsDmitriy Zaporozhets2015-01-234-9/+24
|
* Make add new project more obviousDmitriy Zaporozhets2015-01-231-1/+1
|
* Reduce amount clicks for loginDmitriy Zaporozhets2015-01-232-2/+2
|
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ciDmitriy Zaporozhets2015-01-2310-9/+22
|\
| * Merge branch 'api_doc_fix' into 'master'Valery Sizov2015-01-241-1/+1
| |\ | | | | | | | | | | | | | | | Api doc fix See merge request !109
| | * fix API docValery Sizov2015-01-231-1/+1
| |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciValery Sizov2015-01-235-6/+14
| |\
| | * Merge branch 'fix-oauth-redirect-urls' into 'master'Valery Sizov2015-01-232-3/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix OAuth redirect URLs with GitLab using relative_url ### What does this MR do? This MR fixes URLs used for oauth authentication - current implementation will only with with GitLab instance if it does not use relative_url. ### Are there points in the code the reviewer needs to double check? No ### Why was this MR needed? In case of relative_url GitLab installation, OAuth links were removing the relative path part. It was caused by incorrect configuration of OAuth2::Client class. ### What are the relevant issue numbers / Feature requests? I couldn't find any related issue See merge request !26
| | | * Fix oauth redurect urlsBartlomiej Swiecki2015-01-232-3/+4
| | | |
| | * | Merge branch 'slack-notification-fix' into 'master'Valery Sizov2015-01-231-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed broken can_test for Slack notifications Small bug I noticed during e-mail notifications rework See merge request !29
| | | * | Fixed Slack notificationsKamil Trzcinski2015-01-241-1/+1
| | | | |
| | * | | Merge branch 'receive-hostname' into 'master'Valery Sizov2015-01-232-2/+9
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Receive hostname Coordinator consumes Runner's hostname and uses it's as a description during registration. This MR is required to make it work: https://gitlab.com/gitlab-org/gitlab-ci-runner/merge_requests/10 See merge request !28
| | | * | Use hostname as default runner's descriptionKamil Trzcinski2015-01-232-2/+9
| | | |/
| * | | Merge branch 'disable_retry_for_old_build' into 'master'Dmitriy Zaporozhets2015-01-244-2/+7
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Disable retry for old build https://gitlab.com/gitlab-org/gitlab-ci/issues/87 See merge request !108
| | * | disable retry button for old buildsValery Sizov2015-01-234-2/+7
| |/ /
* | | Make login more user-friendlyDmitriy Zaporozhets2015-01-233-1/+14
| | |
* | | Move add job button to rightDmitriy Zaporozhets2015-01-231-2/+2
|/ /
* | Merge branch 'update_doc' into 'master'Dmitriy Zaporozhets2015-01-231-1/+14
|\ \ | | | | | | | | | | | | | | | Added OAuth2 section to update doc See merge request !107
View Lorry Controller Status