Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add link to MS for setting up multitenancyck-azure-ad-multitenancy | Chenjerai Katanda | 2018-05-09 | 1 | -0/+2 |
* | Merge branch '46010-runner-type-not-null' into 'master' | Kamil Trzciński | 2018-05-09 | 5 | -2/+15 |
|\ | |||||
| * | Add validation Ci::Runner runner_type must be present | Dylan Griffith | 2018-05-09 | 2 | -0/+2 |
| * | Add DB constraint ci_runners.runner_type not null | Dylan Griffith | 2018-05-09 | 3 | -2/+13 |
* | | Merge branch 'fix-ide-empty-editor' into 'master' | Filipa Lacerda | 2018-05-09 | 4 | -3/+25 |
|\ \ | |||||
| * | | added specs | Phil Hughes | 2018-05-09 | 2 | -0/+20 |
| * | | Fixed empty editors in the IDE | Phil Hughes | 2018-05-09 | 2 | -3/+5 |
* | | | Merge branch '10-8-dependencies-update' into 'master' | James Lopez | 2018-05-09 | 1 | -162/+234 |
|\ \ \ | |||||
| * | | | Update the dependencies license list | Filipa Lacerda | 2018-05-09 | 1 | -162/+234 |
| |/ / | |||||
* | | | Merge branch '10-8-update-gitignore' into 'master' | James Lopez | 2018-05-09 | 12 | -15/+27 |
|\ \ \ | |||||
| * | | | Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates | Filipa Lacerda | 2018-05-09 | 12 | -15/+27 |
| |/ / | |||||
* | | | Merge branch 'cherry-pick-7b8d754e-ce' into 'master' | Grzegorz Bizon | 2018-05-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Adjust spec to build correct path when storage path ends in slash | Douwe Maan | 2018-05-09 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'blackst0ne-fix-downtime-check-job' into 'master' | Douwe Maan | 2018-05-09 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Fix `downtime_check` job | blackst0ne | 2018-05-09 | 1 | -0/+2 |
* | | | | Merge branch 'docs-document-redirect-to' into 'master' | Achilleas Pipinellis | 2018-05-09 | 1 | -0/+13 |
|\ \ \ \ | |||||
| * | | | | document the redirect_to method | Marcia Ramos | 2018-05-07 | 1 | -0/+13 |
* | | | | | Merge branch 'docs-add-descriptions' into 'master' | Achilleas Pipinellis | 2018-05-09 | 15 | -4/+48 |
|\ \ \ \ \ | |||||
| * | | | | | Docs: add custom descriptions to most relevant docs | Marcia Ramos | 2018-05-09 | 15 | -4/+48 |
|/ / / / / | |||||
* | | | | | Align with EE | Lin Jen-Shin | 2018-05-09 | 1 | -3/+3 |
* | | | | | Merge branch '10244-group-runner-docs' into 'master' | Achilleas Pipinellis | 2018-05-09 | 1 | -3/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Capitalize runner in a couple more places | Dylan Griffith | 2018-05-08 | 1 | -2/+2 |
| * | | | | | Add simple docs for group runners | Dylan Griffith | 2018-05-08 | 1 | -1/+12 |
| * | | | | | Fix typo in runner docs | Dylan Griffith | 2018-05-08 | 1 | -1/+1 |
* | | | | | | Merge branch '45819_update_container_scanning_gitlab_ci_config_doc' into 'mas... | Achilleas Pipinellis | 2018-05-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Updates Clair Container scanning GitLab CI configuration | Gilbert Roulot | 2018-05-08 | 1 | -1/+1 |
* | | | | | | Merge branch '46115-i18n-for-group-runner-pages' into 'master' | Filipa Lacerda | 2018-05-09 | 9 | -20/+147 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Add more i18n for runner pages | Dylan Griffith | 2018-05-09 | 9 | -20/+147 |
| |/ / / / | |||||
* | | | | | Merge branch '23465-print-markdown' into 'master' | Phil Hughes | 2018-05-09 | 2 | -1/+12 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Remove sidebar, flash container, and URLs from print pages | Annabel Dunstone Gray | 2018-05-08 | 2 | -1/+12 |
* | | | | | Merge branch 'add-runner-type-to-cluster-app' into 'master' | Grzegorz Bizon | 2018-05-09 | 2 | -3/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Set `runner_type` for cluster/application | Kamil Trzciński | 2018-05-09 | 2 | -3/+10 |
* | | | | | Merge branch 'blackst0ne-replace-spinach-project-ff-merge-requests.feature' i... | Robert Speicher | 2018-05-08 | 7 | -133/+87 |
|\ \ \ \ \ | |||||
| * | | | | | Replace the `project/ff_merge_requests.feature` spinach test with an rspec an... | blackst0ne | 2018-05-08 | 7 | -133/+87 |
|/ / / / / | |||||
* | | | | | Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into '... | Stan Hu | 2018-05-08 | 5 | -6/+32 |
|\ \ \ \ \ | |||||
| * | | | | | Update Gitaly version to 0.99.0 | Douglas Barbosa Alexandre | 2018-05-07 | 1 | -1/+1 |
| * | | | | | Add CHANGELOG | Douglas Barbosa Alexandre | 2018-05-07 | 1 | -0/+6 |
| * | | | | | Raise InvalidRepository error for non-valid git repositories | Douglas Barbosa Alexandre | 2018-05-07 | 3 | -5/+25 |
* | | | | | | Merge branch '46010-add-missing-parens' into 'master' | Kamil Trzciński | 2018-05-08 | 2 | -25/+25 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add some missing parens in project_spec and runner_spec | Dylan Griffith | 2018-05-08 | 2 | -25/+25 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'update-asset-sync' into 'master' | Robert Speicher | 2018-05-08 | 2 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Update asset_sync ~> 2.2.0 to ~> 2.4 | Pirate Praveen | 2018-05-05 | 2 | -4/+4 |
* | | | | | | Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master' | Robert Speicher | 2018-05-08 | 2 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Cleanly handle plural name for ghost user migration | Olivier Gonzalez | 2018-05-07 | 2 | -3/+3 |
* | | | | | | | Merge branch 'fix/gb/add-pipeline-builds-foreign-key' into 'master' | Kamil Trzciński | 2018-05-08 | 4 | -0/+74 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reduce scope of orphaned builds to be removed | Grzegorz Bizon | 2018-05-08 | 1 | -1/+1 |
| * | | | | | | | Remove orphaned builds without project / pipeline reference | Grzegorz Bizon | 2018-05-08 | 2 | -3/+8 |
| * | | | | | | | Add changelog for pipeline build foreign key | Grzegorz Bizon | 2018-05-08 | 2 | -1/+5 |
| * | | | | | | | Add database foreign key between pipelines and builds | Grzegorz Bizon | 2018-05-08 | 3 | -0/+65 |
* | | | | | | | | Merge branch 'dz-squash-old-migrations' into 'master' | Douwe Maan | 2018-05-08 | 86 | -1136/+335 |
|\ \ \ \ \ \ \ \ |