Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow Project#skip_refs to accept & match regexallow_regex_for_project_skip_ref | Andrew Ang | 2015-02-04 | 3 | -2/+25 |
| | | | | | | * Added rspec tests for #skip_ref? * Allow regex matching * Added hints on Project form | ||||
* | Merge branch 'runner_api_description' into 'master' | Valery Sizov | 2015-02-04 | 3 | -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 description | Kamil Trzcinski | 2015-01-28 | 3 | -4/+4 |
| | | |||||
* | | Update CHANGELOG with 5.4.2 | Dmitriy Zaporozhets | 2015-01-29 | 1 | -0/+3 |
|/ | |||||
* | Merge branch 'tag_list' into 'master' | Valery Sizov | 2015-01-28 | 3 | -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 registration | Kamil Trzcinski | 2015-01-27 | 3 | -2/+16 |
| | | |||||
* | | Merge branch 'doc_update' into 'master' | Valery Sizov | 2015-01-27 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | Doc update See merge request !111 | ||||
| * | | fix doc | Valery Sizov | 2015-01-27 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'doc_update' into 'master' | Valery Sizov | 2015-01-27 | 2 | -5/+24 |
|\ \ \ | |/ / | | | | | | | | | | | | | Documentation update See merge request !110 | ||||
| * | | updated install&update guides | Valery Sizov | 2015-01-27 | 2 | -5/+24 |
|/ / | |||||
* | | Merge branch 'b98-doc-callback' into 'master' | Valery Sizov | 2015-01-27 | 1 | -1/+4 |
|\ \ | |/ |/| | | | | | | | #98 Updated documentation with callback URL details. See merge request !33 | ||||
| * | Fixes #98. Updated documentation with callback URL details. | Aleks Bunin | 2015-01-27 | 1 | -1/+4 |
|/ | |||||
* | Update CHANGELOG with new version | Dmitriy Zaporozhets | 2015-01-26 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci | Dmitriy Zaporozhets | 2015-01-26 | 2 | -10/+23 |
|\ | |||||
| * | Merge branch 'redesign-services' into 'master' | Valery Sizov | 2015-01-25 | 2 | -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 services | Kamil Trzcinski | 2015-01-24 | 2 | -10/+23 |
| |/ | | | | | | | | | | | Taken from: - a6bdf7d8769c1726084f42a510b6aed097fffbf2 - 5e98293b0e21a7fd9d62ce7272afef31b8414abb | ||||
* | | GitLab CI has same version as GitLab since now. So it is 7.8.0.pre | Dmitriy Zaporozhets | 2015-01-26 | 2 | -3/+9 |
|/ | |||||
* | Add CI project url to project advanced settings | Dmitriy Zaporozhets | 2015-01-23 | 1 | -0/+4 |
| | |||||
* | Refactor help text and remove integration page | Dmitriy Zaporozhets | 2015-01-23 | 7 | -76/+58 |
| | |||||
* | Improve setup CI instructions | Dmitriy Zaporozhets | 2015-01-23 | 4 | -9/+24 |
| | |||||
* | Make add new project more obvious | Dmitriy Zaporozhets | 2015-01-23 | 1 | -1/+1 |
| | |||||
* | Reduce amount clicks for login | Dmitriy Zaporozhets | 2015-01-23 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ci | Dmitriy Zaporozhets | 2015-01-23 | 10 | -9/+22 |
|\ | |||||
| * | Merge branch 'api_doc_fix' into 'master' | Valery Sizov | 2015-01-24 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | Api doc fix See merge request !109 | ||||
| | * | fix API doc | Valery Sizov | 2015-01-23 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci | Valery Sizov | 2015-01-23 | 5 | -6/+14 |
| |\ | |||||
| | * | Merge branch 'fix-oauth-redirect-urls' into 'master' | Valery Sizov | 2015-01-23 | 2 | -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 urls | Bartlomiej Swiecki | 2015-01-23 | 2 | -3/+4 |
| | | | | |||||
| | * | | Merge branch 'slack-notification-fix' into 'master' | Valery Sizov | 2015-01-23 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed broken can_test for Slack notifications Small bug I noticed during e-mail notifications rework See merge request !29 | ||||
| | | * | | Fixed Slack notifications | Kamil Trzcinski | 2015-01-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'receive-hostname' into 'master' | Valery Sizov | 2015-01-23 | 2 | -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 description | Kamil Trzcinski | 2015-01-23 | 2 | -2/+9 |
| | | |/ | |||||
| * | | | Merge branch 'disable_retry_for_old_build' into 'master' | Dmitriy Zaporozhets | 2015-01-24 | 4 | -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 builds | Valery Sizov | 2015-01-23 | 4 | -2/+7 |
| |/ / | |||||
* | | | Make login more user-friendly | Dmitriy Zaporozhets | 2015-01-23 | 3 | -1/+14 |
| | | | |||||
* | | | Move add job button to right | Dmitriy Zaporozhets | 2015-01-23 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'update_doc' into 'master' | Dmitriy Zaporozhets | 2015-01-23 | 1 | -1/+14 |
|\ \ | | | | | | | | | | | | | | | | Added OAuth2 section to update doc See merge request !107 | ||||
| * | | added oauth section to update doc | Valery Sizov | 2015-01-23 | 1 | -1/+14 |
| |/ | |||||
* | | Fix Build#trace | Dmitriy Zaporozhets | 2015-01-23 | 1 | -1/+1 |
| | | |||||
* | | Dont expose CI project token in build trace | Dmitriy Zaporozhets | 2015-01-23 | 3 | -5/+7 |
|/ | |||||
* | Update changelog for 5.4.1 | Dmitriy Zaporozhets | 2015-01-23 | 1 | -1/+9 |
| | |||||
* | Merge branch 'slack-specs-typo' into 'master' | Valery Sizov | 2015-01-23 | 1 | -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 specs | Kamil Trzcinski | 2015-01-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ci | Valery Sizov | 2015-01-22 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | Make sure test env use localhost:80 | Dmitriy Zaporozhets | 2015-01-22 | 1 | -0/+4 |
| | | |||||
* | | added missed authorize | Valery Sizov | 2015-01-22 | 1 | -0/+1 |
|/ | |||||
* | Build page is visible for other people | Dmitriy Zaporozhets | 2015-01-22 | 5 | -16/+21 |
| | |||||
* | Merge branch 'schema' into 'master' | Valery Sizov | 2015-01-23 | 1 | -1/+13 |
|\ | | | | | | | | | | | Schema update See merge request !106 | ||||
| * | update schema | Valery Sizov | 2015-01-22 | 1 | -1/+13 |
| | | |||||
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ci | Dmitriy Zaporozhets | 2015-01-22 | 22 | -10/+717 |
|\ \ | |/ |