summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix the redirection of workflow/protected_branches.mddocs/fix-redirectAchilleas Pipinellis2018-05-041-1/+1
* Merge branch 'inform-the-user-when-there-are-no-project-import-options-availa...Rémy Coutable2018-05-043-48/+61
|\
| * Move import project pane to a separate partialGeorge Tsiolis2018-05-042-48/+52
| * Inform the user when there are no project import options availableGeorge Tsiolis2018-05-042-0/+9
* | Merge branch 'winh-vue-templates-docs' into 'master'Filipa Lacerda2018-05-041-2/+6
|\ \
| * | Clarify location of Vue templatesWinnie Hellmann2018-05-041-2/+6
* | | Merge branch '36762-reconcile-project-templates-with-auto-devops' into 'master'Kamil Trzciński2018-05-045-3/+8
|\ \ \
| * | | Resolve "Reconcile project templates with Auto DevOps"Fabio Busatto2018-05-045-3/+8
|/ / /
* | | Merge branch 'feature/runner-per-group' into 'master'Kamil Trzciński2018-05-0438-184/+1031
|\ \ \
| * | | Make add_index_to_namespaces_runners_token migration reversibleDylan Griffith2018-05-041-1/+7
| * | | Fix constants in backfill_runner_type_for_ci_runners_post_migrate.rbDylan Griffith2018-05-031-4/+4
| * | | Use smallint for runner_type since its an enumDylan Griffith2018-05-032-2/+2
| * | | Dont remove duplicates in Runner.owned_or_shared since its not necessaryDylan Griffith2018-05-031-1/+4
| * | | Remove unnecessary disable transaction in add_ci_runner_namespacesDylan Griffith2018-05-031-2/+0
| * | | Split migration to add and index namespaces.runners_tokenDylan Griffith2018-05-033-10/+16
| * | | Revert "Use factory in specs for ProjectCiCdSettings"Dylan Griffith2018-05-032-11/+7
| * | | Order builds by id instead of created_at in RegisterJobServiceDylan Griffith2018-05-031-2/+2
| * | | Fix Project#group_runners_enabled as it was doing nothingDylan Griffith2018-05-034-14/+28
| * | | Use factory in specs for ProjectCiCdSettingsDylan Griffith2018-05-032-7/+11
| * | | Extract constants in 20180430143705_backfill_runner_type_for_ci_runners_post_...Dylan Griffith2018-05-031-2/+5
| * | | Add comment in _runner.html.haml about hacky runner type checkDylan Griffith2018-05-031-1/+1
| * | | Remove Runner#belonging_to_any_project since this is no longer neededDylan Griffith2018-05-033-18/+0
| * | | Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-03414-5982/+11363
| |\ \ \
| * | | | Make assertions about runner_type in spec/requests/api/runner_spec.rbDylan Griffith2018-05-031-4/+9
| * | | | Style improvements to spec/models/project_spec.rbDylan Griffith2018-05-031-2/+13
| * | | | More style improvements to spec/models/ci/runner_spec.rbDylan Griffith2018-05-031-41/+40
| * | | | Style changes to spec/models/ci/runner_spec.rbDylan Griffith2018-05-031-35/+35
| * | | | Again fix db/schema.rb for ci_runner_namespacesDylan Griffith2018-05-031-1/+1
| * | | | Fix db/schema.rb for add_foreign_key ci_runner_namespaces namespace_idDylan Griffith2018-05-031-1/+1
| * | | | Rename RunnerGroup -> RunnerNamespaceDylan Griffith2018-05-028-38/+40
| * | | | Rename Runner#invalidate_build_cache -> Runner#pick_buildDylan Griffith2018-05-023-5/+5
| * | | | Fix spec/features/admin/admin_runners_spec.rb + test style improvementsDylan Griffith2018-05-013-14/+20
| * | | | Simplify AddCiRunnerGroups migrationDylan Griffith2018-05-012-12/+8
| * | | | Remove N+1 query from app/views/projects/runners/_runner.html.hamlDylan Griffith2018-05-011-1/+1
| * | | | Use group_type? where possible during transition periodDylan Griffith2018-05-014-5/+5
| * | | | Remove unnecessary API specs for group runners since we do not have API suppo...Dylan Griffith2018-04-301-78/+1
| * | | | Remove API changes for assigning group runner to projectDylan Griffith2018-04-301-1/+0
| * | | | Introduce Project#all_runners and use in Ci::UpdateBuildQueueServiceDylan Griffith2018-04-302-12/+7
| * | | | Remove redundant scopes in Ci::RegisterJobService#builds_for_group_runnerDylan Griffith2018-04-301-1/+1
| * | | | Revert changes to User#ci_authorized_users to defer group runner API changes ...Dylan Griffith2018-04-302-67/+15
| * | | | Start persisting runner_type when creating runnersDylan Griffith2018-04-305-4/+40
| * | | | Add changelog for group runnersDylan Griffith2018-04-301-0/+5
| * | | | Rename Runner#group? -> #assigned_to_group? and Runner#project? -> #assigned_...Dylan Griffith2018-04-307-17/+17
| * | | | Fix up db/schema.rb changes leftover and comments out of dateDylan Griffith2018-04-303-6/+3
| * | | | Revert fair scheduling for all buildsDylan Griffith2018-04-304-140/+43
| * | | | Bring back shared_runners_available? method since it is overriden in EEDylan Griffith2018-04-271-1/+5
| * | | | Rename `runner.belonging_to_group(project.id) -> runner.belonging_to_parent_g...Dylan Griffith2018-04-275-8/+8
| * | | | Remove unecessary index on ci_runner_groups.runner_idDylan Griffith2018-04-271-3/+1
| * | | | Remove timestamps from ci_runner_groups tableDylan Griffith2018-04-272-4/+0
| * | | | Add extra spec for Project#any_runners? to test block properlyDylan Griffith2018-04-271-0/+15