-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch '24059-round-robin-repository-storage' into 'master'
Resolve "Introduce round-robin project creation to spread load over multiple shards" ## What does this MR do? Allow multiple shards to be enabled in the admin settings page, balancing project creation across all enabled shards. ## Are there points in the code the reviewer needs to double check? * `f.select ..., multiple: true` isn't the most beautiful UI in the world, but switching to `collection_check_boxes` (or a facsimile thereof) isn't trivial * Should `pick_repository_storage` be a method of `ApplicationSetting`, or `Project`? It's going to accrete logic over time so perhaps it should be its own class already? * This is written to avoid the need for a database migration, so it is`serialize :repository_storage` without `, Array`. This is tested, but alternatives include: * Add a database migration * Write a custom Coder that will accept a String or Array in `load` and always `dump an Array. ## Why was this MR needed? ## Screenshots (if relevant)  ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [X] Added for this feature/bug - [ ] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24059 See merge request !7273
Showing
- app/controllers/admin/application_settings_controller.rb 1 addition, 1 deletionapp/controllers/admin/application_settings_controller.rb
- app/helpers/application_settings_helper.rb 2 additions, 2 deletionsapp/helpers/application_settings_helper.rb
- app/models/application_setting.rb 35 additions, 4 deletionsapp/models/application_setting.rb
- app/models/project.rb 1 addition, 1 deletionapp/models/project.rb
- app/views/admin/application_settings/_form.html.haml 2 additions, 2 deletionsapp/views/admin/application_settings/_form.html.haml
- changelogs/unreleased/24059-round-robin-repository-storage.yml 4 additions, 0 deletions...elogs/unreleased/24059-round-robin-repository-storage.yml
- db/migrate/20161103171205_rename_repository_storage_column.rb 29 additions, 0 deletions...igrate/20161103171205_rename_repository_storage_column.rb
- db/schema.rb 2 additions, 2 deletionsdb/schema.rb
- doc/administration/img/repository_storages_admin_ui.png 0 additions, 0 deletionsdoc/administration/img/repository_storages_admin_ui.png
- doc/administration/repository_storages.md 3 additions, 0 deletionsdoc/administration/repository_storages.md
- doc/api/settings.md 3 additions, 1 deletiondoc/api/settings.md
- lib/api/entities.rb 1 addition, 0 deletionslib/api/entities.rb
- lib/api/settings.rb 2 additions, 2 deletionslib/api/settings.rb
- spec/models/application_setting_spec.rb 52 additions, 4 deletionsspec/models/application_setting_spec.rb
- spec/models/project_spec.rb 9 additions, 6 deletionsspec/models/project_spec.rb
- spec/requests/api/settings_spec.rb 1 addition, 0 deletionsspec/requests/api/settings_spec.rb
Loading
Please register or sign in to comment