Commits · 5f306480f2cc923d7eed027e08288ae9f855b455 · nexedi / gitlab-ce

04 Dec, 2017 2 commits
- Merge branch 'master-i18n' into 'master' · 5f306480
  Douwe Maan authored Dec 04, 2017
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!3378
```
  5f306480
- Merge branch 'doc-evn-ssh-or-sshd' into 'master' · 76105b88
  Nick Thomas authored Dec 04, 2017
```
Clarify it may be ssh

See merge request gitlab-org/gitlab-ee!3598
```
  76105b88
02 Dec, 2017 2 commits
- Revert "Geo: Prepare for shard-specific repository sync worker" · ccddf64f
  Stan Hu authored Dec 01, 2017
```
This reverts commit 83b31c0e.
```
  ccddf64f
- Geo: Prepare for shard-specific repository sync worker · 83b31c0e
  Stan Hu authored Dec 01, 2017
  
  83b31c0e
01 Dec, 2017 9 commits
- Provide installation specific reload instructions · f75f42e5
  Ernst van Nierop authored Dec 01, 2017
  
  f75f42e5
- Merge branch 'jramsay-geo-hashed-storage-upgrade-docs' into 'master' · cc57f0c4
  Stan Hu authored Dec 01, 2017
```
Add hashed storage warning to upgrade guide

Closes #4186

See merge request gitlab-org/gitlab-ee!3524
```
  cc57f0c4
- Add hashed storage warning to upgrade guide · 0d812f1b
  James Ramsay authored Dec 01, 2017
  
  0d812f1b
- Merge branch 'docs-export-import-issues' into 'master' · 85dfd584
  Achilleas Pipinellis authored Dec 01, 2017
```
Docs export import issues

See merge request gitlab-org/gitlab-ee!3594
```
  85dfd584
- Merge branch '4185-spec-failure' into 'master' · 6a199ab8
  Sean McGivern authored Dec 01, 2017
```
Add additional spec and assertions for epis_issues

See merge request gitlab-org/gitlab-ee!3601
```
  6a199ab8
- Add additional spec and assertions for epis_issues · 6cf8378d
  Jarka Kadlecova authored Dec 01, 2017
  
  6cf8378d
- Merge branch 'mk-fix-doc-reconfigure-error' into 'master' · dcfc2491
  Nick Thomas authored Dec 01, 2017
```
Rearrange instructions in the Geo DB replication setup docs to avoid known error

Closes omnibus-gitlab#2797

See merge request gitlab-org/gitlab-ee!3597
```
  dcfc2491
- Rearrange instructions in the Geo DB replication setup docs to avoid known error · 66232e35
  Michael Kozono authored Dec 01, 2017
  
  66232e35
- clarify it may be ssh · a60dbfc0
  ernstvn authored Nov 30, 2017
  
  a60dbfc0
30 Nov, 2017 27 commits
- Merge branch 'jramsay-4116-geo-trust-docs' into 'master' · d15e704e
  Stan Hu authored Nov 30, 2017
```
Simplify db IP address documentation

Closes #4116

See merge request gitlab-org/gitlab-ee!3520
```
  d15e704e
- Capitalize geo -> Geo and remove trailing whitespace · 28778a62
  Stan Hu authored Nov 30, 2017
```
[ci skip]
```
  28778a62
- Merge branch 'psimyn-vue-note-store-ee' into 'master' · 2b416da2
  Fatih Acet authored Nov 30, 2017
```
issue note store refactor

See merge request gitlab-org/gitlab-ee!3567
```
  2b416da2
- Missed one change · 8d7ced9a
  James Ramsay authored Nov 30, 2017
  
  8d7ced9a
- Fix feedback from Jarv · 291de4ae
  James Ramsay authored Nov 30, 2017
  
  291de4ae
- Fix up from Ernst feedback · 3e1be05f
  James Ramsay authored Nov 30, 2017
  
  3e1be05f
- Second significant attempt · 39aee3da
  James Ramsay authored Nov 30, 2017
  
  39aee3da
- Docs export import issues · f451b341
  Victor Wu authored Nov 30, 2017
  
  f451b341
- Prefer 255.255.255.255 to 1 · d8f5b8ff
  James Ramsay authored Nov 30, 2017
  
  d8f5b8ff
- Update CHANGELOG.md for 10.2.3 · 3bbb7d55
  Michael Kozono authored Nov 30, 2017
```
[ci skip]
```
  3bbb7d55
- Update CHANGELOG-EE.md for 10.2.3-ee · 5bf7ba37
  Michael Kozono authored Nov 30, 2017
```
[ci skip]
```
  5bf7ba37
- Fix poor common network wording · 5151804a
  James Ramsay authored Nov 30, 2017
  
  5151804a
- Remove dig in favour of curl to determine public ip · af970c33
  James Ramsay authored Nov 30, 2017
  
  af970c33
- Merge branch 'fj-3821-push-web-hook-event' into 'master' · 4eacd587
  Douwe Maan authored Nov 30, 2017
```
Use `push` web hook events for pull mirroring

Closes #3821

See merge request gitlab-org/gitlab-ee!3453
```
  4eacd587
- Use `push` web hook events for pull mirroring · 9cdcc230
  Francisco Javier López authored Nov 30, 2017
  
  9cdcc230
- Merge branch 'ce-to-ee-2017-11-29' into 'master' · 1724b6a3
  Rémy Coutable authored Nov 30, 2017
```
CE upstream - Wednesday

Closes gitaly#730, gitaly#656, gitlab-ce#38962, gitlab-ce#40373 et gitlab-ce#40534

See merge request gitlab-org/gitlab-ee!3585
```
  1724b6a3
- Merge branch 'ee-multi-file-editor-dirty-diff-indicator' into 'master' · 854668a4
  Tim Zallmann authored Nov 30, 2017
```
EE port of multi-file-editor-dirty-diff-indicator

See merge request gitlab-org/gitlab-ee!3582
```
  854668a4
- Resolve conflict in db/schema.rb · 2ecdfe47
  Rémy Coutable authored Nov 30, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2ecdfe47
- Resolve conflict in app/assets/stylesheets/pages/repo.scss · d7d5227d
  Rémy Coutable authored Nov 30, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d7d5227d
- Resolve conflict in app/assets/stylesheets/framework/icons.scss · c2c0b468
  Rémy Coutable authored Nov 30, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c2c0b468
- Resolve conflict in app/assets/javascripts/repo/components/repo_tab.vue · 848890b0
  Rémy Coutable authored Nov 30, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  848890b0
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-11-29 · eb6206b6
  Rémy Coutable authored Nov 30, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  eb6206b6
- updated diff spec · 4635b0fb
  Phil Hughes authored Nov 30, 2017
  
  4635b0fb
- Merge branch 'master' into ee-multi-file-editor-dirty-diff-indicator · 6ff2fc84
  Phil Hughes authored Nov 30, 2017
  
  6ff2fc84
- Merge branch 'load-balancing-handle-outdated-replicas' into 'master' · 689b3119
  Douwe Maan authored Nov 30, 2017
```
Handle outdated replicas in the DB load balancer

Closes #2197

See merge request gitlab-org/gitlab-ee!3526
```
  689b3119
- Merge branch 'ee-39455-clone-dropdown-should-not-have-a-tooltip' into 'master' · 8c43fa1f
  Tim Zallmann authored Nov 30, 2017
```
EE counterpart for Resolve "Clone dropdown should not have a tooltip"

See merge request gitlab-org/gitlab-ee!3375
```
  8c43fa1f
- Merge branch 'ee-multi-file-editor-css-fixes' into 'master' · bffd07ca
  Tim Zallmann authored Nov 30, 2017
```
EE port of multi-file-editor-css-fixes

See merge request gitlab-org/gitlab-ee!3583
```
  bffd07ca