Commits · 69c2f8d722f77fdcfc823befdff35f299e4996eb · nexedi / gitlab-ce

11 Oct, 2017 3 commits
- 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
10 Oct, 2017 10 commits
- 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
- Only enable LDAP group sync filter method on EEP · 2dae609e
  Douwe Maan authored Oct 10, 2017
  
  2dae609e
- 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
- Fix typo and make navbar title consistent · a473bde1
  Douwe Maan authored Oct 10, 2017
  
  a473bde1
- Split up ldap_extras feature into ldap_group_sync and multiple_ldap_servers · 9786eda8
  Douwe Maan authored Oct 10, 2017
  
  9786eda8
- Merge branch '3562-issue-links' into 'master' · 07630469
  Sean McGivern authored Oct 10, 2017
```
Fix base link for issues on group boards

Closes #3562

See merge request gitlab-org/gitlab-ee!3099
```
  07630469
09 Oct, 2017 9 commits
- [EE] Refactor the testing documentation and divide it into multiple pages · 3f2b4ef2
  Rémy Coutable authored Oct 09, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3f2b4ef2
- resolve some conflicts · 4abd1748
  Jarka Kadlecova authored Oct 09, 2017
  
  4abd1748
- EE port of flash-es6-module · 0dd68f26
  Phil Hughes authored Oct 05, 2017
  
  0dd68f26
- Merge branch 'docs/i18n-ee' into 'master' · bad5081c
  Rémy Coutable authored Oct 09, 2017
```
Improve internationalization docs

See merge request gitlab-org/gitlab-ee!3097
```
  bad5081c
- Merge branch 'jramsay-4012-improve-internationization-docs' into 'master' · 7173c49e
  Achilleas Pipinellis authored Oct 09, 2017
```
Improve internationalization docs

See merge request gitlab-org/gitlab-ce!14570
```
  7173c49e
- Merge branch 'ce-to-ee-2017-10-05' into 'master' · 2d7b656f
  Rémy Coutable authored Oct 09, 2017
```
CE upstream: thursday

Closes gitlab-qa#73, #3611, gitaly#585, gitlab-ce#38417, gitlab-ce#38743, gitlab-ce#38315, gitlab-ce#38187 et gitlab-design#35

See merge request gitlab-org/gitlab-ee!3072
```
  2d7b656f
- CE->EE merge: fix failing specs in spec/models/project_spec.rb · 4f25ca25
  Nick Thomas authored Oct 09, 2017
  
  4f25ca25
- Merge branch 'sh-fix-geo-transfer-tempfile' into 'master' · 1b77e3ec
  Nick Thomas authored Oct 09, 2017
```
Fix Geo transfers failure handling when filename too long

Closes #3682

See merge request gitlab-org/gitlab-ee!3095
```
  1b77e3ec
- Merge branch '10-1-improve-geo-documentation' into 'master' · 8011b689
  Achilleas Pipinellis authored Oct 09, 2017
```
Improved Geo development documentation with 10.0 and 10.1 changes.

See merge request gitlab-org/gitlab-ee!2978
```
  8011b689
08 Oct, 2017 2 commits
- Merge branch 'sh-remove-ux-chmod-permissions-ee' into 'master' · e004e6ba
  Achilleas Pipinellis authored Oct 08, 2017
```
Remove executable permissions on images to make docs lint happy

See merge request gitlab-org/gitlab-ee!3094
```
  e004e6ba
- Fix Geo transfers failure handling when filename too long · a3048ec8
  Stan Hu authored Oct 08, 2017
```
Improves existing log information as well.

Closes #3682
```
  a3048ec8
07 Oct, 2017 16 commits
- Merge branch 'mk-clean-ldap-user-dns' into 'master' · 31a28bfb
  Douwe Maan authored Oct 07, 2017
```
Normalize LDAP user DNs (downcase and remove excess spaces)

Closes #3151

See merge request gitlab-org/gitlab-ee!2942
```
  31a28bfb
- Merge branch 'bvl-fork-network-schema-ee' into 'master' · 45d063b7
  Douwe Maan authored Oct 07, 2017
```
EE-port:  Create merge requests across a fork network

See merge request gitlab-org/gitlab-ee!3087
```
  45d063b7
- Remove executable permissions on images to make docs lint happy · ec00d2f9
  Stan Hu authored Oct 07, 2017
```
[ci skip]
```
  ec00d2f9
- Port of mk-normalize-ldap-user-dns to EE · a6351a58
  Michael Kozono authored Oct 05, 2017
  
  a6351a58
- Merge branch 'gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6-ee' into 'master' · ab3e684f
  Kamil Trzciński authored Oct 07, 2017
```
Port to EE "Bump google-api-client Gem from 0.8.6 to 0.13.6"

See merge request gitlab-org/gitlab-ee!3084
```
  ab3e684f
- Merge branch 'sh-geo-fix-snippet-downloads' into 'master' · 0aaf8e6c
  Nick Thomas authored Oct 07, 2017
```
Fix personal snippet attachments not downloading in Geo secondaries

Closes #3644

See merge request gitlab-org/gitlab-ee!3091
```
  0aaf8e6c
- CE->EE: Fix a failing spec · b57f75ad
  Nick Thomas authored Oct 07, 2017
  
  b57f75ad
- CE->EE: Fix an EE-only spec · f0340766
  Nick Thomas authored Oct 07, 2017
  
  f0340766
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-10-05 · 40be8977
  Nick Thomas authored Oct 07, 2017
  
  40be8977
- Add a spec for editing a file when a project was already forked · 7dcaa682
  Bob Van Landuyt authored Oct 06, 2017
  
  7dcaa682
- Show fork information on the project panel · a2dd511b
  Bob Van Landuyt authored Oct 03, 2017
  
  a2dd511b
- Store the name of a project that's a root of a fork network · 2a5ce8d4
  Bob Van Landuyt authored Oct 03, 2017
```
So we can keep showing it to a user in his project page.
```
  2a5ce8d4
- Find forks within users/namespaces using fork memberships · 8330804e
  Bob Van Landuyt authored Oct 03, 2017
  
  8330804e
- Remove membership from fork network when unlinking · c5140fff
  Bob Van Landuyt authored Sep 30, 2017
  
  c5140fff
- Add a migration to populate fork networks · b88d9ec0
  Bob Van Landuyt authored Sep 29, 2017
```
This uses the existing ForkedProjectLinks
```
  b88d9ec0
- Add a project forks spec helper · 3b891700
  Bob Van Landuyt authored Sep 29, 2017
```
The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.
```
  3b891700