Commits · 439f81965c3f6041c450af5171b297ae1c137339 · nexedi / gitlab-ce

12 Oct, 2017 1 commit

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 20 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
- 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
- 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
- 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
- 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
- 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
10 Oct, 2017 19 commits
- EE port of 37399-simplify-project-page · bdb9a0bc
  Annabel Dunstone Gray authored Oct 03, 2017
  
  bdb9a0bc
- Render EE trial expiration banner under nav · 69da2353
  Annabel Dunstone Gray authored Oct 10, 2017
  
  69da2353
- Merge branch 'sh-format-geo-nodes-status' into 'master' · 42b6dbb7
  Clement Ho authored Oct 10, 2017
```
Add comma delimiters to make Geo Node status more readable

See merge request gitlab-org/gitlab-ee!3090
```
  42b6dbb7
- Add comma delimiters to make Geo Node status more readable · 7a657e3a
  Stan Hu authored Oct 06, 2017
  
  7a657e3a
- Merge branch 'dm-ldap-group-sync-filter-eep' into 'master' · 35f094b0
  Robert Speicher authored Oct 10, 2017
```
Only enable LDAP group sync filter method on EEP

Closes #3698

See merge request gitlab-org/gitlab-ee!3106
```
  35f094b0
- Fix conflict in doc/user/permissions.md · 598e33d9
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  598e33d9
- Fix rubocop offences after merge from CE · c453836d
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c453836d
- Use :js instead of js: true for spec · 32620938
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  32620938
- Only enable LDAP group sync filter method on EEP · 2dae609e
  Douwe Maan authored Oct 10, 2017
  
  2dae609e
- Fix syntax error in app/assets/stylesheets/pages/boards.scss · ff6eb578
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ff6eb578
- Merge branch 'ee-flash-es6-module' into 'master' · 8061d73c
  Filipa Lacerda authored Oct 10, 2017
```
EE port of flash-es6-module

See merge request gitlab-org/gitlab-ee!3070
```
  8061d73c
- Merge branch 'ee-38869-api' into 'master' · 094e7e5b
  Phil Hughes authored Oct 10, 2017
```
Remove Api from main.js

See merge request gitlab-org/gitlab-ee!3104
```
  094e7e5b
- Remove Api from main.js · 88ae6656
  Filipa Lacerda authored Oct 10, 2017
  
  88ae6656
- Resolve conflict in app/views/projects/_md_preview.html.haml · f78d27be
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f78d27be
- Resolve conflict in app/assets/javascripts/vue_shared/components/issue/issue_warning.vue · a7e7469b
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a7e7469b
- Resolve conflict in app/assets/stylesheets/pages/note_form.scss · 6ee56e2b
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6ee56e2b
- Resolve conflict in app/assets/stylesheets/framework/variables.scss · 0f0dd277
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0f0dd277
- Resolve conflict in spec/lib/gitlab/git_access_spec.rb · c1401cbf
  Dmitriy Zaporozhets authored Oct 10, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c1401cbf
- Fix typo and make navbar title consistent · a473bde1
  Douwe Maan authored Oct 10, 2017
  
  a473bde1