summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update annotationsannotationsKamil Trzcinski2015-07-0615-30/+87
|
* Merge branch 'docker-image' into 'master'Kamil Trzciński2015-07-0612-24/+189
|\ | | | | | | | | | | | | | | | | | | | | | | Added support for image and services in YAML - [x] Prepare changes for GitLab CI - [x] Prepare documentation (70% done): https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/178 - [x] Prepare GitLab Runner - changes are pushed to bleeding edge /cc @vsizov See merge request !181
| * Added annotationsKamil Trzcinski2015-07-063-0/+3
| |
| * Added support for image and servicesKamil Trzcinski2015-07-0612-24/+186
|/
* Merge branch 'access_token' into 'master'Kamil Trzciński2015-07-063-8/+11
|\ | | | | | | | | | | | | | | Remove old sessions in order to force a new access_token access /cc @vsizov @jacobvosmaer See merge request !188
| * Fix db/schemaKamil Trzcinski2015-07-061-2/+2
| |
| * Remove old sessions in order to force a new access_token accessKamil Trzcinski2015-07-062-6/+9
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciJacob Vosmaer2015-07-0313-50/+43
|\
| * Merge branch 'oauth_everywhere' into 'master'Dmitriy Zaporozhets2015-07-0213-50/+43
| |\ | | | | | | | | | | | | | | | Refactoring: Get rid of private_token usage in the frontend See merge request !185
| | * Get rid of private message usageoauth_everywhereValery Sizov2015-07-0213-50/+43
| |/
* | Add 7.12.2 CHANGELOG entriesJacob Vosmaer2015-07-031-0/+3
|/
* Merge branch 'coverage' into 'master'Valery Sizov2015-07-012-3/+3
|\ | | | | | | | | | | | | | | Rounded coverage on commit page https://dev.gitlab.org/gitlab/gitlab-ci/issues/312 See merge request !184
| * Rounded coverage on commit pageValery Sizov2015-07-012-3/+3
|/
* Merge branch 'favicon' into 'master'Valery Sizov2015-06-302-0/+1
|\ | | | | | | | | | | | | | | Change favicon https://dev.gitlab.org/gitlab/gitlab-ci/issues/292 See merge request !183
| * change faviconValery Sizov2015-06-302-0/+1
|/
* Merge branch 'redirect_back_after_auth' into 'master'Valery Sizov2015-06-303-3/+5
|\ | | | | | | | | | | | | | | Redirect back after authorization https://dev.gitlab.org/gitlab/gitlab-ci/issues/287 See merge request !182
| * satisfy rubocopValery Sizov2015-06-301-1/+1
| |
| * Redirect back after authorizationValery Sizov2015-06-303-3/+5
|/
* update changelogValery Sizov2015-06-301-0/+1
|
* Merge branch 'yaml-validation' into 'master'Valery Sizov2015-06-302-37/+36
|\ | | | | | | | | | | | | | | Enhance YAML validation /cc @vsizov See merge request !180
| * Enhance YAML validationKamil Trzcinski2015-06-302-37/+36
|/
* Merge branch 'update_nokogiri' into 'master'Valery Sizov2015-06-301-3/+3
|\ | | | | | | | | | | | | | | | | | | Update nokogiri version to remove warnings about libxml version mismatch. GitLab [is using this version of nokogiri](https://gitlab.com/gitlab-org/gitlab-ce/blob/7-12-stable/Gemfile.lock#L378-379) too. The difference between current version and latest version is in multiple security and bug fixes as well as some features, see [their changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.rdoc). Reason why I've created this MR is that upgrading to 1.6.6.2 removes warnings about libxml version mismatch when running ci rake tasks in omnibus as shown here: gitlab-org/omnibus-gitlab#636 . See merge request !179
| * Update nokogiri version to remove warnings about libxml version mismatch.Marin Jankovski2015-06-301-3/+3
|/
* Merge branch 'status_badge' into 'master'Valery Sizov2015-06-292-1/+3
|\ | | | | | | | | | | | | | | Build status Badge: unable to obtain code https://dev.gitlab.org/gitlab/gitlab-ci/issues/304 See merge request !177
| * Fix status badgeValery Sizov2015-06-292-1/+3
|/
* Merge branch 'better_yaml_validation2' into 'master'Valery Sizov2015-06-296-7/+30
|\ | | | | | | | | | | | | | | Improved validation of .gitlab-ci.yml https://dev.gitlab.org/gitlab/gitlab-ci/issues/305 See merge request !176
| * Improved validation of .gitlab-ci.ymlValery Sizov2015-06-296-7/+30
|/
* Merge branch 'only_section' into 'master'Valery Sizov2015-06-293-2/+14
|\ | | | | | | | | | | | | | | Fix list of branches in only section https://gitlab.com/gitlab-org/gitlab-ci/issues/195 See merge request !174
| * fix list of branches in only sectionValery Sizov2015-06-293-2/+14
|/
* coverage minor fixValery Sizov2015-06-261-1/+1
|
* Merge branch 'coverage_fix' into 'master'Valery Sizov2015-06-263-2/+29
|\ | | | | | | | | | | Fix coverage colcalation on the commit page See merge request !171
| * fix coverage calculation on commit pageValery Sizov2015-06-263-2/+29
| |
* | Merge branch 'rake_env' into 'master'Valery Sizov2015-06-262-0/+69
|\ \ | |/ |/| | | | | | | | | | | Implemented rake env:info https://dev.gitlab.org/gitlab/gitlab-ci/issues/298 See merge request !172
| * update changelogValery Sizov2015-06-262-1/+2
| |
| * implemented rake env:infoValery Sizov2015-06-261-0/+68
|/
* update documentatioonValery Sizov2015-06-263-3/+3
|
* update changelogValery Sizov2015-06-261-5/+6
|
* Merge branch 'silent_rake' into 'master'Jacob Vosmaer2015-06-252-0/+11
|\ | | | | | | | | | | | | | | Disable colors in rake tasks automatically https://gitlab.com/gitlab-org/gitlab-ci/issues/164/ See merge request !166
| * update changelogValery Sizov2015-06-251-0/+1
| |
| * silent rake backup for CRONValery Sizov2015-06-251-0/+10
|/
* cleaning up specsValery Sizov2015-06-251-2/+0
|
* Merge branch 'show_warning_about_yaml' into 'master'Valery Sizov2015-06-245-3/+26
|\ | | | | | | | | | | | | | | | | | | Warning when .gitlab-ci.yml not found https://dev.gitlab.org/gitlab/gitlab-ci/issues/295 ![joxi_screenshot_1435155049429](https://gitlab.com/gitlab-org/gitlab-ci/uploads/83e34bba9bb7cb69d0fc663ee1077605/joxi_screenshot_1435155049429.png) See merge request !164
| * warning when .gitlab-ci.yml not foundValery Sizov2015-06-245-3/+26
|/
* Merge branch 'commit_not_found_error' into 'master'Valery Sizov2015-06-243-2/+33
|\ | | | | | | | | | | | | | | | | | | Explicit error when commit not found !!! SHOULD BE MERGED WITH https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/871 https://dev.gitlab.org/gitlab/gitlab-ci/issues/280 See merge request !159
| * not_found status of commitValery Sizov2015-06-243-2/+33
|/
* Merge branch 'lint_improve' into 'master'Valery Sizov2015-06-245-3/+18
|\ | | | | | | | | | | | | | | Improved lint stability https://dev.gitlab.org/gitlab/gitlab-ci/issues/294 See merge request !163
| * improved lint stabilityValery Sizov2015-06-245-3/+18
| |
* | Merge branch 'cancel_commit' into 'master'Dmitriy Zaporozhets2015-06-246-1/+26
|\ \ | |/ |/| | | | | | | | | | | | | | | Ability to cancel all builds in the commit at once https://dev.gitlab.org/gitlab/gitlab-ci/issues/289 ![joxi_screenshot_1435066221235](https://gitlab.com/gitlab-org/gitlab-ci/uploads/c7a74956d05a86f40097c64ce5b2b2c3/joxi_screenshot_1435066221235.png) See merge request !160
| * Ability to cancel all builds in the commit at onceValery Sizov2015-06-246-1/+26
| |
* | Merge branch 'webhook_update' into 'master'Valery Sizov2015-06-242-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update webhook example https://dev.gitlab.org/gitlab/gitlab-ci/issues/297 https://gitlab.com/gitlab-org/gitlab-ci/issues/181 See merge request !162
View Lorry Controller Status