summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'contributing_spelling' into 'master'Kamil Trzciński2015-07-211-1/+1
|\
| * 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.Achilleas Pipinellis2015-07-171-1/+1
| |/
* | Merge branch 'fix_upgrader_version_detect' into 'master'Kamil Trzciński2015-07-202-8/+24
|\ \
| * | port version matching code in upgrader lib from gitlabWarren Volz2015-07-172-8/+24
| |/
* | 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 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
|\
| * 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
|\
| * 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
* | Merge branch 'encrypt-variables' into 'master'Kamil Trzciński2015-07-138-5/+82
|\ \
| * | 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
|\ \ | |/ |/|
| * 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
|\ \
| * | 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 wh...runner-linkKamil Trzcinski2015-07-102-1/+4
|/
* Merge branch 'rs-issue-214' into 'master'Kamil Trzciński2015-07-102-61/+73
|\
| * Bump coveralls versionrs-issue-214Robert Speicher2015-07-092-18/+25
| * Bump rails, jquery-rails, sprockets, sass-rails versionsRobert Speicher2015-07-092-43/+48
|/
* Merge branch 'builds-path' into 'master'Kamil Trzciński2015-07-095-10/+15
|\
| * 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
|\ \
| * | 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
* | | 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 defined per-job allow_failure parameterallow-per-job-failureKamil Trzcinski2015-07-0814-81/+151
| | |/
| * | Merge branch 'trace_in_file' into 'master'Kamil Trzciński2015-07-0811-4/+145
| |\ \ | | |/ | |/|
View Lorry Controller Status