Commits · master · samzhou1 / GitLab Enterprise Edition · GitLab

Apr 23, 2018
- Merge branch 'ce-to-ee-2018-04-22' into 'master' · 00d5f206
  Stan Hu authored Apr 23, 2018
  00d5f206
Apr 22, 2018
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-22 · ebe8021a
  🤖 GitLab Bot 🤖 authored Apr 22, 2018
  
  ebe8021a
- Merge branch '45625-job-log-shows-no-job-log' into 'master' · c212908a
  Grzegorz Bizon authored Apr 22, 2018
  c212908a
- Removes 'no job log' from trace action · 3327bf62
  Mayra Cabrera authored Apr 22, 2018
  3327bf62
Apr 21, 2018
- Merge branch 'ce-to-ee-2018-04-20' into 'master' · 54d9b138
  Stan Hu authored Apr 21, 2018
  54d9b138
- Resolve conflicts in app/models/milestone.rb · 6339afc7
  Stan Hu authored Apr 20, 2018
  
  6339afc7
- Resolve conflicts in db/schema.rb · ad60cd07
  Stan Hu authored Apr 20, 2018
  
  ad60cd07
Apr 20, 2018
- Merge branch '5181-sync-repack' into 'master' · 243d6882
  Nick Thomas authored Apr 20, 2018
  243d6882
- "Geo: schedule a git repack after initial clone" · f6875b16
  Gabriel Mazetto authored Apr 20, 2018
  
  f6875b16
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-20 · 706951e8
  🤖 GitLab Bot 🤖 authored Apr 20, 2018
  706951e8
- It is stable since it works. · 20c28575
  Sid Sijbrandij authored Apr 20, 2018
  
  20c28575
- Merge branch 'jr-unprotect-limitation-docs' into 'master' · adb05e84
  Sid Sijbrandij authored Apr 20, 2018
  adb05e84
- Merge branch '5697-background-verification-docs' into 'master' · aaa0df13
  Marcia Ramos authored Apr 20, 2018
  aaa0df13
- Add docs for background verification · 1aa8b317
  Douglas Barbosa Alexandre authored Apr 20, 2018
  
  1aa8b317
- Merge branch 'ce-to-ee-2018-04-20' into 'master' · 9c86dd72
  Robert Speicher authored Apr 20, 2018
  9c86dd72
- Lock mysql image to 5.7 for `use-mysql-with-elasticsearch` · d14b14e8
  Robert Speicher authored Apr 20, 2018
  
  d14b14e8
- Merge branch 'leipert-dedupe-yarn-dependencies' into 'master' · ff778061
  Mike Greiling authored Apr 20, 2018
  ff778061
- Dedupe yarn dependencies · 49518bc6
  Lukas Eipert authored Apr 20, 2018 and Mike Greiling committed Apr 20, 2018
  
  49518bc6
- Merge branch 'ee-leipert-dedupe-yarn-dependencies' into 'master' · 70f9a29d
  Mike Greiling authored Apr 20, 2018
  70f9a29d
- Merge branch 'sh-downgrade-mysql-ci' into 'master' · 8b40d733
  Robert Speicher authored Apr 20, 2018 and Robert Speicher committed Apr 20, 2018
  8b40d733
- Merge branch 'sh-downgrade-mysql-ci' into 'master' · 3c3cab8b
  Robert Speicher authored Apr 20, 2018
  3c3cab8b
- Merge branch 'docs-pages-update2' into 'master' · 751f947a
  Robert Speicher authored Apr 20, 2018
  751f947a
- Fix conflict related to LfsFileLock block · a9fbbe82
  Ruben Alexis authored Apr 20, 2018
  
  a9fbbe82
- Resolve CHANGELOG.md by using CE's version · 84548ab3
  Robert Speicher authored Apr 20, 2018
  84548ab3
- Downgrade MySQL CI service from 8.0 to 5.7 · cdb5f985
  Stan Hu authored Apr 20, 2018
  cdb5f985
- Merge branch '5722-dr-manual-improvements-docs' into 'master' · d3f6078c
  Nick Thomas authored Apr 20, 2018
  d3f6078c
- CE->EE: Fix conflicts relating to project snapshots · b36b4f8c
  Nick Thomas authored Apr 20, 2018
  
  b36b4f8c
- Warn admin 60 may be removed from protected branch levels · 022bff80
  James Ramsay authored Apr 20, 2018
  
  022bff80
- Fix conflict: app/assets/javascripts/boards/models/list.js · ca8f95c2
  Felipe authored Apr 20, 2018
  
  ca8f95c2
- Merge branch 'ab-44259-atomic-internal-ids-for-all-models' into 'master' · 7f8dc68c
  Yorick Peterse authored Apr 20, 2018
  7f8dc68c
- Atomic internal ids for all models · 9ea2fc85
  Andreas Brandl authored Apr 20, 2018 and Yorick Peterse committed Apr 20, 2018
  
  9ea2fc85
- Merge branch 'ee-ab-44259-atomic-internal-ids-for-all-models' into 'master' · c298ceda
  Yorick Peterse authored Apr 20, 2018
  c298ceda
- EE-port for "Atomic internal ids for all models" · 34cc18be
  Andreas Brandl authored Apr 20, 2018 and Yorick Peterse committed Apr 20, 2018
  
  34cc18be
- Fix conflicts in db/schema.rb · 1d21ca57
  Sean McGivern authored Apr 20, 2018
  
  1d21ca57
- Fix conflicts in LICENSE · 8c7de34c
  Sean McGivern authored Apr 20, 2018
  
  8c7de34c
- Fix conflicts in issue models · 886e3327
  Sean McGivern authored Apr 20, 2018
  
  886e3327
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-20 · a48e7a0f
  🤖 GitLab Bot 🤖 authored Apr 20, 2018
  a48e7a0f
- Merge branch 'sh-redis-cache-persistence-ha-docs' into 'master' · 87e592dc
  Marin Jankovski authored Apr 20, 2018
  87e592dc
- Add documentation on how to configure Redis Sentinel by persistent class · d9e8bb4b
  Stan Hu authored Apr 20, 2018 and Marin Jankovski committed Apr 20, 2018
  
  d9e8bb4b
- Merge branch '5583-geo-doesn-t-replicate-custom_hooks-docs' into 'master' · 213fa47d
  Douwe Maan authored Apr 20, 2018
  213fa47d