Commits · 26e0799f3f77e18d4049064225c25f2bd8d4b303 · nexedi / gitlab-ce

05 May, 2019 27 commits
- Docs: (EE Port) Merge EE doc/user/project/clusters to CE · 26e0799f
  Marcel Amirault authored May 05, 2019
  
  26e0799f
- Merge branch 'repo-merge-check-12' into 'master' · 37ed3a9d
  Achilleas Pipinellis authored May 05, 2019
```
Remove doc/user/discussions from whitelist

Closes gitlab-ce#60842

See merge request gitlab-org/gitlab-ee!11877
```
  37ed3a9d
- Merge branch 'docs-repo-merge-12-user-disc-ee' into 'master' · 53767e67
  Achilleas Pipinellis authored May 05, 2019
```
Docs: (EE Port) Merge EE doc/user/discussions to CE

See merge request gitlab-org/gitlab-ee!11650
```
  53767e67
- Docs: (EE Port) Merge EE doc/user/discussions to CE · 2f108304
  Marcel Amirault authored May 05, 2019
  
  2f108304
- Merge branch 'docs-repo-merge-11-admin-ops-ee' into 'master' · 14b8b830
  Achilleas Pipinellis authored May 05, 2019
```
Docs: (EE Port) Merge EE doc/administration/operations to CE

See merge request gitlab-org/gitlab-ee!11647
```
  14b8b830
- Docs: (EE Port) Merge EE doc/administration/operations to CE · 2170e1e3
  Marcel Amirault authored May 05, 2019
  
  2170e1e3
- Merge branch 'repo-merge-check-10' into 'master' · b9362605
  Achilleas Pipinellis authored May 05, 2019
```
Remove doc/user/group from whitelist

Closes gitlab-ce#60850

See merge request gitlab-org/gitlab-ee!11875
```
  b9362605
- Remove doc/user/group from whitelist · bd826a3d
  Marcel Amirault authored May 05, 2019
  
  bd826a3d
- Merge branch 'docs-repo-merge-10-group-misc-ee' into 'master' · 8ee760ab
  Achilleas Pipinellis authored May 05, 2019
```
Docs: (EE Port) Merge EE doc/user/group to CE

See merge request gitlab-org/gitlab-ee!11639
```
  8ee760ab
- Docs: (EE Port) Merge EE doc/user/group to CE · d6715ceb
  Marcel Amirault authored May 05, 2019
  
  d6715ceb
- Automatic merge of gitlab-org/gitlab-ce master · f74be238
  GitLab Bot authored May 05, 2019
  
  f74be238
- Merge branch 'repo-merge-check-5' into 'master' · 11c995c9
  Achilleas Pipinellis authored May 05, 2019
```
Remove doc/update from whitelist

Closes gitlab-ce#59150

See merge request gitlab-org/gitlab-ee!11870
```
  11c995c9
- Remove doc/update from whitelist · f32f5f35
  Marcel Amirault authored May 05, 2019
  
  f32f5f35
- Merge branch 'docs-repo-merge-5-update' into 'master' · 23c195d2
  Achilleas Pipinellis authored May 05, 2019
```
Docs: Merge EE doc/update to CE

See merge request gitlab-org/gitlab-ce!27654
```
  23c195d2
- Docs: Merge EE doc/update to CE · 5f7b4a7b
  Marcel Amirault authored May 05, 2019
  
  5f7b4a7b
- Merge branch 'docs-repo-merge-5-update-ee' into 'master' · 1922180d
  Achilleas Pipinellis authored May 05, 2019
```
Docs: (EE Port) Merge EE doc/update to CE

See merge request gitlab-org/gitlab-ee!11555
```
  1922180d
- Docs: (EE Port) Merge EE doc/update to CE · 2b9bfa0d
  Marcel Amirault authored May 05, 2019
  
  2b9bfa0d
- Merge branch 'docs-repo-merge-4-workflow' into 'master' · e9044240
  Achilleas Pipinellis authored May 05, 2019
```
Docs: Merge EE doc/workflow to CE

See merge request gitlab-org/gitlab-ce!27622
```
  e9044240
- Docs: Merge EE doc/workflow to CE · 27545605
  Marcel Amirault authored May 05, 2019
  
  27545605
- Merge branch 'docs-repo-merge-4-workflow-ee' into 'master' · 87e2f743
  Achilleas Pipinellis authored May 05, 2019
```
Docs: (EE Port) Merge EE doc/workflow to CE

See merge request gitlab-org/gitlab-ee!11489
```
  87e2f743
- Docs: (EE Port) Merge EE doc/workflow to CE · 4b9bdf31
  Marcel Amirault authored May 05, 2019
  
  4b9bdf31
- Merge branch 'repo-merge-check-3' into 'master' · 897961f6
  Achilleas Pipinellis authored May 05, 2019
```
Remove doc/integration from whitelist

Closes gitlab-ce#59152

See merge request gitlab-org/gitlab-ee!11865
```
  897961f6
- Remove doc/integration from whitelist · 1e76ab57
  Marcel Amirault authored May 05, 2019
  
  1e76ab57
- Merge branch 'docs-repo-merge-3-integration' into 'master' · ccd65e38
  Achilleas Pipinellis authored May 05, 2019
```
Docs: Merge EE doc/integration to CE

See merge request gitlab-org/gitlab-ce!27610
```
  ccd65e38
- Docs: Merge EE doc/integration to CE · 66b25804
  Marcel Amirault authored May 05, 2019
  
  66b25804
- Merge branch 'docs-repo-merge-3-integration-ee' into 'master' · 11bac42b
  Achilleas Pipinellis authored May 05, 2019
```
Docs: (EE Port) Merge EE doc/integration to CE

See merge request gitlab-org/gitlab-ee!11465
```
  11bac42b
- Docs: (EE Port) Merge EE doc/integration to CE · 4e6a56de
  Marcel Amirault authored May 05, 2019
  
  4e6a56de
04 May, 2019 13 commits
- Merge branch '11280-geo-find-select-count-and-remove-it-if-we-don-t-need-it-geo' into 'master' · ad2206dc
  Douglas Barbosa Alexandre authored May 04, 2019
```
Geo: Remove SELECT COUNT(*) FROM "geo_event_log" if we don't need it

Closes #11280

See merge request gitlab-org/gitlab-ee!12146
```
  ad2206dc
- Automatic merge of gitlab-org/gitlab-ce master · b521a88e
  GitLab Bot authored May 04, 2019
  
  b521a88e
- Merge branch 'repo-merge-check-1' into 'master' · 0907dc70
  Achilleas Pipinellis authored May 04, 2019
```
Remove doc/customization from whitelist

Closes gitlab-ce#60837

See merge request gitlab-org/gitlab-ee!11860
```
  0907dc70
- Remove doc/customization from whitelist · a35100a6
  Marcel Amirault authored May 04, 2019
  
  a35100a6
- Merge branch 'docs-repo-merge-1-customization' into 'master' · 0ca24531
  Achilleas Pipinellis authored May 04, 2019
```
Docs: Merge EE doc/customization to CE

See merge request gitlab-org/gitlab-ce!27604
```
  0ca24531
- Docs: Merge EE doc/customization to CE · 45ad5efc
  Marcel Amirault authored May 04, 2019
  
  45ad5efc
- Merge branch 'docs-repo-merge-1-customization-ee' into 'master' · 2079359b
  Achilleas Pipinellis authored May 04, 2019
```
Docs: (EE Port) Merge EE doc/customization to CE

See merge request gitlab-org/gitlab-ee!11450
```
  2079359b
- Docs: (EE Port) Merge EE doc/customization to CE · 477e760b
  Marcel Amirault authored May 04, 2019
  
  477e760b
- Geo: Remove counts for geo_event_log · aef65e4e
  Valery Sizov authored May 02, 2019
```
We don't really need this data too much, at the same time it's hard
to calculate. So let's just get rid of this data.
```
  aef65e4e
- Automatic merge of gitlab-org/gitlab-ce master · 966505d0
  GitLab Bot authored May 04, 2019
  
  966505d0
- Merge branch '50926-sort-by-due-date-and-popularity' into 'master' · 7a3a1c2f
  Douglas Barbosa Alexandre authored May 04, 2019
```
Resolve "Sort by due date and popularity in both directions"

Closes #50926

See merge request gitlab-org/gitlab-ce!25502
```
  7a3a1c2f
- Resolve "Sort by due date and popularity in both directions" · 0a89c08c
  Nermin Vehabovic authored May 04, 2019
  
  0a89c08c
- Merge branch 'rf-fix-vulnerabilities-api-spec' into 'master' · 8446d3d3
  Stan Hu authored May 04, 2019
```
Remove flaky assertion

Closes #11476

See merge request gitlab-org/gitlab-ee!12253
```
  8446d3d3