Commits · ef741d8617f7576bc826950d710a63f4e1c7f545 · nexedi / gitlab-ce

07 Feb, 2018 2 commits
- EE - search and replace "Enterprise Edition Starter" => "Starter" · ef741d86
  Marcia Ramos authored Feb 02, 2018
  
  ef741d86
- search and replace "Enterprise Edition Ultimate" => "Ultimate" · 12236a45
  Marcia Ramos authored Feb 01, 2018
  
  12236a45
02 Feb, 2018 3 commits
- search and replace "Enterprise Edition Premium" => "Premium" · 4509fb64
  Marcia Ramos authored Feb 01, 2018
  
  4509fb64
- search and replace "Enterprise Edition Starter" => "Starter" · 15c675d2
  Marcia Ramos authored Feb 01, 2018
  
  15c675d2
- search and replace EES, EEP, EEU with Starter, Premium, Ultimate · e00603a7
  Marcia Ramos authored Feb 01, 2018
  
  e00603a7
01 Feb, 2018 35 commits
- Merge branch '4644-geo-selective-sync-by-shard' into 'master' · f1b444d3
  Robert Speicher authored Feb 01, 2018
```
Resolve "Geo selective sync by repository shard"

Closes #4644

See merge request gitlab-org/gitlab-ee!4286
```
  f1b444d3
- Merge branch 'docs-rename-products-new-policy-ee' into 'master' · 7b60afd8
  🚄 Job van der Voort 🚀 authored Feb 01, 2018
```
Docs: update GitLab products description

See merge request gitlab-org/gitlab-ee!4354
```
  7b60afd8
- Docs: update GitLab products description · 9a829fca
  Marcia Ramos authored Feb 01, 2018
  
  9a829fca
- Merge branch 'ee-ban-rugged-app-models' into 'master' · 9a7d44c5
  Rémy Coutable authored Feb 01, 2018
```
Ban Rugged from Repository -- EE version

See merge request gitlab-org/gitlab-ee!4350
```
  9a7d44c5
- Merge branch 'ee-36009-user-default-project-creator-in-factories' into 'master' · b0da8cf5
  Robert Speicher authored Feb 01, 2018
```
[EE] Make user/author use project.creator in most factories

See merge request gitlab-org/gitlab-ee!4328
```
  b0da8cf5
- Merge branch 'ce-to-ee-2018-02-01' into 'master' · 160bc0b5
  Lin Jen-Shin authored Feb 01, 2018
```
CE upstream - 2018-02-01 15:25 UTC

See merge request gitlab-org/gitlab-ee!4351
```
  160bc0b5
- Merge branch 'ee-epics-sorting' into 'master' · 15a96035
  Yorick Peterse authored Feb 01, 2018
```
Allow to order epics by start or end date

See merge request gitlab-org/gitlab-ee!4314
```
  15a96035
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-01 · 88e2c8a3
  GitLab Bot authored Feb 01, 2018
  
  88e2c8a3
- Merge branch 'ce-to-ee-2018-02-01' into 'master' · 1438043b
  Lin Jen-Shin authored Feb 01, 2018
```
CE upstream - 2018-02-01 12:25 UTC

See merge request gitlab-org/gitlab-ee!4349
```
  1438043b
- Ban Rugged from Repository · e27e8919
  Jacob Vosmaer authored Feb 01, 2018
  
  e27e8919
- Merge branch '4773-replication-slots-max-retained-wal-bytes-too-small' into 'master' · f18c75c0
  Stan Hu authored Feb 01, 2018
```
Resolve "Error 500 loading status of Geo primary node when replication lag is high"

Closes #4773

See merge request gitlab-org/gitlab-ee!4347
```
  f18c75c0
- Resolve "Error 500 loading status of Geo primary node when replication lag is high" · 0065a254
  Brett Walker authored Feb 01, 2018
  
  0065a254
- Show selective sync type in the sync settings component · 9398b481
  Nick Thomas authored Jan 31, 2018
  
  9398b481
- Skip backfill workers for shards that are disabled in selective sync · fd9d7438
  Nick Thomas authored Jan 29, 2018
  
  fd9d7438
- Update Geo documentation for selective sync by shards · fe547a9f
  Nick Thomas authored Jan 29, 2018
  
  fe547a9f
- Frontend for selective sync by shards · ef1a963e
  Nick Thomas authored Jan 29, 2018
  
  ef1a963e
- Implement selective synchronization by repository shard for Geo · c5de19b9
  Nick Thomas authored Jan 26, 2018
  
  c5de19b9
- Refactor repository_storages_options_for_select · 65db1a81
  Nick Thomas authored Jan 31, 2018
  
  65db1a81
- Resolve conflict in spec/finders/merge_requests_finder_spec.rb · c9faa2d4
  Rémy Coutable authored Feb 01, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c9faa2d4
- Resolve conflict in spec/finders/issues_finder_spec.rb · e96d6629
  Rémy Coutable authored Feb 01, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e96d6629
- Resolve conflict in spec/finders/group_projects_finder_spec.rb · ba9b39dc
  Rémy Coutable authored Feb 01, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ba9b39dc
- Resolve conflict in spec/uploaders/job_artifact_uploader_spec.rb · 04d6ac2f
  Rémy Coutable authored Feb 01, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  04d6ac2f
- Resolve conflict in lib/gitlab/upgrader.rb · 04d87af7
  Rémy Coutable authored Feb 01, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  04d87af7
- Merge branch 'jramsay-42598-fix-subgroup-creation-docs' into 'master' · 5b73e0eb
  Marcia Ramos authored Feb 01, 2018
```
Fix subgroup creation docs

Closes #42598

See merge request gitlab-org/gitlab-ce!16836
```
  5b73e0eb
- Merge branch '41710-improve-automatic-ce-ee-merge-docs' into 'master' · 23ecc841
  Sean McGivern authored Feb 01, 2018
```
Resolve "Clarify the wording around CE to EE ports: backport/upport/upstream merge etc."

Closes #41710

See merge request gitlab-org/gitlab-ce!16850
```
  23ecc841
- Improve doc/development/automatic_ce_ee_merge.md · a51dea0d
  Rémy Coutable authored Feb 01, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a51dea0d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-01 · 22d0696d
  GitLab Bot authored Feb 01, 2018
```
# Conflicts:
#	lib/gitlab/upgrader.rb
#	spec/finders/group_projects_finder_spec.rb
#	spec/finders/issues_finder_spec.rb
#	spec/finders/merge_requests_finder_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb

[ci skip]
```
  22d0696d
- Merge branch '30106-group-issues' into 'master' · 498d3236
  Sean McGivern authored Feb 01, 2018
```
View all issues of all subgroups on the group issue page

Closes #30106 and #39388

See merge request gitlab-org/gitlab-ce!16706
```
  498d3236
- Merge branch 'ee-30106-group-issues' into 'master' · 9562cd14
  Sean McGivern authored Feb 01, 2018
```
Backport: Include subgroup issuables on the group page

See merge request gitlab-org/gitlab-ee!4341
```
  9562cd14
- Merge branch 'ee-epics-by-timeframe' into 'master' · 7904c10c
  Sean McGivern authored Feb 01, 2018
```
Allow to find epics by the given time frame

See merge request gitlab-org/gitlab-ee!4247
```
  7904c10c
- Merge branch '42497-rubocop-style-regexpliteral' into 'master' · 76b9f1a4
  Rémy Coutable authored Feb 01, 2018
```
Enable Style/RegexpLiteral cop

Closes #42497

See merge request gitlab-org/gitlab-ce!16752
```
  76b9f1a4
- Merge branch 'ee-42497-rubocop-style-regexpliteral' into 'master' · d97cd821
  Rémy Coutable authored Feb 01, 2018
```
[EE] Enable RuboCop Style/RegexpLiteral

See merge request gitlab-org/gitlab-ee!4334
```
  d97cd821
- Merge branch 'fix-internationalization-namespace' into 'master' · ab0d41e2
  Filipa Lacerda authored Feb 01, 2018
```
Remove namespaced internationalization import

See merge request gitlab-org/gitlab-ce!16838
```
  ab0d41e2
- Include subgroup issuables on the group page · 63acec0b
  Jarka Kadlecová authored Jan 24, 2018
```
# Conflicts:
#	spec/finders/issues_finder_spec.rb
#	spec/finders/merge_requests_finder_spec.rb
```
  63acec0b
- Include subgroup issuables on the group page · 7f0ebeff
  Jarka Kadlecová authored Jan 24, 2018
  
  7f0ebeff