summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | added oauth section to update docValery Sizov2015-01-231-1/+14
| |/
* | Fix Build#traceDmitriy Zaporozhets2015-01-231-1/+1
| |
* | Dont expose CI project token in build traceDmitriy Zaporozhets2015-01-233-5/+7
|/
* Update changelog for 5.4.1Dmitriy Zaporozhets2015-01-231-1/+9
|
* Merge branch 'slack-specs-typo' into 'master'Valery Sizov2015-01-231-1/+1
|\ | | | | | | | | | | | | | | Slack specs typo Fixes failed test introduced by https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/14#note_766148 See merge request !25
| * Fixed typo in slack message specsKamil Trzcinski2015-01-231-1/+1
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ciValery Sizov2015-01-221-0/+4
|\ \ | |/
| * Make sure test env use localhost:80Dmitriy Zaporozhets2015-01-221-0/+4
| |
* | added missed authorizeValery Sizov2015-01-221-0/+1
|/
* Build page is visible for other peopleDmitriy Zaporozhets2015-01-225-16/+21
|
* Merge branch 'schema' into 'master'Valery Sizov2015-01-231-1/+13
|\ | | | | | | | | | | Schema update See merge request !106
| * update schemaValery Sizov2015-01-221-1/+13
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ciDmitriy Zaporozhets2015-01-2222-10/+717
|\ \ | |/
| * Merge branch 'topic/settings' into 'master'Valery Sizov2015-01-2221-1/+706
| |\ | | | | | | | | | | | | | | | | | | | | | Settings enhancements with services transplantation As discussed here: https://gitlab.com/gitlab-org/gitlab-ci/issues/68 and here https://gitlab.com/gitlab-org/gitlab-ci/issues/63 this is implementation of Services backported from GitLab. As proof of concept Slack Service is implemented. What is missing here is the specs for services and some design choices described in first issue. See merge request !14
| | * Added Service and SlackService specsKamil Trzcinski2015-01-127-55/+243
| | |
| | * Added Slack notification serviceKamil Trzcinski2015-01-129-37/+145
| | | | | | | | | | | | - Send notification at once for all commits
| | * Added missing create serviceKamil Trzcinski2015-01-127-101/+78
| | |
| | * Transplanted project notifications from GitLabKamil Trzcinski2015-01-1214-1/+433
| | |
| * | Change the name of GitLab runner and link to the Omnibus package.Sytse Sijbrandij2015-01-221-9/+11
| | |