Commits · master · Lido Fernandez / GitLab Enterprise Edition · GitLab

Dec 11, 2017
- Merge branch 'move-doc-contribution-analytics' into 'master' · b5862567
  Achilleas Pipinellis authored Dec 11, 2017
  b5862567
- Merge branch 'ee-gitaly-mirroring-prep' into 'master' · 5722f7b7
  Robert Speicher authored Dec 11, 2017
  5722f7b7
- Merge branch 'rs-limit-plan-seed' into 'master' · 229014dc
  Rémy Coutable authored Dec 11, 2017
  229014dc
- Merge branch 'ce-to-ee-2017-12-06' into 'master' · 865c9ad5
  Oswaldo Ferreira authored Dec 11, 2017
  865c9ad5
- Merge branch 'docs-epics-containing' into 'master' · 65cbc16b
  Clement Ho authored Dec 11, 2017
  65cbc16b
- Containing epic · 7bf369b0
  Victor Wu authored Dec 11, 2017 and Clement Ho committed Dec 11, 2017
  
  7bf369b0
- Merge branch 'ee-url-utility-es-module' into 'master' · 5aead729
  Filipa Lacerda authored Dec 11, 2017
  5aead729
- Merge branch 'ee-35724-animate-sidebar' into 'master' · 7de53e3c
  Filipa Lacerda authored Dec 11, 2017
  7de53e3c
- move contributor analytics doc to correct location · 7e06b5f5
  Marcia Ramos authored Dec 11, 2017
  
  7e06b5f5
- Merge branch 'docs-add-index-to-operations-ee' into 'master' · e742058f
  Achilleas Pipinellis authored Dec 11, 2017
  e742058f
- Docs: add index for doc/administration/operations/ · 013d7688
  Marcia Ramos authored Dec 11, 2017 and Achilleas Pipinellis committed Dec 11, 2017
  
  013d7688
- Merge branch 'geo-postgres-ssl-by-default-docs' into 'master' · 7b254c59
  Achilleas Pipinellis authored Dec 11, 2017
  7b254c59
- Merge branch 'winh-merge-dev-ee-docs' into 'master' · c50a6435
  Winnie Hellmann authored Dec 11, 2017
  c50a6435
- Resolve merge conflicts with dev.gitlab.org/master after security release (EE port) · 2ecad9fe
  Winnie Hellmann authored Dec 11, 2017
  
  2ecad9fe
- Merge branch 'mk-pick-10-2-4-security-fixes-ee' into 'master' · 54045892
  Tiago authored Dec 11, 2017
  54045892
- Merge branch 'ee-dm-commit-diff-discussions-in-mr-context' into 'master' · 9023e701
  Douwe Maan authored Dec 11, 2017
  9023e701
- Update specs to create Plans on-demand · d20cb5a7
  Robert Speicher authored Dec 08, 2017
  
  d20cb5a7
- Remove the Plan seed entirely and add factories to create them on-demand · 9c177d23
  Robert Speicher authored Dec 07, 2017
  
  9c177d23
- Unify mirror addition operations to prepare for Gitaly migration · 3c715011
  Alejandro Rodríguez authored Dec 06, 2017
  
  3c715011
- Add feature flag to use gitaly-ssh mirroring when cloning internal repos · 6db99dc1
  Alejandro Rodríguez authored Nov 20, 2017
  6db99dc1
- fixed import · c80a5318
  Phil Hughes authored Dec 11, 2017
  
  c80a5318
- updated imports · b6fd8df2
  Phil Hughes authored Dec 11, 2017
  
  b6fd8df2
- Resolve wrong conflict resolution in spec/features/projects/clusters_spec.rb · 1865ba4b
  Rémy Coutable authored Dec 11, 2017
  1865ba4b
- Resolve conflicts in app/models/user.rb · 44b9eb10
  Douwe Maan authored Dec 11, 2017
  
  44b9eb10
- Manually add 10.2.4 changelog entries · de56e4b0
  Mike Kozono authored Dec 08, 2017
  
  de56e4b0
- Merge branch 'note-preview' into 'security-10-2' · f3840f41
  Fatih Acet authored Dec 06, 2017
  f3840f41
- Merge branch 'issue_30663' into 'security-10-2' · 89057a2b
  Sean McGivern authored Nov 22, 2017
  89057a2b
- Merge branch 'rs-security-group-api' into 'security-10-2' · 9a153bba
  Douwe Maan authored Nov 28, 2017
  9a153bba
- Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2' · 9c19ebbf
  Douwe Maan authored Nov 24, 2017
  9c19ebbf
- Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into 'security-10-2' · 023764e5
  Douwe Maan authored Nov 21, 2017
  023764e5
- Merge branch 'master' into 'ee-url-utility-es-module' · 273e1029
  Phil Hughes authored Dec 11, 2017
  273e1029
- Resolve conflict in spec/services/clusters/create_service_spec.rb · ee87ee7e
  Rémy Coutable authored Dec 11, 2017
  ee87ee7e
- Resolve conflict in spec/features/projects/clusters_spec.rb · d42ff99d
  Rémy Coutable authored Dec 11, 2017
  d42ff99d
- Resolve conflict in locale/gitlab.pot · 9309c8af
  Rémy Coutable authored Dec 11, 2017
  9309c8af
- Resolve conflict in app/views/projects/clusters/_tabs.html.haml · 4f878a45
  Rémy Coutable authored Dec 11, 2017
  4f878a45
- Resolve conflict in app/services/clusters/create_service.rb · 64a151fc
  Rémy Coutable authored Dec 11, 2017
  64a151fc
- Merge branch... · bbcaf4ae
  Sean McGivern authored Dec 11, 2017
  bbcaf4ae
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-12-06 · 5fb962e3
  Rémy Coutable authored Dec 11, 2017
  5fb962e3
- Fix a wrong conflict resolution in spec/models/ci/build_spec.rb · 5dbecb8e
  Rémy Coutable authored Dec 11, 2017
  5dbecb8e
- Remove duplicate 'artifacts' section in config/gitlab.yml.example · 477e570b
  Rémy Coutable authored Dec 11, 2017
  477e570b