summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix invalid link to doc.gitlab.comfix-doc-linkKamil Trzcinski2015-07-232-1/+3
|
* Merge commit 'a7d59ed9b87f24246f3907a5fe8a1b472e3fa740'Kamil Trzcinski2015-07-2321-630/+532
|\ | | | | | | | | | | * commit 'a7d59ed9b87f24246f3907a5fe8a1b472e3fa740': Fix rendering issues Rework CI documentation by adding informations about YAML, the use of Docker images and building them
| * Merge branch 'rework-docs' into 'master' Kamil Trzciński2015-07-2221-630/+532
| |\ | | | | | | | | | | | | | | | | | | Update CI documentation to include complete YAML syntax, Docker features and use of Variables covered /cc @JobV @sytses See merge request !205
| | * Fix rendering issuesrework-docsKamil Trzcinski2015-07-222-67/+72
| | |
| | * Rework CI documentation by adding informations about YAML, the use of Docker ↵Kamil Trzcinski2015-07-2221-630/+527
| |/ | | | | | | images and building them
* | Merge branch 'fix-permission-escalation' into 'master' Valery Sizov2015-07-235-6/+24
|\ \ | |/ |/| | | | | | | | | | | | | | | Fix permission escalation This fixes permission escalation as described here: https://gitlab.com/gitlab-org/gitlab-ci/issues/225 As this is security fix this commit should be cherry-picked to 7.13: https://dev.gitlab.org/gitlab/gitlab-ci/commit/02982e545744925a6ce8238ed354abdd8e6c835f See merge request !165
| * Fix: user could steal specific runnerKamil Trzcinski2015-07-225-6/+24
|/ | | | | | - check if user has manage access to project - don't cache result of authorized_projects, because it's serialised with User object - clear user sessions
* Merge branch 'contributing_spelling' into 'master'Kamil Trzciński2015-07-211-1/+1
|\ | | | | | | | | | | | | | | fix small spelling issue in CONTRIBUTING.md Fix mispelling of 'submission' in contributing doc. See merge request !201
| * correct spelling of submissionWarren Volz2015-07-161-1/+1
| |
* | Merge branch 'fix-gitlab-ci-url' into 'master'Kamil Trzciński2015-07-201-1/+1
|\ \ | | | | | | | | | | | | | | | Point to correct GitLab CI url. See merge request !202
| * | Point to correct GitLab CI url.Achilleas Pipinellis2015-07-171-1/+1
| |/
* | Merge branch 'fix_upgrader_version_detect' into 'master'Kamil Trzciński2015-07-202-8/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix upgrader version detection This ports changes from the gitlab upgrader script to gitlabci. With the changes the upgrader script now works correct with versions that contain more than 1 digit. See merge request !203
| * | port version matching code in upgrader lib from gitlabWarren Volz2015-07-172-8/+24
| |/ | | | | | | | | | | | | - fixes upgrader script not working with v7.1x versions - rspec test cases from gitlab for upgrader lib - rename gitlab to gitlabci - use real data for gitlabci3 version check
* | Fix CI status badge in READMEDmitriy Zaporozhets2015-07-191-2/+2
|/
* Version 7.13.0.rc2v7.13.0.rc2Valery Sizov2015-07-151-1/+1
|
* Merge branch 'secrets-perm' into '7-13-stable'Valery Sizov2015-07-153-4/+3
|\ | | | | | | | | | | Create config/secrets.yml with 0600 See merge request !200
| * Create config/secrets.yml with 0600secrets-permKamil Trzcinski2015-07-153-4/+3
| |
* | Version 7.13.0.rc1v7.13.0.rc1Valery Sizov2015-07-141-1/+1
|/
* Merge branch 'update-docs' into 'master'Job van der Voort2015-07-143-4/+26
|\ | | | | | | | | | | | | | | Update install and update documentation for 7.13 @JobV Please push directly to this branch and merge if ok. See merge request !199
| * small update to docsJob van der Voort2015-07-142-12/+12
| |
| * Update documentationupdate-docsKamil Trzcinski2015-07-143-5/+27
|/
* Merge branch 'build-types' into 'master'Kamil Trzciński2015-07-1318-199/+213
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to specify flexible list of types in yaml First part of flexible pipeline build in GitLab CI Having following `.gitlab-ci.yml`: ``` types: - test - deploy - notify rspec: script: "rspec" rubocop: script: "rubocop" staging: type: deploy script: "echo deploy" only: - master production: type: deploy script: "echo production" only: - tags dockerhub: type: notify script: "curl http://docker/hub/web/hook" downstream: type: notify script: "curl http://build/downstream/jobs" ``` GitLab CI will trigger two test jobs in parallel, when finished it will trigged either staging or production, when finished it will trigger dockerhub and downstream in parallel. The UI (screenshots are not for above YAML): ![Screen_Shot_2015-07-10_at_15.56.26](https://gitlab.com/gitlab-org/gitlab-ci/uploads/1f714b73772cf0d44168fb8e20e35561/Screen_Shot_2015-07-10_at_15.56.26.png) ![Screen_Shot_2015-07-10_at_15.57.19](https://gitlab.com/gitlab-org/gitlab-ci/uploads/fc9f458f2ca517d923a4382466fa99eb/Screen_Shot_2015-07-10_at_15.57.19.png) TODO: - [x] Implement in CI - [x] Specs - [x] Changelog - [x] CI tests - [ ] Documentation /cc @vsizov @sytses @dzaporozhets See merge request !198
| * Fix specsbuild-typesKamil Trzcinski2015-07-103-8/+12
| |
| * Satisfy rubocopKamil Trzcinski2015-07-101-1/+1
| |
| * Update CHANGELOGKamil Trzcinski2015-07-101-0/+1
| |
| * Allow to specify flexible list of types in yamlKamil Trzcinski2015-07-1016-200/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` types: - test - deploy - notify rspec: script: "rspec" rubocop: script: "rubocop" staging: type: deploy script: "echo deploy" only: - master production: type: deploy script: "echo production" only: - tags dockerhub: type: notify script: "curl http://docker/hub/web/hook" downstream: type: notify script: "curl http://build/downstream/jobs" ``` This will trigger two test jobs in parallel, when finished it will trigged either staging or production, when finished it will trigger dockerhub and downstream in parallel.
* | Merge branch 'encrypt-variables' into 'master'Kamil Trzciński2015-07-138-5/+82
|\ \ | | | | | | | | | | | | | | | | | | | | | Encrypt variables /cc @dzaporozhets @jacobvosmaer @vsizov See merge request !187
| * | Fix CHANGELOGKamil Trzcinski2015-07-131-1/+1
| | |
| * | Use secrets.db_key_base instead of config.secret_key_baseKamil Trzcinski2015-07-131-1/+1
| | |
| * | Fix annotationsKamil Trzcinski2015-07-132-2/+2
| | |
| * | Added specsKamil Trzcinski2015-07-131-0/+44
| | |
| * | Encrypt variables with attr_encryptedKamil Trzcinski2015-07-137-5/+38
|/ /
* | Merge branch 'secrets-yaml' into 'master'Kamil Trzciński2015-07-137-11/+61
|\ \ | |/ |/| | | | | | | | | | | | | | | Use config/secrets.yml to store session secret and database encryption secret I took the approach that config/secrets.yml is generated when key is not found. /cc @vsizov @jacobvosmaer See merge request !195
| * Update backup_restore.mdKamil Trzcinski2015-07-131-0/+2
| |
| * Add CHANGELOG entrysecrets-yamlKamil Trzcinski2015-07-101-0/+1
| |
| * Fix specsKamil Trzcinski2015-07-101-1/+1
| |
| * Use config/secrets.yml to store session secret and database encryption secretKamil Trzcinski2015-07-105-10/+57
| |
* | Merge branch 'coverage-calc' into 'master'Kamil Trzciński2015-07-102-6/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | Use builds_without_retry to calculate average coverage /cc @vsizov See merge request !197
| * | Fixed specsKamil Trzcinski2015-07-101-4/+11
| | |
| * | Use builds_without_retry to calculate average coveragecoverage-calcKamil Trzcinski2015-07-101-2/+2
| |/
* | Merge branch 'runner-link' into 'master'Kamil Trzciński2015-07-102-1/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | Disable link to runner if it's not assigned to specific project Fixes 404 when clicking on available runner from project's page /cc @vsizov See merge request !196
| * Disable link to runner if it's not assigned to specific project: fixes 404 ↵runner-linkKamil Trzcinski2015-07-102-1/+4
|/ | | | when clicking on available runner from project's page
* Merge branch 'rs-issue-214' into 'master'Kamil Trzciński2015-07-102-61/+73
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gem version updates ### Bump rails, jquery-rails, sprockets, sass-rails versions Addresses security advisories: - https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY - https://groups.google.com/forum/#!topic/ruby-security-ann/gcUbICUmKMc --- ### Bump coveralls version Addresses security issues in its rest-client dependencies: - https://github.com/rest-client/rest-client/issues/369 - http://www.osvdb.org/show/osvdb/117461 Closes #214 See merge request !194
| * Bump coveralls versionrs-issue-214Robert Speicher2015-07-092-18/+25
| | | | | | | | | | | | | | Addresses security issues in its rest-client dependencies: - https://github.com/rest-client/rest-client/issues/369 - http://www.osvdb.org/show/osvdb/117461
| * Bump rails, jquery-rails, sprockets, sass-rails versionsRobert Speicher2015-07-092-43/+48
|/ | | | | | | Addresses security advisories: - https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY - https://groups.google.com/forum/#!topic/ruby-security-ann/gcUbICUmKMc
* Merge branch 'builds-path' into 'master'Kamil Trzciński2015-07-095-10/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Make configurable builds_path in application.yml We have a new option in `application.yml`: ``` gitlab_ci: builds_path: builds/ ``` /cc @marin @vsizov See merge request !193
| * Make configurable builds_path in application.ymlbuilds-pathKamil Trzcinski2015-07-085-10/+15
| |
* | Merge branch 'secure-oauth-state' into 'master'Kamil Trzciński2015-07-096-5/+115
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added random salt and hashing to oauth state parameter This ensures signs state parameter. The generated state is built like this: ``` salt = random_hex(16bytes) secret = sha256_hex(gitlab_ci_secret + salt + return_to) state = "salt:secret:return_to" ``` This prevents from faking the state and forcing redirect to provided URL. However this doesn't prevent replay attacks if you know the valid `state` parameter for specific `return_to`. Should we be concerned about it? /cc @vsizov @jacobvosmaer See merge request !192
| * | Fix invalid spec for generate_oauth_hmacsecure-oauth-stateKamil Trzcinski2015-07-081-2/+2
| | |
| * | Don't use return_to, but instead pass state with signed return_to parameterKamil Trzcinski2015-07-086-36/+42
| | |
View Lorry Controller Status