summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'link-to-runner-section' into 'master'Dmitriy Zaporozhets2015-02-253-3/+3
|\ \ | | | | | | | | | | | | | | | Link to runner section instead of repo. See merge request !116
| * | Link to runner section instead of repo.Sytse Sijbrandij2015-02-243-3/+3
| | |
* | | Merge branch 'reset_session' into 'master'Dmitriy Zaporozhets2015-02-254-27/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset user session if token is invalid closes #148 See merge request !115
| * | | reset user session if token is invalidValery Sizov2015-02-244-27/+32
| | | |
* | | | Merge branch 'gitattributes' into 'master'Valery Sizov2015-02-241-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Merge union CHANGELOG See merge request !42
| * | | Merge union CHANGELOGKamil Trzcinski2015-02-191-0/+2
| |/ /
* | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlab-ciValeriy Sizov2015-02-192-2/+67
|\ \ \
| * \ \ Merge branch 'update-config-7-8-ci' into 'master'Marin Jankovski2015-02-182-2/+67
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Updated update and install guide Updated guides for GitLab CI to 7.8 See merge request !114
| | * | Updated install guidePatricio Cano2015-02-161-2/+2
| | | |
| | * | Update guide to 7.8Patricio Cano2015-02-161-0/+65
| |/ /
* | | Merge branch 'changelog' into 'master'Valery Sizov2015-02-191-2/+3
|\ \ \ | |/ / |/| | | | | | | | | | | Updated changelog See merge request !41
| * | Updated CHANGELOGKamil Trzcinski2015-02-191-2/+3
|/ /
* | All information from the readme was moved to the website to make it more ↵Sytse Sijbrandij2015-02-161-103/+2
| | | | | | | | accessible.
* | Merge branch 'link-job-script-examples' into 'master'Dmitriy Zaporozhets2015-02-161-2/+4
|\ \ | | | | | | | | | | | | | | | Link job script examples See merge request !113
| * | Link to example job scripts.Sytse Sijbrandij2015-02-151-2/+4
| | |
* | | Move build script examples to something that is linked from the interface ↵Sytse Sijbrandij2015-02-162-15/+27
|/ / | | | | | | and the webpage.
* | Merge branch 'update_changelog' into 'master'Marin Jankovski2015-02-131-1/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | Update changelog #150 See merge request !112
| * | update changelogValery Sizov2015-02-131-1/+7
| | |
* | | Merge branch 'fix_docs_typo' into 'master'Valery Sizov2015-02-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in docs Changed `Dependancies` to `Dependencies` See merge request !40
| * | | Fix typo in docsErnest Walzel2015-02-111-1/+1
| |/ / | | | | | | | | | 'Dependancies' -> 'Dependencies'
* | | Merge branch 'branch_wildcard_fix' into 'master'Dmitriy Zaporozhets2015-02-123-5/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Skip refs: branch wildcard fix fixes bug found here !35 See merge request !38
| * | Fix skip_refs parameter, glob pattern implementationbranch_wildcard_fixValery Sizov2015-02-113-5/+4
| | |
* | | Merge pull request #543 from michaKFromParis/patch-1Valeriy Sizov2015-02-111-1/+1
|\ \ \ | | | | | | | | Fixed typo in gitlab ci api documentation
| * | | Fixed typo in gitlab ci api documentationMichel Courtine2015-02-071-1/+1
| |/ / | | | | | | project create does not take an id as a parameter
* | | Merge pull request #547 from awiddersheim/awiddersheim-patch-1Valeriy Sizov2015-02-111-1/+1
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoAndrew Widdersheim2015-02-111-1/+1
|/ / /
* | | Revert "Implemented api for project jobs"Valery Sizov2015-02-115-206/+0
| | | | | | | | | | | | This reverts commit 0d39bfa32967c5f2794bdf30d088b74a78fd54c2.
* | | Merge branch 'feature_project_jobs_rest_api' into 'master'Valery Sizov2015-02-115-0/+206
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented project job get / post / delete through the rest api 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 tests & updated documentation http://feedback.gitlab.com/forums/176466-general/suggestions/7068630-expose-the-job-api-to-the-rest-api Keep up the good work. It's the first ruby codebase I dig into and I'm impressed by it's robustness. Congratulations! See merge request !37
| * | | Implemented api for project jobsMichel Courtine2015-02-105-0/+206
| |/ /
* | | Merge branch 'fix-turbolink-on-gitlab-links' into 'master'Valery Sizov2015-02-114-7/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable turbolink on links pointing out to GitLab server ### What does this MR do? This MR adds 'data-no-turbolink' attribute into links pointing to GitLab server. ### Are there points in the code the reviewer needs to double check? No ### Why was this MR needed? In rare cases where gitlab and CI service is installed on the same host, turbolink will be used for links between those two. This may result in corrupted css and javascript. This change is harmless for installations that do not share the domain name for GitLab and CI system - in such case, all links modified are already pointing out outside of the domain so turbolink won't handle them. ### What are the relevant issue numbers / Feature requests? I consider this a small fix, no issue has been added. See merge request !27
| * | | Disable turbolink on links pointing to gitlabBartlomiej Swiecki2015-02-054-7/+11
| |/ /
* | | 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
| |
View Lorry Controller Status