Commits · afc767443923a1890d5f34ff12abbd040f47afe2 · nexedi / gitlab-ce

12 Oct, 2017 12 commits
- Fix reading the status of a secondary Geo node from the primary · afc76744
  Nick Thomas authored Oct 12, 2017
  
  afc76744
- Merge branch 'ee-3662-board_routes_prefix_with_dash' into 'master' · bd7ba308
  Douwe Maan authored Oct 12, 2017
```
Move group boards routes under '-' and remove "boards" from reserved paths

Closes #3662

See merge request gitlab-org/gitlab-ee!3078
```
  bd7ba308
- Merge branch 'add-10.1-ce-to-ee-docs' into 'master' · 88f46f7d
  Robert Speicher authored Oct 12, 2017
```
Add 10.1 CE to EE docs

See merge request gitlab-org/gitlab-ee!3133
```
  88f46f7d
- Add 10.1 CE to EE docs · 8ee6110a
  Lin Jen-Shin authored Oct 12, 2017
```
Followed the instructions from:
https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#gitlab-ee
```
  8ee6110a
- Specs for new group routing · d85bbf0d
  Valery Sizov authored Oct 12, 2017
  
  d85bbf0d
- Merge branch 'BDO-minor-spelling-edit' into 'master' · 3429442a
  Douwe Maan authored Oct 12, 2017
```
Fix spelling of 'Enterprise'

See merge request gitlab-org/gitlab-ee!3114
```
  3429442a
- Merge branch 'docs/gke-cluster-ee' into 'master' · ec186e1d
  Achilleas Pipinellis authored Oct 12, 2017
```
Add docs for GKE integration

See merge request gitlab-org/gitlab-ee!3129
```
  ec186e1d
- Merge branch 'docs/gke-cluster' into 'master' · e1e4745b
  Achilleas Pipinellis authored Oct 12, 2017
```
Add docs for GKE integration

See merge request gitlab-org/gitlab-ce!14712
```
  e1e4745b
- Merge branch 'docs/fix-dev-doc-ee' into 'master' · ba5407bf
  Achilleas Pipinellis authored Oct 12, 2017
```
Fix a missing link and create a separate "Testing guides" section

See merge request gitlab-org/gitlab-ee!3123
```
  ba5407bf
- Merge branch 'remove-duplicated-style' into 'master' · 60f82e74
  Robert Speicher authored Oct 12, 2017
```
Remove duplicated style

See merge request gitlab-org/gitlab-ee!3118
```
  60f82e74
- Merge branch 'ee-39028-repo-by-url-fields' into 'master' · b9bb58f4
  Tim Zallmann authored Oct 12, 2017
```
Port of 39028-repo-by-url-fields to EE

See merge request gitlab-org/gitlab-ee!3125
```
  b9bb58f4
- Merge branch '3691-geo-file-backfill' into 'master' · 439f8196
  Douwe Maan authored Oct 12, 2017
```
Prevent failed file syncs from stalling Geo backfill

Closes #3691

See merge request gitlab-org/gitlab-ee!3101
```
  439f8196
11 Oct, 2017 28 commits
- Merge branch 'ee-38871-cleanup-data-page-attribute-after-karma-test' into 'master' · 42dfbd02
  Clement Ho authored Oct 11, 2017
```
Cleanup data-page attribute after each Karma test -- EE merge edition

Closes gitlab-ce#38871

See merge request gitlab-org/gitlab-ee!3115
```
  42dfbd02
- Port of 39028-repo-by-url-fields to EE · 92feddb4
  Annabel Dunstone Gray authored Oct 11, 2017
  
  92feddb4
- Merge branch 'ee-37399-simplify-project-page' into 'master' · d4e5ce17
  Annabel Dunstone Gray authored Oct 11, 2017
```
Simplify project page- EE version

See merge request gitlab-org/gitlab-ee!3093
```
  d4e5ce17
- Merge branch 'remove-duplicated-test' into 'master' · e2c5c18e
  Sean McGivern authored Oct 11, 2017
```
Remove duplicated test

See merge request gitlab-org/gitlab-ee!3120
```
  e2c5c18e
- Cleanup data-page attribute after each Karma test · 2514ce67
  Eric Eastwood authored Oct 06, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871

Conflicts:
	app/assets/javascripts/milestone_select.js
```
  2514ce67
- Fix a missing link and create a separate "Testing guides" section · bfe0e2df
  Rémy Coutable authored Oct 11, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  bfe0e2df
- Include attachment and LFS object sync failures in Geo node status · 39a44e03
  Nick Thomas authored Oct 10, 2017
  
  39a44e03
- Prevent failed file syncs from stalling Geo backfill · 98f55734
  Nick Thomas authored Oct 09, 2017
  
  98f55734
- Add a changelog item · 9ac31d3b
  Valery Sizov authored Oct 06, 2017
  
  9ac31d3b
- Merge branch 'docs-image-commenting' into 'master' · 2d829861
  Achilleas Pipinellis authored Oct 11, 2017
```
Add ee version of image commenting docs

See merge request gitlab-org/gitlab-ee!3119
```
  2d829861
- Add ee version of image commenting docs · 1f04b46e
  Clement Ho authored Oct 11, 2017
  
  1f04b46e
- Remove duplicated test · b4f4e75e
  Lin Jen-Shin authored Oct 11, 2017
  
  b4f4e75e
- Remove duplicated style during merge · 2ca88d06
  Lin Jen-Shin authored Oct 11, 2017
  
  2ca88d06
- Merge branch 'ce-to-ee' into 'master' · 5ba5711f
  Dmitriy Zaporozhets authored Oct 11, 2017
```
CE Upstream - Monday

Closes gitlab-ce#37534, #3616, #2799, gitlab-design#45, gitlab-design#36, and gitlab-ce#38389

See merge request gitlab-org/gitlab-ee!3098
```
  5ba5711f
- Remove it because it's removed in: · bcf22c17
  Lin Jen-Shin authored Oct 11, 2017
```
69da2353
```
  bcf22c17
- Skip deprecated redirects in PathRegex spec · 7ac6496f
  Douwe Maan authored Oct 11, 2017
  
  7ac6496f
- Apply GroupUrlConstrainer to all routes with group IDs · 6a82632b
  Douwe Maan authored Oct 11, 2017
  
  6a82632b
- Move 'groups/*id' routes before 'groups/*group_id' routes · 50891701
  Douwe Maan authored Oct 11, 2017
  
  50891701
- Add /-/ to group boards path and add redirect from old to new path · e5fe49ed
  Douwe Maan authored Oct 11, 2017
  
  e5fe49ed
- Merge remote-tracking branch 'ee-com/master' into ce-to-ee · a3d80768
  Dmitriy Zaporozhets authored Oct 11, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a3d80768
- Merge branch 'docs-add-kerberos-troubleshooting' into 'master' · 13647d24
  Achilleas Pipinellis authored Oct 11, 2017
```
Add troubleshooting for Git v2.11 and up

Closes #2457

See merge request gitlab-org/gitlab-ee!3049
```
  13647d24
- Add troubleshooting for Git v2.11 and up · 184fbd08
  Collen authored Oct 11, 2017
  
  184fbd08
- Merge branch '3604-ee-license-banner-hidden' into 'master' · 85243164
  Phil Hughes authored Oct 11, 2017
```
Render EE trial expiration banner under nav

Closes #3604

See merge request gitlab-org/gitlab-ee!3113
```
  85243164
- Merge branch 'docs-note-ee-cc-fallback' into 'master' · 69c2f8d7
  Achilleas Pipinellis authored Oct 11, 2017
```
Add note on CE fallback for unlicensed EE instances since 9.4

See merge request gitlab-org/gitlab-ee!3100
```
  69c2f8d7
- Add note on CE fallback for unlicensed EE instances since 9.4 · c6fc26bf
  Chenjerai Katanda authored Oct 11, 2017
  
  c6fc26bf
- Merge branch 'ee-rc/refactor-testing-docs' into 'master' · 4098b5f2
  Achilleas Pipinellis authored Oct 11, 2017
```
[EE] Refactor the testing documentation and divide it into multiple pages

See merge request gitlab-org/gitlab-ee!3103
```
  4098b5f2
- Fix ee-specific import project spec · 5b89d971
  Annabel Dunstone Gray authored Oct 10, 2017
  
  5b89d971
- Fix specs · 50d2d7f9
  Annabel Dunstone Gray authored Oct 10, 2017
  
  50d2d7f9