Commits · 97cffea7ba70137b536e4e58416b0d3a7f7994b8 · nexedi / gitlab-ce

02 Nov, 2017 3 commits

Merge branch 'sh-geo-add-prom-metrics' into 'master' · 97cffea7
Nick Thomas authored Nov 02, 2017
```
Add support for logging Prometheus metrics for Geo

See merge request gitlab-org/gitlab-ee!3187
```
97cffea7
Add support for logging Prometheus metrics for Geo · 1987ad53
Stan Hu authored Nov 02, 2017

1987ad53

Merge branch... · 715ea16f

Tim Zallmann authored Nov 02, 2017

Merge branch 'ee-35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-state' into 'master'

Port of Resolve "Searchable settings puts expand/collapse toggle in an invalid state." to EE

See merge request gitlab-org/gitlab-ee!3153

715ea16f

01 Nov, 2017 23 commits
- Merge branch '3887-issue-board-configuration-doc' into 'master' · a63ae584
  Victor Wu authored Nov 01, 2017
```
Updates issue board configuration doc

Closes #3887

See merge request gitlab-org/gitlab-ee!3240
```
  a63ae584
- Updates issue board configuration doc · a397d2c5
  Oswaldo Ferreira authored Nov 01, 2017
  
  a397d2c5
- Merge branch 'dm-namespace-license-plans' into 'master' · 6bdbe7c0
  Sean McGivern authored Nov 01, 2017
```
Refactor Namespace#feature_available_in_plan?

See merge request gitlab-org/gitlab-ee!3249
```
  6bdbe7c0
- Merge branch 'sh-sync-geo-fix' into 'master' · 1146d154
  Nick Thomas authored Nov 01, 2017
```
Merge branch '3271-disable-geo-primary-node-keys' into 'master'

See merge request gitlab-org/gitlab-ee!3246
```
  1146d154
- Refactor Namespace#feature_available_in_plan? · addb45c3
  Douwe Maan authored Nov 01, 2017
  
  addb45c3
- Merge branch 'docs/no-comments-ee' into 'master' · 80272bc7
  🚄 Job van der Voort 🚀 authored Nov 01, 2017
```
Exclude comments from specific docs

See merge request gitlab-org/gitlab-ee!3248
```
  80272bc7
- Exclude comments from specific docs · 4b42dd6b
  Achilleas Pipinellis authored Nov 01, 2017
  
  4b42dd6b
- Merge branch '3271-disable-geo-primary-node-keys' into 'security-9-5-ee' · 2c4011f0
  Stan Hu authored Aug 29, 2017
```
Disable geo primary node keys (9.5)

See merge request gitlab/gitlab-ee!536
```
  2c4011f0
- Merge branch 'geo-doc-fix' into 'master' · bfc2fcea
  Stan Hu authored Nov 01, 2017
```
Fix TYPO in Geo development Doc

See merge request gitlab-org/gitlab-ee!3243
```
  bfc2fcea
- Merge branch 'ee-38869-labels' into 'master' · 81ceeadd
  Phil Hughes authored Nov 01, 2017
```
Port of 38869-labels to EE

See merge request gitlab-org/gitlab-ee!3238
```
  81ceeadd
- Port of 38869-labels to EE · 34c1a8d8
  Filipa Lacerda authored Nov 01, 2017
  
  34c1a8d8
- Fix TYPO in Geo development Doc · ccdbcd68
  Valery Sizov authored Nov 01, 2017
  
  ccdbcd68
- Merge branch 'ce_upstream' into 'master' · 7206b29c
  Grzegorz Bizon authored Nov 01, 2017
```
CE upstream

Closes gitaly#677, gitaly#673, and gitlab-ce#39509

See merge request gitlab-org/gitlab-ee!3236
```
  7206b29c
- Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 73c7f444
  Valery Sizov authored Nov 01, 2017
  
  73c7f444
- [CE->EE] Resove non-JS related conflicts · 6b9c1a57
  Valery Sizov authored Nov 01, 2017
  
  6b9c1a57
- resolve repo editor JS conflicts · 19a3b8a6
  Phil Hughes authored Nov 01, 2017
  
  19a3b8a6
- Merge branch 'ee-zj/gitlab-ce-zj-ruby-2.3.5' into 'master' · ec26ed59
  Sean McGivern authored Nov 01, 2017
```
[EE] Upgrade Ruby to 2.3.5

See merge request gitlab-org/gitlab-ee!3234
```
  ec26ed59
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream[ci skip] · 8e38899d
  Valery Sizov authored Nov 01, 2017
  
  8e38899d
- Merge branch 'rc-qa-mattermost-login' into 'master' · 6306e797
  Grzegorz Bizon authored Nov 01, 2017
```
Add login mattermost to Test::Integration::Mattermost

See merge request gitlab-org/gitlab-ce!15033
```
  6306e797
- Merge branch 'go-get-ssh' into 'master' · f9a85b0c
  Douwe Maan authored Nov 01, 2017
```
Returns a SSH url for go-get=1

Closes #38858

See merge request gitlab-org/gitlab-ce!14990
```
  f9a85b0c
- Merge branch '39633-convert-fuzzaldrin-plus-js-library-to-be-a-yarn-managed-library' into 'master' · 405ecbe5
  Phil Hughes authored Nov 01, 2017
```
Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"

Closes #39633

See merge request gitlab-org/gitlab-ce!15097
```
  405ecbe5
- Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library" · e148f1f9
  Tim Zallmann authored Nov 01, 2017
  
  e148f1f9
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream[ci skip] · 71c8b3e7
  Valery Sizov authored Nov 01, 2017
  
  71c8b3e7
31 Oct, 2017 14 commits
- Returns a ssh url for go-get=1 · 1cc92dae
  Guilherme Vieira authored Oct 22, 2017
  
  1cc92dae
- Add background migration to .flayignore · 5fe95565
  Michael Kozono authored Oct 31, 2017
  
  5fe95565
- CE->EE add packagist_service.rb to .flayignore file · a9c4a531
  Valery Sizov authored Oct 31, 2017
  
  a9c4a531
- Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master' · 01340794
  Sean McGivern authored Oct 31, 2017
```
Migrate Gitlab::Git::Wiki#page to Gitaly

Closes gitaly#677

See merge request gitlab-org/gitlab-ce!14955
```
  01340794
- Merge branch 'issue_3877_ee' into 'master' · e24d1890
  Sean McGivern authored Oct 31, 2017
```
[EE-Port] Allow to promote group milestones

See merge request gitlab-org/gitlab-ee!3216
```
  e24d1890
- [EE-Port] Allow to promote group milestones · 73d94140
  Felipe Artur authored Oct 31, 2017
  
  73d94140
- Stop sections from expanding when scrolling over the 1px section · e0caa628
  Eric Eastwood authored Oct 17, 2017
```
See https://gitlab.slack.com/archives/C0GQHHPGW/p1508253662000271
```
  e0caa628
- update settings panels to place "expanded" class on the correct element · 5f5f341a
  Mike Greiling authored Oct 14, 2017
  
  5f5f341a
- remove needlessly complicated, duplicate css class for expanded settings panels · c3baf782
  Mike Greiling authored Oct 14, 2017
  
  c3baf782
- Merge branch 'ee-multi-file-editor-vuex' into 'master' · 6547036d
  Filipa Lacerda authored Oct 31, 2017
```
EE port of multi-file-editor-vuex

See merge request gitlab-org/gitlab-ee!3235
```
  6547036d
- Merge branch 'dm-ldap-identity-normalize-dn' into 'master' · 85a67799
  Sean McGivern authored Oct 31, 2017
```
Normalize LDAP DN when looking up identity

Closes #39559

See merge request gitlab-org/gitlab-ce!15103
```
  85a67799
- Merge branch 'ee-39561-seed_fu-fails-to-load-gitlab-test' into 'master' · 290598bb
  Sean McGivern authored Oct 31, 2017
```
[EE] Handle large values on `MergeRequestDiffCommit` dates

See merge request gitlab-org/gitlab-ee!3229
```
  290598bb
- Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master' · 01c95492
  Rémy Coutable authored Oct 31, 2017
```
Bump carrierwave to 1.2.1

Closes #39580

See merge request gitlab-org/gitlab-ce!15072
```
  01c95492
- Merge branch 'multi-file-editor-vuex' into 'master' · b86c3a73
  Filipa Lacerda authored Oct 31, 2017
```
Move multi-file editor store to Vuex

See merge request gitlab-org/gitlab-ce!15046
```
  b86c3a73