Commits · 82ea42a69617e38f573452ca500f88841ab490fa · nexedi / gitlab-ce

23 Oct, 2017 2 commits

Merge branch '3810-geo-disable-retries' into 'master' · 82ea42a6

Stan Hu authored Oct 23, 2017

Geo: Don't retry repositories or files until everything has been backfilled

Closes #3810

See merge request gitlab-org/gitlab-ee!3182

82ea42a6

Merge branch '3813-reduce-geo-scheduler-quiet-times' into 'master' · 21b99060

Stan Hu authored Oct 23, 2017

Reduce the quiet times between scheduler runs on Geo secondaries

Closes #3813

See merge request gitlab-org/gitlab-ee!3185

21b99060

21 Oct, 2017 3 commits
- Update CHANGELOG.md for 10.1.0 · faf13299
  Stan Hu authored Oct 21, 2017
```
[ci skip]
```
  faf13299
- Update CHANGELOG-EE.md for 10.1.0-ee · f3bde3ec
  Stan Hu authored Oct 21, 2017
```
[ci skip]
```
  f3bde3ec
- Merge branch 'ce-to-ee-2017-10-18' into 'master' · 26617719
  Rémy Coutable authored Oct 21, 2017
```
CE upstream - Wednesday

See merge request gitlab-org/gitlab-ee!3167
```
  26617719
20 Oct, 2017 13 commits
- Reduce the quiet times between scheduler runs on Geo secondaries · e6a2350d
  Nick Thomas authored Oct 21, 2017
  
  e6a2350d
- Geo: Don't retry repositories or files until everything has been backfilled · fe46d403
  Nick Thomas authored Oct 20, 2017
  
  fe46d403
- Merge branch 'fix-setting-geo-capacity' into 'master' · e93fdc5a
  Stan Hu authored Oct 20, 2017
```
Fix setting Geo sync capacity in the admin panel

See merge request gitlab-org/gitlab-ee!3184
```
  e93fdc5a
- Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' into 'master' · 3186ae9c
  Stan Hu authored Oct 19, 2017
```
Update Prometheus gem to fix problems with other Processes overwriting current metrics file

Closes #36714

See merge request gitlab-org/gitlab-ce!14827
```
  3186ae9c
- Fix setting Geo sync capacity in the admin panel · 45c8ba47
  Nick Thomas authored Oct 20, 2017
  
  45c8ba47
- Resolve conflict in spec/models/namespace_spec.rb · 314ae39c
  Rémy Coutable authored Oct 20, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  314ae39c
- Resolve conflict in db/schema.rb · cb95acd2
  Rémy Coutable authored Oct 20, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cb95acd2
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-10-18 · 79aaf516
  Rémy Coutable authored Oct 20, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  79aaf516
- Merge branch '3809-geo-sidekiq-pool' into 'master' · f9b3cf17
  Stan Hu authored Oct 20, 2017
```
Reconfigure the Geo tracking database pool size when running as Sidekiq

Closes #3809

See merge request gitlab-org/gitlab-ee!3181
```
  f9b3cf17
- Reconfigure the Geo tracking database pool size when running as Sidekiq · f35c0824
  Nick Thomas authored Oct 20, 2017
  
  f35c0824
- Merge branch 'make-gpg-key-push-rule-eep-only' into 'master' · c2809c54
  Douwe Maan authored Oct 20, 2017
```
Make push rule to reject unsigned commits EEP only

See merge request gitlab-org/gitlab-ee!3158
```
  c2809c54
- Fix subgroups group path issue · 74a2c395
  Rémy Coutable authored Oct 20, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  74a2c395
- Merge branch 'master' into 'master' · 717a4db2
  Rémy Coutable authored Oct 20, 2017
```
code_quality_diff.md: minor spelling fix

See merge request gitlab-org/gitlab-ee!2394
```
  717a4db2
19 Oct, 2017 10 commits
- Make reject_unsigned_commits rule work for Silver and Gold plans. · ed5a02c9
  Rubén Dávila authored Oct 19, 2017
```
Also fix some broken specs
```
  ed5a02c9
- Make push rule to reject unsigned commits EEP only · 58126159
  Rubén Dávila authored Oct 16, 2017
  
  58126159
- Merge branch '1144-allow-admins-to-disable-push-mirrors' into 'master' · a1c5e146
  Douwe Maan authored Oct 19, 2017
```
Adds admin application setting to globably disable push mirrors.

Closes #1144

See merge request gitlab-org/gitlab-ee!3130
```
  a1c5e146
- Merge branch 'ee-18765-stub_env_in_specs' into 'master' · 87bd8837
  Robert Speicher authored Oct 19, 2017
```
[EE] Add a 'custom cop' to RuboCop that bans ENV assignment

See merge request gitlab-org/gitlab-ee!3170
```
  87bd8837
- Adds admin application setting to globably disable push mirrors. · d831dfdd
  Tiago Botelho authored Oct 12, 2017
  
  d831dfdd
- Merge branch 'master-i18n' into 'master' · cf76351e
  Douwe Maan authored Oct 19, 2017
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!3030
```
  cf76351e
- New Crowdin translations · 997829a0
  GitLab Crowdin Bot authored Oct 19, 2017
  
  997829a0
- Merge branch '37391-ee-wiki-disk-path' into 'master' · 874e32ce
  Douwe Maan authored Oct 19, 2017
```
Use wiki.disk_path in EE

See merge request gitlab-org/gitlab-ee!3174
```
  874e32ce
- code_quality_diff.md: minor spelling fix · 7bfd0b87
  Eli Boyarski authored Jul 10, 2017
  
  7bfd0b87
- Fix spec/lib/gitlab/path_regex_spec.rb:181 · 747914db
  Rémy Coutable authored Oct 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  747914db
18 Oct, 2017 12 commits
- Merge branch 'ee-36160-zindex' into 'master' · bd749d9f
  Annabel Dunstone Gray authored Oct 18, 2017
```
EE - Decreases z-index of select2 to a lower number of our navigation bar

See merge request gitlab-org/gitlab-ee!3175
```
  bd749d9f
- Use wiki.disk_path in EE · 3cbec51b
  Nick Thomas authored Oct 18, 2017
  
  3cbec51b
- [EE] Add a 'custom cop' to RuboCop that bans ENV assignment · 5f7b5abf
  Rémy Coutable authored Oct 18, 2017
```
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14810.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5f7b5abf
- Merge branch 'sh-rails-fdw-support' into 'master' · 7c63e8dc
  Nick Thomas authored Oct 18, 2017
```
Use PostgreSQL FDW for Geo downloads

See merge request gitlab-org/gitlab-ee!3128
```
  7c63e8dc
- Decreases z-index of select2 to a lower number of our navigation bar · f39e981d
  Filipa Lacerda authored Oct 18, 2017
  
  f39e981d
- Resolve conflict in config/routes/group.rb · b7144637
  Rémy Coutable authored Oct 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b7144637
- Resolve conflict in app/assets/stylesheets/pages/groups.scss · 39fb90d0
  Rémy Coutable authored Oct 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  39fb90d0
- Merge branch 'change-mirror-re-scheduling-algorithm' into 'master' · 6ccdf354
  Douwe Maan authored Oct 18, 2017
```
Refactors set_next_execution_timestamp in order to make mirror lower bound delay…

See merge request gitlab-org/gitlab-ee!3169
```
  6ccdf354
- Merge branch... · 193b1369
  Sean McGivern authored Oct 18, 2017
```
Merge branch 'ee-fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master'

Fix alphabetical ordering in usage data

See merge request gitlab-org/gitlab-ee!3171
```
  193b1369
- Merge branch 'ee-add-lazy-option-to-user-avatar-image-component' into 'master' · 976f77ca
  Tim Zallmann authored Oct 18, 2017
```
Add lazy option to UserAvatarImage -- EE merge edition

See merge request gitlab-org/gitlab-ee!3163
```
  976f77ca
- Resolve conflict in app/models/group.rb · 27aa8b1a
  Douwe Maan authored Oct 18, 2017
  
  27aa8b1a
- Merge branch 'ee-38986-due-date' into 'master' · 1dd2ef39
  Phil Hughes authored Oct 18, 2017
```
Port of 38986-due-date to EE

See merge request gitlab-org/gitlab-ee!3168
```
  1dd2ef39