Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'fix-gitlab-ci-url' into 'master' | Kamil Trzciński | 2015-07-20 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Point to correct GitLab CI url. | Achilleas Pipinellis | 2015-07-17 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'fix_upgrader_version_detect' into 'master' | Kamil Trzciński | 2015-07-20 | 2 | -8/+24 | |
|\ \ | ||||||
| * | | port version matching code in upgrader lib from gitlab | Warren Volz | 2015-07-17 | 2 | -8/+24 | |
| |/ | ||||||
* | | Fix CI status badge in README | Dmitriy Zaporozhets | 2015-07-19 | 1 | -2/+2 | |
|/ | ||||||
* | Version 7.13.0.rc2v7.13.0.rc2 | Valery Sizov | 2015-07-15 | 1 | -1/+1 | |
* | Merge branch 'secrets-perm' into '7-13-stable' | Valery Sizov | 2015-07-15 | 3 | -4/+3 | |
|\ | ||||||
| * | Create config/secrets.yml with 0600secrets-perm | Kamil Trzcinski | 2015-07-15 | 3 | -4/+3 | |
* | | Version 7.13.0.rc1v7.13.0.rc1 | Valery Sizov | 2015-07-14 | 1 | -1/+1 | |
|/ | ||||||
* | Merge branch 'update-docs' into 'master' | Job van der Voort | 2015-07-14 | 3 | -4/+26 | |
|\ | ||||||
| * | small update to docs | Job van der Voort | 2015-07-14 | 2 | -12/+12 | |
| * | Update documentationupdate-docs | Kamil Trzcinski | 2015-07-14 | 3 | -5/+27 | |
|/ | ||||||
* | Merge branch 'build-types' into 'master' | Kamil Trzciński | 2015-07-13 | 18 | -199/+213 | |
|\ | ||||||
| * | Fix specsbuild-types | Kamil Trzcinski | 2015-07-10 | 3 | -8/+12 | |
| * | Satisfy rubocop | Kamil Trzcinski | 2015-07-10 | 1 | -1/+1 | |
| * | Update CHANGELOG | Kamil Trzcinski | 2015-07-10 | 1 | -0/+1 | |
| * | Allow to specify flexible list of types in yaml | Kamil Trzcinski | 2015-07-10 | 16 | -200/+209 | |
* | | Merge branch 'encrypt-variables' into 'master' | Kamil Trzciński | 2015-07-13 | 8 | -5/+82 | |
|\ \ | ||||||
| * | | Fix CHANGELOG | Kamil Trzcinski | 2015-07-13 | 1 | -1/+1 | |
| * | | Use secrets.db_key_base instead of config.secret_key_base | Kamil Trzcinski | 2015-07-13 | 1 | -1/+1 | |
| * | | Fix annotations | Kamil Trzcinski | 2015-07-13 | 2 | -2/+2 | |
| * | | Added specs | Kamil Trzcinski | 2015-07-13 | 1 | -0/+44 | |
| * | | Encrypt variables with attr_encrypted | Kamil Trzcinski | 2015-07-13 | 7 | -5/+38 | |
|/ / | ||||||
* | | Merge branch 'secrets-yaml' into 'master' | Kamil Trzciński | 2015-07-13 | 7 | -11/+61 | |
|\ \ | |/ |/| | ||||||
| * | Update backup_restore.md | Kamil Trzcinski | 2015-07-13 | 1 | -0/+2 | |
| * | Add CHANGELOG entrysecrets-yaml | Kamil Trzcinski | 2015-07-10 | 1 | -0/+1 | |
| * | Fix specs | Kamil Trzcinski | 2015-07-10 | 1 | -1/+1 | |
| * | Use config/secrets.yml to store session secret and database encryption secret | Kamil Trzcinski | 2015-07-10 | 5 | -10/+57 | |
* | | Merge branch 'coverage-calc' into 'master' | Kamil Trzciński | 2015-07-10 | 2 | -6/+13 | |
|\ \ | ||||||
| * | | Fixed specs | Kamil Trzcinski | 2015-07-10 | 1 | -4/+11 | |
| * | | Use builds_without_retry to calculate average coveragecoverage-calc | Kamil Trzcinski | 2015-07-10 | 1 | -2/+2 | |
| |/ | ||||||
* | | Merge branch 'runner-link' into 'master' | Kamil Trzciński | 2015-07-10 | 2 | -1/+4 | |
|\ \ | |/ |/| | ||||||
| * | Disable link to runner if it's not assigned to specific project: fixes 404 wh...runner-link | Kamil Trzcinski | 2015-07-10 | 2 | -1/+4 | |
|/ | ||||||
* | Merge branch 'rs-issue-214' into 'master' | Kamil Trzciński | 2015-07-10 | 2 | -61/+73 | |
|\ | ||||||
| * | Bump coveralls versionrs-issue-214 | Robert Speicher | 2015-07-09 | 2 | -18/+25 | |
| * | Bump rails, jquery-rails, sprockets, sass-rails versions | Robert Speicher | 2015-07-09 | 2 | -43/+48 | |
|/ | ||||||
* | Merge branch 'builds-path' into 'master' | Kamil Trzciński | 2015-07-09 | 5 | -10/+15 | |
|\ | ||||||
| * | Make configurable builds_path in application.ymlbuilds-path | Kamil Trzcinski | 2015-07-08 | 5 | -10/+15 | |
* | | Merge branch 'secure-oauth-state' into 'master' | Kamil Trzciński | 2015-07-09 | 6 | -5/+115 | |
|\ \ | ||||||
| * | | Fix invalid spec for generate_oauth_hmacsecure-oauth-state | Kamil Trzcinski | 2015-07-08 | 1 | -2/+2 | |
| * | | Don't use return_to, but instead pass state with signed return_to parameter | Kamil Trzcinski | 2015-07-08 | 6 | -36/+42 | |
| * | | Added random salt and hashing to oauth state parameter | Kamil Trzcinski | 2015-07-08 | 3 | -2/+106 | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci | Dmitriy Zaporozhets | 2015-07-09 | 23 | -85/+296 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'allow-per-job-failure' into 'master' | Kamil Trzciński | 2015-07-08 | 14 | -81/+151 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | Allow to defined per-job allow_failure parameterallow-per-job-failure | Kamil Trzcinski | 2015-07-08 | 14 | -81/+151 | |
| | |/ | ||||||
| * | | Merge branch 'trace_in_file' into 'master' | Kamil Trzciński | 2015-07-08 | 11 | -4/+145 | |
| |\ \ | | |/ | |/| | ||||||
| | * | spec minor fixtrace_in_file | Valery Sizov | 2015-06-26 | 2 | -1/+1 | |
| | * | ad builds to gitignore | Valery Sizov | 2015-06-25 | 1 | -0/+1 | |
| | * | build trace in file | Valery Sizov | 2015-06-25 | 10 | -4/+144 | |
* | | | Remove outdated screenshot. | Sytse Sijbrandij | 2015-07-09 | 1 | -2/+0 |