Commits · master · AndrewPro / GitLab Enterprise Edition · GitLab

Jun 24, 2017
- Merge branch 'sh-geo-fix-middleware' into 'master' · de5170d2
  Douwe Maan authored Jun 24, 2017
  de5170d2
Jun 23, 2017
- Merge branch '2570-namespace-rebase-before-merge' into 'master' · c44be0d3
  Douwe Maan authored Jun 23, 2017
  c44be0d3
- Merge branch 'move_ee_ldap_person' into 'master' · 9955ea6a
  Grzegorz Bizon authored Jun 23, 2017
  9955ea6a
- Merge branch 'tc-add-user-has-full-private-access-ee' into 'master' · 1313580e
  Douwe Maan authored Jun 23, 2017
  1313580e
- Fix Geo middleware to work properly with multiple requests · 53986229
  Stan Hu authored Jun 23, 2017
  53986229
- Merge branch 'remove-force-mirror-scheduling-from-project-import-worker' into 'master' · 2d3f0c28
  Douwe Maan authored Jun 23, 2017
  2d3f0c28
- Merge branch 'add-shared-runners-minutes-limit-to-namespace-admin-api' into 'master' · d7085016
  Douwe Maan authored Jun 23, 2017
  d7085016
- Move all EE-only changes for LDAP::Person to EE module · e01e2f26
  Drew Blessing authored Jun 23, 2017
  e01e2f26
- Forces import worker with mirror to insert mirror in front of queue · 1b74918a
  Tiago Botelho authored Jun 23, 2017
  
  1b74918a
- Merge branch '2657-use-stub-licensed-features' into 'master' · 81313af3
  Douwe Maan authored Jun 23, 2017
  81313af3
- Introduce namespace license checks for rebase before merge · 275d7b38
  Nick Thomas authored Jun 21, 2017
  
  275d7b38
- Refactor squash and merge parts of MergeRequest into an EE module · 051fbfb8
  Nick Thomas authored Jun 22, 2017
  
  051fbfb8
- Refactor Projects::MergeRequestsController into separate CE and EE files · fb7c7515
  Nick Thomas authored Jun 21, 2017
  
  fb7c7515
- Merge branch 'ce-to-ee-2017-06-23' into 'master' · c2c34698
  Dmytro Zaporozhets (DZ) authored Jun 23, 2017
  c2c34698
- Use stub_licensed_features everywhere it is appropriate · ea323463
  Nick Thomas authored Jun 23, 2017
  
  ea323463
- Filter shared_runners_minutes_limit on Namespace entity (admin-only) · d8ffaa31
  Oswaldo Ferreira authored Jun 23, 2017
  
  d8ffaa31
- Merge branch 'bvl-add-spec-license-helpers' into 'master' · 68918387
  Sean McGivern authored Jun 23, 2017
  68918387
- Merge branch 'docs/prom-metrics-ee' into 'master' · a5381af7
  Marcia Ramos authored Jun 23, 2017
  a5381af7
- Resolve documentation merge conflicts · f0b91cac
  Nick Thomas authored Jun 23, 2017
  
  f0b91cac
- Resolve spec conflicts · 05355cce
  Nick Thomas authored Jun 23, 2017
  
  05355cce
- Fix conflicts in support code · 07242f81
  Nick Thomas authored Jun 23, 2017
  
  07242f81
- Fix view conflicts · ef0ba26f
  Nick Thomas authored Jun 23, 2017
  
  ef0ba26f
- Change method signature to allow stubbing multiple features · 2b90727c
  Bob Van Landuyt authored Jun 23, 2017
  
  2b90727c
- Resolve controller conflicts · 629c374b
  Nick Thomas authored Jun 23, 2017
  
  629c374b
- Resolve scss conflicts · 5804f2da
  Nick Thomas authored Jun 23, 2017
  
  5804f2da
- Resolve JS conflicts · af9cfc3f
  Nick Thomas authored Jun 23, 2017
  
  af9cfc3f
- Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-06-23 · 30672c53
  Nick Thomas authored Jun 23, 2017
  
  30672c53
- Merge branch 'sh-update-geo-ssh' into 'master' · ac44a89e
  Achilleas Pipinellis authored Jun 23, 2017
  ac44a89e
- Merge branch '2633-related-issues-public-api' into 'master' · 378a040b
  Grzegorz Bizon authored Jun 23, 2017
  378a040b
- Merge branch 'winh-promise-rejects-fail-tests' into 'master' · 801cf923
  Phil Hughes authored Jun 23, 2017
  801cf923
- Make JavaScript tests fail for unhandled Promise rejections · 925eea26
  Winnie Hellmann authored Jun 23, 2017 and Phil Hughes committed Jun 23, 2017
  
  925eea26
- Add User#full_private_access? to check if user has Private access · 5ae28ca5
  Toon Claes authored Jun 22, 2017
  5ae28ca5
- Merge branch 'hot-reload' into 'master' · 9c7bf123
  Tim Zallmann authored Jun 23, 2017
  9c7bf123
- Merge branch '31574-bootstrap-form-builder' into 'master' · cf131aa4
  Phil Hughes authored Jun 23, 2017
  cf131aa4
- Merge branch '33992-mr-target-avatar' into 'master' · 0c126dc8
  Phil Hughes authored Jun 23, 2017
  0c126dc8
- Merge branch 'fix-sidebar-scroll-jump' into 'master' · f76ed815
  Phil Hughes authored Jun 23, 2017
  f76ed815
- Merge branch '34095-permalinks' into 'master' · 182db09e
  Phil Hughes authored Jun 23, 2017
  182db09e
- Fix offset for fixed nav · 588d5564
  Annabel Dunstone Gray authored Jun 23, 2017 and Phil Hughes committed Jun 23, 2017
  
  588d5564
- Merge branch 'patch-1' into 'master' · 60471a75
  Sean McGivern authored Jun 23, 2017
  60471a75
- Merge branch 'notes-es-class-syntax' into 'master' · 61064006
  Tim Zallmann authored Jun 23, 2017
  61064006