Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
b4721adf3f
commit
477883c595
2 changed files with 4 additions and 6 deletions
|
@ -276,7 +276,7 @@ sudo gitlab-rake gitlab:geo:check
|
||||||
```
|
```
|
||||||
|
|
||||||
Ensure you have added the secondary node in the Admin Area of the **primary** node.
|
Ensure you have added the secondary node in the Admin Area of the **primary** node.
|
||||||
Also ensure you entered the `external_url` or `gitlab_rails['geo_node_name']`
|
Also ensure you entered the `gitlab_rails['geo_node_name']`
|
||||||
when adding the secondary node in the Admin Area of the **primary** node.
|
when adding the secondary node in the Admin Area of the **primary** node.
|
||||||
In GitLab 12.3 and earlier, edit the secondary node in the Admin Area of the **primary**
|
In GitLab 12.3 and earlier, edit the secondary node in the Admin Area of the **primary**
|
||||||
node and ensure that there is a trailing `/` in the `Name` field.
|
node and ensure that there is a trailing `/` in the `Name` field.
|
||||||
|
|
|
@ -19,10 +19,9 @@ namespace :tw do
|
||||||
end
|
end
|
||||||
|
|
||||||
CODE_OWNER_RULES = [
|
CODE_OWNER_RULES = [
|
||||||
CodeOwnerRule.new('Activation', '@kpaizee'),
|
CodeOwnerRule.new('Activation', '@phillipwells'),
|
||||||
CodeOwnerRule.new("Adoption", '@kpaizee'),
|
CodeOwnerRule.new('Acquisition', '@phillipwells'),
|
||||||
CodeOwnerRule.new('Activation', '@kpaizee'),
|
CodeOwnerRule.new('Anti-Abuse', '@phillipwells'),
|
||||||
CodeOwnerRule.new('Adoption', '@kpaizee'),
|
|
||||||
CodeOwnerRule.new('Authentication and Authorization', '@eread'),
|
CodeOwnerRule.new('Authentication and Authorization', '@eread'),
|
||||||
CodeOwnerRule.new('Certify', '@msedlakjakubowski'),
|
CodeOwnerRule.new('Certify', '@msedlakjakubowski'),
|
||||||
CodeOwnerRule.new('Code Review', '@aqualls'),
|
CodeOwnerRule.new('Code Review', '@aqualls'),
|
||||||
|
@ -41,7 +40,6 @@ namespace :tw do
|
||||||
CodeOwnerRule.new('Dynamic Analysis', '@rdickenson'),
|
CodeOwnerRule.new('Dynamic Analysis', '@rdickenson'),
|
||||||
CodeOwnerRule.new('Ecosystem', '@kpaizee'),
|
CodeOwnerRule.new('Ecosystem', '@kpaizee'),
|
||||||
CodeOwnerRule.new('Editor', '@aqualls'),
|
CodeOwnerRule.new('Editor', '@aqualls'),
|
||||||
CodeOwnerRule.new('Expansion', '@kpaizee'),
|
|
||||||
CodeOwnerRule.new('Foundations', '@rdickenson'),
|
CodeOwnerRule.new('Foundations', '@rdickenson'),
|
||||||
CodeOwnerRule.new('Fuzz Testing', '@rdickenson'),
|
CodeOwnerRule.new('Fuzz Testing', '@rdickenson'),
|
||||||
CodeOwnerRule.new('Geo', '@axil'),
|
CodeOwnerRule.new('Geo', '@axil'),
|
||||||
|
|
Loading…
Reference in a new issue