Commits · master · Rob Watson / GitLab Enterprise Edition · GitLab

Jan 06, 2018
- Merge branch 'ee-41249-clearing-the-cache' into 'master' · 12effe58
  Kamil Trzciński authored Jan 06, 2018
  12effe58
- Use anchor instead of form for reset caches button · 1e3a8658
  Matija Čupić authored Jan 06, 2018
  
  1e3a8658
Jan 05, 2018
- Merge branch 'ce-to-ee-2018-01-05' into 'master' · deeb5638
  Robert Speicher authored Jan 05, 2018
  deeb5638
- Merge branch... · ec5f7d10
  Kamil Trzciński authored Jan 05, 2018
  ec5f7d10
- Remove duplicate `rebase_commit_sha` field definition from schema · 9a394cc6
  Robert Speicher authored Jan 05, 2018
  
  9a394cc6
- Merge branch 'remove_labeled_issues_seed' into 'master' · a14aa6a6
  Sean McGivern authored Jan 05, 2018 and Robert Speicher committed Jan 05, 2018
  a14aa6a6
- Create separate EE::DeploymentPlatform module · af04ad57
  Mayra Cabrera authored Jan 05, 2018
  
  af04ad57
- Fixes cluster feature broken specs · b8826ce7
  Mayra Cabrera authored Jan 05, 2018
  
  b8826ce7
- Merge branch '4481-move-gitlab-geo-check-after-database-replication' into 'master' · 87f770d4
  Stan Hu authored Jan 05, 2018
  87f770d4
- Fix typo in CHANGELOG entry for Geo doc fix · d059a3c8
  Stan Hu authored Jan 05, 2018
  
  d059a3c8
- Fix typos in gitlab:geo:check sentence · 377cc83f
  Stan Hu authored Jan 05, 2018
  
  377cc83f
- Merge branch 'jramsay-fix-alignment-geo-docs' into 'master' · 32435ae8
  Stan Hu authored Jan 05, 2018
  32435ae8
- Make it clearer database password only needed for 10.4 and up · c54aa5a6
  Stan Hu authored Jan 05, 2018
  
  c54aa5a6
- Add clarification pg password from 10.4 onward · 7eb9246a
  James Ramsay authored Jan 05, 2018
  
  7eb9246a
- Move geo status check after db replication · 96934965
  James Ramsay authored Jan 05, 2018
  96934965
- Merge branch 'jramsay4480-remove-ntp-check-from-geo-docs' into 'master' · 51fe7978
  Stan Hu authored Jan 05, 2018
  51fe7978
- Remove duplicate manual NTP check · 33b6f6fd
  James Ramsay authored Jan 05, 2018
  33b6f6fd
- Fix broken alignment of geo db docs · 64edaeb0
  James Ramsay authored Jan 05, 2018
  
  64edaeb0
- Merge branch 'ee-41048-helpful-and-instructing-empty-state-for-multi-file-editor' into 'master' · 1eed12ac
  Filipa Lacerda authored Jan 05, 2018
  1eed12ac
- EE Port for making IDE prettier · d92830a0
  Tim Zallmann authored Jan 05, 2018
  
  d92830a0
- Fix rebase commit SHA migration name · 744e1db3
  Sean McGivern authored Jan 05, 2018
  744e1db3
- Merge branch 'master' into ee-41249-clearing-the-cache · d018a68c
  Matija Čupić authored Jan 05, 2018
  
  d018a68c
- Merge branch 'mk-fix-fast-ssh-key-lookup-links' into 'master' · 3e37a981
  Stan Hu authored Jan 05, 2018
  3e37a981
- Resolve conflict in lib/api/entities.rb · f5bc387d
  Rémy Coutable authored Jan 05, 2018
  f5bc387d
- Resolve conflict in doc/api/settings.md · ebb04aab
  Rémy Coutable authored Jan 05, 2018
  ebb04aab
- Resolve conflict in doc/api/boards.md · a973f060
  Rémy Coutable authored Jan 05, 2018
  a973f060
- Resolve conflict in app/models/concerns/deployment_platform.rb · a148aa35
  Rémy Coutable authored Jan 05, 2018
  a148aa35
- Resolve conflict in BranchesHelper by adding EE::BranchesHelper · 8c7bee0e
  Rémy Coutable authored Jan 05, 2018
  8c7bee0e
- Fix conflicts in merge_request_widget.json spec · 83556acf
  Jan Provaznik authored Jan 05, 2018
  
  83556acf
- Fix conflicts in mr_widget_options.js · bb6f087b
  Jan Provaznik authored Jan 05, 2018
  
  bb6f087b
- Merge branch 'fix-cluster-migration-spec' into 'master' · 4e622b88
  Robert Speicher authored Jan 05, 2018
  4e622b88
- Solved project_new conflicts · c35c549d
  Jose Ivan Vargas authored Jan 05, 2018
  
  c35c549d
- Fix conflicts for spec/javascripts/lib/utils/text_utility_spec.js · 6ee0ea6c
  Filipa Lacerda authored Jan 05, 2018
  
  6ee0ea6c
- Fix conflicts for app/assets/images/icons.svg · 9b502777
  Filipa Lacerda authored Jan 05, 2018
  
  9b502777
- Fix conflicts for app/assets/images/icons.json · 2120404d
  Filipa Lacerda authored Jan 05, 2018
  
  2120404d
- Fix constant reference · f0afc5d3
  Mike Kozono authored Jan 05, 2018
  
  f0afc5d3
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-05 · 39e86182
  🤖 GitLab Bot 🤖 authored Jan 05, 2018
  39e86182
- Merge branch 'fix-cluster-migration-spec' into 'master' · 89f174da
  Robert Speicher authored Jan 05, 2018
  89f174da
- Change reset_cache action from get to post · 8fef39c5
  Matija Čupić authored Jan 05, 2018
  
  8fef39c5
- Merge branch 'bvl-port-of-ee-translations' into 'master' · 3d0982e1
  Douwe Maan authored Jan 05, 2018
  3d0982e1