Commits · 65a20b94c6552847be7f94dd62216bae5b77db19 · nexedi / gitlab-ce

06 Feb, 2018 7 commits
- Merge branch 'ee-14256-upload-destroy-removes-file' into 'master' · 65a20b94
  Sean McGivern authored Feb 06, 2018
```
Port 16799 to EE

See merge request gitlab-org/gitlab-ee!4389
```
  65a20b94
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee · cbaa5ced
  Marin Jankovski authored Feb 06, 2018
  
  cbaa5ced
- Merge branch 'ce-to-ee-2018-02-05' · 58278d0c
  Marin Jankovski authored Feb 06, 2018
  
  58278d0c
- Merge branch 'da-fix-rake-geo-db-seed' into 'master' · 03a06a86
  Stan Hu authored Feb 06, 2018
```
Fix path for Geo seeds file

Closes #4819 and gitlab-development-kit#320

See merge request gitlab-org/gitlab-ee!4390
```
  03a06a86
- Remove duplicate method · 20b7818d
  Toon Claes authored Feb 06, 2018
  
  20b7818d
- Merge branch 'ee-31885-ability-to-transfer-groups-to-another-group' into 'master' · 06725296
  Douwe Maan authored Feb 06, 2018
```
Port to EE: 31885 Ability to transfer a single group to another group

See merge request gitlab-org/gitlab-ee!4391
```
  06725296
- Port to EE: 31885 Ability to transfer a single group to another group · 2d243df4
  Mayra Cabrera authored Feb 06, 2018
  
  2d243df4
05 Feb, 2018 33 commits
- Merge branch 'ee-fj-22607-lowercase-usernames-from-ldap' into 'master' · 3f4a07c2
  Douwe Maan authored Feb 05, 2018
```
Port from CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16791

See merge request gitlab-org/gitlab-ee!4388
```
  3f4a07c2
- Add CHANGELOG · a7633af0
  Douglas Barbosa Alexandre authored Feb 05, 2018
  
  a7633af0
- Fix path for Geo seeds file · 86ff2511
  Douglas Barbosa Alexandre authored Feb 05, 2018
  
  86ff2511
- Merge branch 'ee-41672-emphasize-gke-cluster-to-new-users' into 'master' · 0ae750a5
  Clement Ho authored Feb 05, 2018
```
Add feature highlight blue dot to GKE "Clusters" sidebar item -- EE merge edition

See merge request gitlab-org/gitlab-ee!4311
```
  0ae750a5
- fix CE to EE conflicts · cc7f1297
  Micaël Bergeron authored Feb 05, 2018
  
  cc7f1297
- Port from CE · 0c411a99
  Francisco Javier López authored Feb 05, 2018
  
  0c411a99
- Restore feature_highlight code · 0e2f94cc
  Eric Eastwood authored Jan 10, 2018
```
From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760

Was reverted in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373
```
  0e2f94cc
- Merge branch 'ee-32282-add-foreign-keys-to-todos' into 'master' · 0b6dead2
  Yorick Peterse authored Feb 05, 2018
```
Port of 32282-add-foreign-keys-to-todos to EE.

See merge request gitlab-org/gitlab-ee!4383
```
  0b6dead2
- Resolve spec/models/repository_spec.rb conflict. · 71b9458e
  Marin Jankovski authored Feb 05, 2018
```
# Conflicts:
#   spec/models/repository_spec.rb
```
  71b9458e
- app/views/ci/variables/_variable_row.html.haml · 4792e71b
  Mario de la Ossa authored Feb 05, 2018
  
  4792e71b
- resolve conflicts on app/assets/stylesheets/framework.scss · 70808fcb
  Mario de la Ossa authored Feb 05, 2018
  
  70808fcb
- resolve conflicts on app/assets/javascripts/main.js · fbc87366
  Mario de la Ossa authored Feb 05, 2018
  
  fbc87366
- resolve conflicts on app/assets/javascripts/dispatcher.js · f8de4dc3
  Mario de la Ossa authored Feb 05, 2018
  
  f8de4dc3
- resolve conflicts on spec/lib/gitlab/usage_data_spec.rb · f499fde0
  Mario de la Ossa authored Feb 05, 2018
  
  f499fde0
- resolve conflicts on spec/lib/gitlab/current_settings_spec.rb · 88cd527b
  Mario de la Ossa authored Feb 05, 2018
  
  88cd527b
- resolve conflicts on app/views/layouts/nav/sidebar/_profile.html.haml · 310b2e7f
  Mario de la Ossa authored Feb 05, 2018
  
  310b2e7f
- resolve conflicts on app/views/layouts/devise.html.haml · 0d8a1472
  Mario de la Ossa authored Feb 05, 2018
  
  0d8a1472
- resolve conflicts on app/views/help/index.html.haml · 5dc05091
  Mario de la Ossa authored Feb 05, 2018
  
  5dc05091
- resolve conflicts on app/views/admin/health_check/show.html.haml · c0940b7f
  Mario de la Ossa authored Feb 05, 2018
  
  c0940b7f
- Merge branch 'ee-fj-37273-moving-wiki-pages-from-the-ui' into 'master' · 408673bb
  Sean McGivern authored Feb 05, 2018
```
Port from CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16313

See merge request gitlab-org/gitlab-ee!4377
```
  408673bb
- Port from CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16313 · 4e8c66cf
  Francisco Javier López authored Feb 05, 2018
  
  4e8c66cf
- Merge branch 'zj-ref-contains-ee' into 'master' · 5f486fe6
  Douwe Maan authored Feb 05, 2018
```
Client changes for Tag,BranchNamesContainingCommit

See merge request gitlab-org/gitlab-ee!4372
```
  5f486fe6
- Merge branch 'ee-42547-upload-store-mount-point' into 'master' · 9163bc53
  Sean McGivern authored Feb 05, 2018
```
Port 42547 to EE

See merge request gitlab-org/gitlab-ee!4363
```
  9163bc53
- Port of 32282-add-foreign-keys-to-todos to EE. · e988d0e4
  Andreas Brandl authored Feb 05, 2018
  
  e988d0e4
- fix the Upload#store not being updated upon migration · ecc8326b
  Micaël Bergeron authored Feb 05, 2018
  
  ecc8326b
- port 42547 to ee · a50ab5e1
  Micaël Bergeron authored Feb 02, 2018
  
  a50ab5e1
- Merge branch 'ee-persistent-callouts' into 'master' · db735398
  Kamil Trzciński authored Feb 05, 2018
```
Ee persistent callouts

See merge request gitlab-org/gitlab-ee!4356
```
  db735398
- Merge branch '4782-fix-geo-node-status-version-and-revision' into 'master' · 37a8c7aa
  Sean McGivern authored Feb 05, 2018
```
Report the correct version and revision for Geo node status requests

Closes #4782

See merge request gitlab-org/gitlab-ee!4353
```
  37a8c7aa
- Add CHANGELOG · 00c7063b
  Matija Čupić authored Feb 05, 2018
  
  00c7063b
- Refactor UserCalloutsController enum check · c280fafa
  Matija Čupić authored Feb 05, 2018
  
  c280fafa
- Refactor .show_gke_cluster_integration_callout? · f0420691
  Matija Čupić authored Feb 05, 2018
  
  f0420691
- Bump UserCallout feature_name enum index · 18c3911a
  Matija Čupić authored Feb 05, 2018
  
  18c3911a
- Merge branch 'update_geo_setup_guide_to_not_delete_keys' into 'master' · ce5d428c
  Nick Thomas authored Feb 05, 2018
```
Update Geo setup guide to not delete private keys ever, only replace them

See merge request gitlab-org/gitlab-ee!4381
```
  ce5d428c