summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use persistent Redis cluster for Workhorse pub/sub notificationssh-use-shared-state-cluster-pubsubStan Hu2019-07-225-4/+10
| | | | | | | | | Previously, in Omnibus, Workhorse expected to listen via the Redis shared state cluster for the `workhorse:notifications` publish/subscribe channel, but the Rails code was using the Sidekiq queue cluster for this. To fix this inconsistency, we make the Rails code use the persistent cluster, since we don't want Workhorse to be looking at anything Sidekiq-related.
* Merge branch 'fix-i18n-updated-projects' into 'master'Clement Ho2019-07-222-1/+6
|\ | | | | | | | | Fix translation of 'Updated' term in projects list See merge request gitlab-org/gitlab-ce!30958
| * Fix translation of 'Updated' term in projects listPaul Gascou-Vaillancourt2019-07-222-1/+6
| |
* | Merge branch 'docs-dry-the-stage-and=group-labels-list' into 'master'Mek Stittri2019-07-221-54/+5
|\ \ | | | | | | | | | | | | Dry the list of stage and group labels by linking to them directly See merge request gitlab-org/gitlab-ce!30365
| * | Dry the list of stage and group labels by linking to them directlydocs-dry-the-stage-and=group-labels-listRémy Coutable2019-07-221-54/+5
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'remove-duplicate-all-models-entry' into 'master'Robert Speicher2019-07-221-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove duplicate entry from all_models.yml See merge request gitlab-org/gitlab-ce!31010
| * | | Remove duplicate entry from all_models.ymlremove-duplicate-all-models-entryYorick Peterse2019-07-221-1/+0
| | | | | | | | | | | | | | | | | | | | This line is already present further down in the YAML file. In EE the line is already removed.
* | | | Merge branch ↵Nick Thomas2019-07-224-1/+115
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '64870-can-t-save-pages-domain-form-with-let-s-encrypt-enabled-if-current-certificate-is-outdated' into 'master' Resolve "Can't save pages domain form with Let's Encrypt enabled if current certificate is outdated" Closes #64870 See merge request gitlab-org/gitlab-ce!30995
| * | | Validate certificate chain only if it's changedVladimir Shushlin2019-07-224-1/+115
|/ / / | | | | | | | | | | | | This validation prevents the domain from being saved from the UI e.g. when user tries to enable Let's Encrypt integration
* | | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-2224-36/+340
|\ \ \ | | | | | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | | Resolve some issues in MRFabio Papa2019-07-192-3/+2
| | | |
| * | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-191-2/+2
| |\ \ \ | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | * | | Apply suggestion to doc/user/group/subgroups/index.mdFabio Papa2019-07-191-4/+9
| | | | |
| | * | | Apply suggestion to doc/user/permissions.mdFabio Papa2019-07-191-1/+1
| | | | |
| | * | | Add a link from the permissions table to the subgroups/creating aFabio Papa2019-07-121-2/+3
| | | | | | | | | | | | | | | | | | | | subgroup section
| | * | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-121176-8136/+17452
| | |\ \ \ | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | * \ \ Merge branch 'master' into 'maintainers-can-create-subgroup'Fabio Papa2019-07-121176-8136/+17452
| | | |\ \ \ | | |/ / / / | | | | | | | | | | | | # Conflicts: # doc/user/permissions.md
| | * | | | Make Group#subgroup_creation_level return Owner if it is nil in DBif-ee_compat_testFabio Papa2019-07-101-1/+1
| | | | | |
| | * | | | Regenerate locale stringsFabio Papa2019-07-051-0/+12
| | | | | |
| | * | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-053-6/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | * \ \ \ Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-052-12/+14
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | | * | | | Apply suggestion to doc/user/permissions.mdFabio Papa2019-07-051-1/+1
| | | | | | | |
| | | | * | | | Make subgroup creation more clearFabio Papa2019-07-030-0/+0
| | | | | | | |
| | | | * | | | Update index.mdFabio Papa2019-07-031-9/+10
| | | | | | | |
| | | | * | | | Apply suggestion to doc/user/group/subgroups/index.mdFabio Papa2019-07-031-1/+0
| | | | | | | |
| | | | * | | | Apply suggestion to doc/user/permissions.mdFabio Papa2019-07-031-1/+1
| | | | | | | |
| | | | * | | | Apply suggestion to doc/user/permissions.mdFabio Papa2019-07-031-1/+1
| | | | | | | |
| | | | * | | | Apply suggestion to doc/user/group/subgroups/index.mdFabio Papa2019-07-031-1/+3
| | | | | | | |
| | | * | | | | Fixed a failing testFabio Papa2019-07-051-10/+6
| | | |/ / / /
| | | * | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-020-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | | * | | | Apply recomended changes from merge coachFabio Papa2019-07-023-9/+10
| | | | | | | |
| | | | * | | | Fix some code style issuesFabio Papa2019-07-012-11/+14
| | | | | | | |
| | | | * | | | Adjust the documentation on subgroup permissionsFabio Papa2019-07-011-1/+3
| | | | | | | |
| | | | * | | | Adjust the documentation on subgroupsFabio Papa2019-07-011-6/+9
| | | | | | | |
| | | | * | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-010-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | | | * | | | Add descriptions to examplesFabio Papa2019-07-011-2/+2
| | | | | | | | |
| | | | | * | | | Fix group creat_service_spec to contain maintainer contextFabio Papa2019-07-011-2/+2
| | | | | | | | |
| | | | | * | | | Clean up the show_spec examples previously addedFabio Papa2019-07-011-18/+18
| | | | | | | | |
| | | | | * | | | Remove AR hook to set the default subgroup_creation_levelFabio Papa2019-07-011-6/+0
| | | | | | | | |
| | | | | * | | | Make subgroup_creation_level default to maintainer at SQL levelFabio Papa2019-06-309-25/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Migration updates existing groups to "owner", then sets default to "maintainer" so that new groups will default to that - Update spec examples
| | | | | * | | | Make maintainers the default setting for creating subgroupsFabio Papa2019-06-282-4/+14
| | | | | | | | |
| | | | | * | | | Remove an example that is no longer necessaryFabio Papa2019-06-281-9/+0
| | | | | | | | |
| | | | | * | | | Style rules; Revert some examplesFabio Papa2019-06-288-22/+52
| | | | | | | | |
| | | | | * | | | Update schemaFabio Papa2019-06-281-1/+2
| | | | | | | | |
| | | | | * | | | Add feature examples specing maintainers creating subgroupsFabio Papa2019-06-281-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both with subgroup_creation_level set to owners and to maintainers. Also fixed the naming of some other examples in the same spec as they were contradicting what they were actually performing in the test. These examples were probably copy/pasted, and not renamed.
| | | | | * | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-06-271-1/+1
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | | | | * | | | Apply suggestion to changelogs/unreleased/maintainers-can-create-subgroup.ymlFabio Papa2019-06-271-1/+1
| | | | | | | | | |
| | | | | * | | | | Add policy to allow maintainers to create subgroups when enabledFabio Papa2019-06-271-0/+5
| | | | | | | | | |
| | | | | * | | | | Make the group model return maintainer level when it is not setFabio Papa2019-06-271-0/+4
| | | | | | | | | |
| | | | | * | | | | Add "allowed to create subgroups" dropdown to group settings formFabio Papa2019-06-273-0/+11
| | | | | | | | | |
View Lorry Controller Status