summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure Ci::Runner#assign_to errors for group runnerscorrect-runner-type-when-assigning-shared-to-projectDylan Griffith2018-05-102-7/+22
* Ensure runner_type is updated correctly when assigning shared runner to projectDylan Griffith2018-05-102-1/+6
* Merge branch 'support-active-setting-while-registering-a-runner' into 'master'Kamil Trzciński2018-05-093-1/+30
|\
| * Add CHANGELOG entryTomasz Maczukin2018-05-091-0/+5
| * Support 'active' setting on Runner Registration API endpointTomasz Maczukin2018-05-092-1/+25
* | Merge branch '46003-fix-node-10-compatibility' into 'master'Mike Greiling2018-05-091-23/+2
|\ \
| * | bump upath dependency to a version compatible with node 10Mike Greiling2018-05-091-23/+2
* | | Merge branch '46010-runner-type-not-null' into 'master'Kamil Trzciński2018-05-095-2/+15
|\ \ \
| * | | Add validation Ci::Runner runner_type must be presentDylan Griffith2018-05-092-0/+2
| * | | Add DB constraint ci_runners.runner_type not nullDylan Griffith2018-05-093-2/+13
* | | | Merge branch 'fix-ide-empty-editor' into 'master'Filipa Lacerda2018-05-094-3/+25
|\ \ \ \
| * | | | added specsPhil Hughes2018-05-092-0/+20
| * | | | Fixed empty editors in the IDEPhil Hughes2018-05-092-3/+5
* | | | | Merge branch '10-8-dependencies-update' into 'master'James Lopez2018-05-091-162/+234
|\ \ \ \ \
| * | | | | Update the dependencies license listFilipa Lacerda2018-05-091-162/+234
| |/ / / /
* | | | | Merge branch '10-8-update-gitignore' into 'master'James Lopez2018-05-0912-15/+27
|\ \ \ \ \
| * | | | | Update the .gitignore, .gitlab-ci.yml, and Dockerfile templatesFilipa Lacerda2018-05-0912-15/+27
| |/ / / /
* | | | | Merge branch 'cherry-pick-7b8d754e-ce' into 'master'Grzegorz Bizon2018-05-091-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Adjust spec to build correct path when storage path ends in slashDouwe Maan2018-05-091-1/+1
| | |/ / | |/| |
* | | | Merge branch 'blackst0ne-fix-downtime-check-job' into 'master'Douwe Maan2018-05-091-0/+2
|\ \ \ \
| * | | | Fix `downtime_check` jobblackst0ne2018-05-091-0/+2
* | | | | Merge branch 'docs-document-redirect-to' into 'master'Achilleas Pipinellis2018-05-091-0/+13
|\ \ \ \ \
| * | | | | document the redirect_to methodMarcia Ramos2018-05-071-0/+13
* | | | | | Merge branch 'docs-add-descriptions' into 'master'Achilleas Pipinellis2018-05-0915-4/+48
|\ \ \ \ \ \
| * | | | | | Docs: add custom descriptions to most relevant docsMarcia Ramos2018-05-0915-4/+48
|/ / / / / /
* | | | | | Align with EELin Jen-Shin2018-05-091-3/+3
* | | | | | Merge branch '10244-group-runner-docs' into 'master'Achilleas Pipinellis2018-05-091-3/+14
|\ \ \ \ \ \
| * | | | | | Capitalize runner in a couple more placesDylan Griffith2018-05-081-2/+2
| * | | | | | Add simple docs for group runnersDylan Griffith2018-05-081-1/+12
| * | | | | | Fix typo in runner docsDylan Griffith2018-05-081-1/+1
* | | | | | | Merge branch '45819_update_container_scanning_gitlab_ci_config_doc' into 'mas...Achilleas Pipinellis2018-05-091-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Updates Clair Container scanning GitLab CI configurationGilbert Roulot2018-05-081-1/+1
* | | | | | | Merge branch '46115-i18n-for-group-runner-pages' into 'master'Filipa Lacerda2018-05-099-20/+147
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add more i18n for runner pagesDylan Griffith2018-05-099-20/+147
| |/ / / / /
* | | | | | Merge branch '23465-print-markdown' into 'master'Phil Hughes2018-05-092-1/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove sidebar, flash container, and URLs from print pagesAnnabel Dunstone Gray2018-05-082-1/+12
* | | | | | Merge branch 'add-runner-type-to-cluster-app' into 'master'Grzegorz Bizon2018-05-092-3/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Set `runner_type` for cluster/applicationKamil Trzciński2018-05-092-3/+10
* | | | | | Merge branch 'blackst0ne-replace-spinach-project-ff-merge-requests.feature' i...Robert Speicher2018-05-087-133/+87
|\ \ \ \ \ \
| * | | | | | Replace the `project/ff_merge_requests.feature` spinach test with an rspec an...blackst0ne2018-05-087-133/+87
|/ / / / / /
* | | | | | Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into '...Stan Hu2018-05-085-6/+32
|\ \ \ \ \ \
| * | | | | | Update Gitaly version to 0.99.0Douglas Barbosa Alexandre2018-05-071-1/+1
| * | | | | | Add CHANGELOGDouglas Barbosa Alexandre2018-05-071-0/+6
| * | | | | | Raise InvalidRepository error for non-valid git repositoriesDouglas Barbosa Alexandre2018-05-073-5/+25
* | | | | | | Merge branch '46010-add-missing-parens' into 'master'Kamil Trzciński2018-05-082-25/+25
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add some missing parens in project_spec and runner_specDylan Griffith2018-05-082-25/+25
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'update-asset-sync' into 'master'Robert Speicher2018-05-082-4/+4
|\ \ \ \ \ \
| * | | | | | Update asset_sync ~> 2.2.0 to ~> 2.4Pirate Praveen2018-05-052-4/+4
* | | | | | | Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master'Robert Speicher2018-05-082-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Cleanly handle plural name for ghost user migrationOlivier Gonzalez2018-05-072-3/+3