summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'inform-the-user-when-there-are-no-project-import-options-availa...Rémy Coutable2018-05-042-48/+56
|\
| * 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-041-0/+4
* | Merge branch 'feature/runner-per-group' into 'master'Kamil Trzciński2018-05-0416-43/+187
|\ \
| * | Dont remove duplicates in Runner.owned_or_shared since its not necessaryDylan Griffith2018-05-031-1/+4
| * | 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-033-3/+11
| * | 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-032-3/+0
| * | Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-03136-3426/+6592
| |\ \
| * | | Rename RunnerGroup -> RunnerNamespaceDylan Griffith2018-05-025-13/+15
| * | | Rename Runner#invalidate_build_cache -> Runner#pick_buildDylan Griffith2018-05-022-2/+2
| * | | 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-013-4/+4
| * | | 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-301-14/+2
| * | | Start persisting runner_type when creating runnersDylan Griffith2018-04-301-0/+6
| * | | Rename Runner#group? -> #assigned_to_group? and Runner#project? -> #assigned_...Dylan Griffith2018-04-305-8/+8
| * | | Revert fair scheduling for all buildsDylan Griffith2018-04-302-32/+33
| * | | 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-274-5/+5
| * | | Switch to using ProjectCiCdSetting for group_runners_enabled and remove Proje...Dylan Griffith2018-04-263-15/+4
| * | | Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-2661-229/+850
| |\ \ \
| * \ \ \ Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-2428-583/+639
| |\ \ \ \
| * | | | | extract method to adhere to "tell, don't ask"Alexis Reigel2018-04-232-1/+7
| * | | | | use more efficient AR length check methodsAlexis Reigel2018-04-231-2/+2
| * | | | | show group runners setup only to group masterAlexis Reigel2018-04-231-2/+5
| * | | | | restrict projects ci controller to project runnersAlexis Reigel2018-04-232-3/+13
| * | | | | simplify runner selectionAlexis Reigel2018-04-232-56/+32
| * | | | | ci runners: assigned to either projects or groupAlexis Reigel2018-04-231-0/+11
| * | | | | add `active` scope only once, inline methodsAlexis Reigel2018-04-231-12/+2
| * | | | | use union for Project#any_runners?Alexis Reigel2018-04-231-3/+3
| * | | | | project#group_runner_enabled -> project_settingsAlexis Reigel2018-04-232-1/+6
| * | | | | add project_settings (Project#settings)Alexis Reigel2018-04-232-0/+11
| * | | | | dry up: extract methodAlexis Reigel2018-04-231-15/+11
| * | | | | support group hierarchies for group runnersAlexis Reigel2018-04-231-7/+4
| * | | | | different text on admin runner page for group r.Alexis Reigel2018-04-231-0/+3
| * | | | | denote group runners on admin runners pageAlexis Reigel2018-04-232-1/+6
| * | | | | include group runners in Project#any_runners?Alexis Reigel2018-04-231-6/+12
| * | | | | select group runners also in register_job_serviceAlexis Reigel2018-04-231-9/+36
| * | | | | allow disabling/enabling group runners per projectAlexis Reigel2018-04-232-0/+16
| * | | | | select group runners also in build queue serviceAlexis Reigel2018-04-231-4/+12
| * | | | | use .owned_or_shared for #assignable_for?Alexis Reigel2018-04-231-1/+1
| * | | | | don't filter group runners by project flagAlexis Reigel2018-04-231-9/+1
| * | | | | show group runners on runners pageAlexis Reigel2018-04-234-1/+28
| * | | | | ensure_runners_token on read instead of writeAlexis Reigel2018-04-231-1/+7
| * | | | | add method CI::Runner.project?Alexis Reigel2018-04-231-0/+4
| * | | | | split up Ci::Runner.owned_or_shared scopeAlexis Reigel2018-04-231-16/+16
| * | | | | exclude group runners on projects that disabled itAlexis Reigel2018-04-231-3/+6
View Lorry Controller Status