summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Added random salt and hashing to oauth state parameterKamil Trzcinski2015-07-083-2/+106
| | | | | | | | | | | | This ensures that content of state is generated by CI, but doesn't prevent replay attacks on state parameter.
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciDmitriy Zaporozhets2015-07-0923-85/+296
|\ \ \
| * \ \ Merge branch 'allow-per-job-failure' into 'master'Kamil Trzciński2015-07-0814-81/+151
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to define per-job allow_failure parameter It allows to ignore status of specific build when computing status for commit YAML syntax: ```yaml rspec: script: aa allow_failure: true ``` ![Screen_Shot_2015-07-08_at_11.28.53](https://gitlab.com/gitlab-org/gitlab-ci/uploads/0af264f026cac18921aef339bcf41fe2/Screen_Shot_2015-07-08_at_11.28.53.png) /cc @vsizov @sytses See merge request !191
| | * | Allow to defined per-job allow_failure parameterallow-per-job-failureKamil Trzcinski2015-07-0814-81/+151
| | |/ | | | | | | | | | It allows to ignore status of specific job when computed for commit
| * | Merge branch 'trace_in_file' into 'master'Kamil Trzciński2015-07-0811-4/+145
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | Build trace in file https://dev.gitlab.org/gitlab/gitlab-ci/issues/272 See merge request !167
| | * spec minor fixtrace_in_fileValery Sizov2015-06-262-1/+1
| | |
| | * ad builds to gitignoreValery Sizov2015-06-251-0/+1
| | |
| | * build trace in fileValery Sizov2015-06-2510-4/+144
| | |
* | | Remove outdated screenshot.Sytse Sijbrandij2015-07-091-2/+0
| | |
* | | Improve name of build config in readme overview.Sytse Sijbrandij2015-07-081-1/+1
|/ /
* | Merge branch 'transparent-favicon' into 'master' Valery Sizov2015-07-072-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Transparent favicon Fixes #292 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !164
| * | Transparent faviconDmitriy Zaporozhets2015-07-032-0/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'dpl-doc' into 'master'Kamil Trzciński2015-07-065-0/+240
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation about the use of Dpl Please review. 1. Is that clear how to use Dpl? 2. Where the examples should be stored? 3. What should be else added? Maybe example for different provider? See merge request !170
| * | | Final touchesKamil Trzcinski2015-07-062-11/+11
| | | |
| * | | Split long linesKamil Trzcinski2015-07-063-11/+25
| | | |
| * | | Better docs structure and fixed most of grammarKamil Trzcinski2015-07-063-65/+60
| | | |
| * | | Added documentation about the use of DplKamil Trzcinski2015-07-065-0/+231
| | | |
* | | | Merge branch 'docker-doc' into 'master'Kamil Trzciński2015-07-061-0/+162
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Added information about building projects using Docker /cc @JobV See merge request !178
| * | | Final touchesdocker-docKamil Trzcinski2015-07-061-1/+1
| | | |
| * | | Docker usageKamil Trzcinski2015-07-021-18/+45
| | | |
View Lorry Controller Status