Commits · 30768b3b208cff1ba89118dfeef05efd0315443b · nexedi / gitlab-ce

31 May, 2019 40 commits
- Merge branch 'ee-weimeng-email-routing' into 'master' · 30768b3b
  Sean McGivern authored May 31, 2019
```
EE Backport: Add group-level email routing

See merge request gitlab-org/gitlab-ee!12657
```
  30768b3b
- Merge branch 'ee-proof-read' into 'master' · 5ac34216
  Jan Provaznik authored May 31, 2019
```
EE: Fix typo

See merge request gitlab-org/gitlab-ee!13753
```
  5ac34216
- Automatic merge of gitlab-org/gitlab-ce master · 072c4f3f
  GitLab Bot authored May 31, 2019
  
  072c4f3f
- Merge branch '60987-emoji-picker-popup' into 'master' · 12aff0b7
  Kushal Pandya authored May 31, 2019
```
Fix emoji picker popup is not always fully visible

Closes #60987

See merge request gitlab-org/gitlab-ce!28984
```
  12aff0b7
- Route notifications to groups for EE mailers · 249d08c2
  Wei-Meng Lee authored May 13, 2019
  
  249d08c2
- Merge branch 'qa-fix-locale-pot' into 'master' · 48ebd13e
  Nick Thomas authored May 31, 2019
```
Fix locale/gitlab.pot

See merge request gitlab-org/gitlab-ee!13765
```
  48ebd13e
- Apply reviewer suggestions · e03b7728
  Wei-Meng Lee authored May 31, 2019
  
  e03b7728
- Move method into group · 81ab2c9c
  Wei-Meng Lee authored May 13, 2019
  
  81ab2c9c
- Simplify logic using new group notification settings method · 234da2fd
  Wei-Meng Lee authored Apr 26, 2019
  
  234da2fd
- Guarantee order of notification settings · a63b0a06
  Wei-Meng Lee authored Apr 26, 2019
  
  a63b0a06
- Move group_notification_email outside conditional · 83fbd922
  Wei-Meng Lee authored Apr 03, 2019
  
  83fbd922
- Fix typo in project invitation declined test · 56d86cc2
  Wei-Meng Lee authored Apr 03, 2019
  
  56d86cc2
- Add group-level notification emails to docs · 8878ee6c
  Wei-Meng Lee authored Mar 03, 2019
  
  8878ee6c
- Send notifications to group-specific email address · 7e20b641
  Wei-Meng Lee authored Feb 16, 2019
```
- Select notification email by walking up group/subgroup path
- Add settings UI to set group email notification address
- Add tests
```
  7e20b641
- Add notification_email to NotificationSetting · 696a3ff1
  Wei-Meng Lee authored Feb 16, 2019
  
  696a3ff1
- Fix emoji picker visibility issue · 7099211e
  Fatih Acet authored May 31, 2019
  
  7099211e
- Fix errors in locale/gitlab.pot · 8832ceae
  Nick Thomas authored May 31, 2019
  
  8832ceae
- Automatic merge of gitlab-org/gitlab-ce master · 1c2f9483
  GitLab Bot authored May 31, 2019
  
  1c2f9483
- Merge branch '59587-add-graphql-logging' into 'master' · 4e888212
  Sean McGivern authored May 31, 2019
```
Add logging to GraphQL

Closes #59587

See merge request gitlab-org/gitlab-ce!27885
```
  4e888212
- Merge branch '59587-add-graphql-logging-ee' into 'master' · 0c78cf81
  Sean McGivern authored May 31, 2019
```
Add logging to GraphQL

See merge request gitlab-org/gitlab-ee!13620
```
  0c78cf81
- Merge branch 'bvl-fix-mysql-approval-rule-index-mysql' into 'master' · 1618f818
  Nick Thomas authored May 31, 2019
```
Add `rule_type` to indexes explicitly

Closes #11876

See merge request gitlab-org/gitlab-ee!13761
```
  1618f818
- Merge branch 'remove-legacy-artifacts-related-code' into 'master' · 1523d078
  Kamil Trzciński authored May 31, 2019
```
Remove legacy artifact related code

Closes #58595

See merge request gitlab-org/gitlab-ce!26475
```
  1523d078
- Merge branch 'remove-legacy-artifacts-related-code-ee' into 'master' · 45239f04
  Kamil Trzciński authored May 31, 2019
```
Port to EE: Remove legacy artifact related code

See merge request gitlab-org/gitlab-ee!13128
```
  45239f04
- Automatic merge of gitlab-org/gitlab-ce master · ff64f49e
  GitLab Bot authored May 31, 2019
  
  ff64f49e
- Merge branch '10329-remove-duplicate-endpoint' into 'master' · ab9689d4
  Douwe Maan authored May 31, 2019
```
Remove duplicated approval endpoints

Closes #10329

See merge request gitlab-org/gitlab-ee!13658
```
  ab9689d4
- Merge branch '62432-fix-participants-wrapping' into 'master' · f1cf1be4
  Annabel Dunstone Gray authored May 31, 2019
```
Fix participants list padding

Closes #62432

See merge request gitlab-org/gitlab-ce!28873
```
  f1cf1be4
- Update participants padding · 9cd57e73
  Jacques Erasmus authored May 31, 2019
```
Updated the padding to our standard size
```
  9cd57e73
- Merge branch 'docs-its-relative-5' into 'master' · 41cce069
  Achilleas Pipinellis authored May 31, 2019
```
Docs: Convert links in various docs to relative

See merge request gitlab-org/gitlab-ce!28967
```
  41cce069
- Docs: Convert links in various docs to relative · cab0c20c
  Marcel Amirault authored May 31, 2019
  
  cab0c20c
- Merge branch 'docs-its-relative-4' into 'master' · 87361657
  Achilleas Pipinellis authored May 31, 2019
```
Docs: Convert remaining links in /user to relative

See merge request gitlab-org/gitlab-ce!28964
```
  87361657
- Docs: Convert remaining links in /user to relative · 4738c0ff
  Marcel Amirault authored May 31, 2019
  
  4738c0ff
- Automatic merge of gitlab-org/gitlab-ce master · d5df1970
  GitLab Bot authored May 31, 2019
  
  d5df1970
- Merge branch 'docs-hackathon-1' into 'master' · adc7221d
  Achilleas Pipinellis authored May 31, 2019
```
Docs: Add introduced column to table in Personal Access Tokens doc

Closes #60531

See merge request gitlab-org/gitlab-ce!28874
```
  adc7221d
- Docs: Add introduced column to table in Personal Access Tokens doc · fca56fb7
  Marcel Amirault authored May 31, 2019
  
  fca56fb7
- Merge branch 'docs-its-relative-3' into 'master' · 24a79ee1
  Achilleas Pipinellis authored May 31, 2019
```
Docs: Finish changing links to relative in user/project (part 2)

See merge request gitlab-org/gitlab-ce!28934
```
  24a79ee1
- Docs: Finish changing links to relative in user/project (part 2) · 797fc82a
  Marcel Amirault authored May 31, 2019
  
  797fc82a
- Merge branch 'docs-its-relative-2' into 'master' · fef62cc6
  Achilleas Pipinellis authored May 31, 2019
```
Docs: Change links to relative in /user/project (Part 1)

See merge request gitlab-org/gitlab-ce!28920
```
  fef62cc6
- Docs: Change links to relative in /user/project (Part 1) · 46907090
  Marcel Amirault authored May 31, 2019
  
  46907090
- Merge branch 'docs-hackathon-4' into 'master' · 1ab5895a
  Achilleas Pipinellis authored May 31, 2019
```
Docs: Clean up tables in permissions doc

Closes #59249

See merge request gitlab-org/gitlab-ce!28908
```
  1ab5895a
- Docs: Clean up tables in permissions doc · 796fdc83
  Marcel Amirault authored May 31, 2019
  
  796fdc83