Commits · d15e704ec827c01939500ad20ad7baab9757cbe6 · nexedi / gitlab-ce

30 Nov, 2017 28 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
- 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
- Merge branch 'ee-es-module-copy-to-clipboard' into 'master' · a451e196
  Tim Zallmann authored Nov 30, 2017
```
Port of "Refactor 'copy_to_clipboard.js'" to EE

See merge request gitlab-org/gitlab-ee!3580
```
  a451e196
- Merge branch 'ee-40629-icon-styles' into 'master' · 964bd9cb
  Annabel Dunstone Gray authored Nov 30, 2017
```
fix icon colors in commit list

See merge request gitlab-org/gitlab-ee!3581
```
  964bd9cb
29 Nov, 2017 12 commits
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ee-40629-icon-styles · 23c928c0
  Simon Knox authored Nov 30, 2017
  
  23c928c0
- Merge branch '4158-fix-geo-nodes-url' into 'master' · 07203ff6
  Robert Speicher authored Nov 29, 2017
```
Handle Geo node URL parse errors intelligently

Closes #4158

See merge request gitlab-org/gitlab-ee!3552
```
  07203ff6
- Merge branch 'ee-40459-svg-icon-fix' into 'master' · 44349697
  Annabel Dunstone Gray authored Nov 29, 2017
```
svg icon fix

See merge request gitlab-org/gitlab-ee!3565
```
  44349697
- Resolve conflict in app/services/projects/hashed_storage/migrate_repository_service.rb · 5497ee6a
  Rémy Coutable authored Nov 29, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5497ee6a
- Resolve conflict in app/services/projects/hashed_storage/migrate_attachments_service.rb · cfdab57f
  Rémy Coutable authored Nov 29, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cfdab57f
- Resolve conflict in app/services/projects/update_service.rb · 241da0a1
  Rémy Coutable authored Nov 29, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  241da0a1
- Resolve conflict in app/models/application_setting.rb · 3c49758f
  Rémy Coutable authored Nov 29, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3c49758f
- Resolve conflict in lib/gitlab/gitaly_client.rb · fbf4b95c
  Rémy Coutable authored Nov 29, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  fbf4b95c
- Resolve conflict in db/schema.rb · 3d6f96a3
  Rémy Coutable authored Nov 29, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3d6f96a3
- Resolve conflict in app/services/merge_requests/build_service.rb · 664e2c67
  Rémy Coutable authored Nov 29, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  664e2c67
- Handle Geo node URL parse errors intelligently · 2a552e55
  Nick Thomas authored Nov 24, 2017
```
By storing the URL unmodified in the database, parsing it can happen at
validation time, rather than during data entry. This allows problems to be
reported to the end-user via the errors hash, rather than an exception.
```
  2a552e55
- Merge branch '4175-fix-elasticsearch-syntax-docs' into 'master' · c7c8eb86
  Achilleas Pipinellis authored Nov 29, 2017
```
Fix Advanced Search Syntax documentation

See merge request gitlab-org/gitlab-ee!3571
```
  c7c8eb86