Commits · master · indobits / GitLab Enterprise Edition · GitLab

Apr 12, 2017
- Merge branch 'fix-sd-emails' into 'master' · 4fe09a78
  Douwe Maan authored Apr 12, 2017
  4fe09a78
- Merge branch 'ce-to-ee-tue' into 'master' · e5c43209
  Valery Sizov authored Apr 12, 2017
  e5c43209
- Fix Service Desk emails · 9906bbb1
  Sean McGivern authored Apr 12, 2017
  9906bbb1
- Merge branch 'ee-gitaly-testing' into 'master' · 83c0e74e
  Rémy Coutable authored Apr 12, 2017
  83c0e74e
- Fix yarn.lock · f03734f2
  Valery Sizov authored Apr 12, 2017
  
  f03734f2
- Merge branch 'ce-to-ee-tue' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-tue · 169c775e
  Valery Sizov authored Apr 12, 2017
  
  169c775e
- Resolve conflicts · b0e67b9e
  Valery Sizov authored Apr 12, 2017
  
  b0e67b9e
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-tue · f44e8aac
  Valery Sizov authored Apr 12, 2017
  
  f44e8aac
- Merge branch 'update-ce-to-ee-doc' into 'master' · cc2d5e43
  Rémy Coutable authored Apr 12, 2017
  cc2d5e43
Apr 11, 2017
- Setup and run a Gitaly server for testing if GitalyClient is enabled · 3e99a2b3
  Alejandro Rodríguez authored Mar 28, 2017
  
  3e99a2b3
- Merge branch '28017-separate-ce-params-on-api-ee' into 'master' · 57ef7bca
  Douwe Maan authored Apr 11, 2017
  57ef7bca
- Merge branch 'ee-30636-fix-blame-edit-blob-without-repo-permissions' into 'master' · 7a45f05b
  Annabel Dunstone Gray authored Apr 11, 2017
  7a45f05b
- resolve conflicts in yarn.lock · 3349f991
  Mike Greiling authored Apr 11, 2017
  
  3349f991
- Merge branch 'ee-dm-outdated-diff-link' into 'master' · 7373b370
  Sean McGivern authored Apr 11, 2017
  7373b370
- Fix edit button on blame page without repo perms · bf174499
  Eric Eastwood authored Apr 10, 2017
  bf174499
- Statisfy Robertcop and Seancop · 812907ee
  Douwe Maan authored Apr 11, 2017
  
  812907ee
- Merge branch 'ee-dm-remove-copy-link-on-blame-page' into 'master' · a24beca0
  Robert Speicher authored Apr 11, 2017
  a24beca0
- Add newline · e3793c12
  Douwe Maan authored Apr 11, 2017
  
  e3793c12
- Merge branch '1983-geo-enabled-cache' into 'master' · 6f5b68c5
  Douwe Maan authored Apr 11, 2017
  6f5b68c5
- Merge branch 'docs-issue-board-focus-mode' into 'master' · 1b88d48d
  Sean McGivern authored Apr 11, 2017
  1b88d48d
- Update language [ci skip] · 2ede53ff
  Victor Wu authored Apr 11, 2017
  
  2ede53ff
- Add ce-to-ee guide for 9.1 · a3f80625
  Lin Jen-Shin authored Apr 11, 2017
  
  a3f80625
- Merge branch 'master' into 'ee-dm-remove-copy-link-on-blame-page' · 58c49d9c
  Douwe Maan authored Apr 11, 2017
  58c49d9c
- Merge branch 'rc/ce-to-ee-friday' into 'master' · 8eea15c1
  Valery Sizov authored Apr 11, 2017
  8eea15c1
- Resolve lib/api/helpers/internal_helpers.rb · d68babd4
  Valery Sizov authored Apr 11, 2017
  
  d68babd4
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee-tue · 687a6c08
  Valery Sizov authored Apr 11, 2017
  
  687a6c08
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-tue · 8ae9b485
  Valery Sizov authored Apr 11, 2017
  
  8ae9b485
- Fix bad resolved conflict for... · 2fde1f95
  Filipa Lacerda authored Apr 11, 2017
  2fde1f95
- Accept Merge Request -> Accept merge request · 8ab045ad
  Lin Jen-Shin authored Apr 11, 2017
  
  8ab045ad
- Fix wrong conflict resolution · 491b344a
  Rémy Coutable authored Apr 11, 2017
  491b344a
- Fix Approve merge request capitalisation on tests · aabeb531
  Jose Ivan Vargas authored Apr 11, 2017
  
  aabeb531
- fix spec/features/merge_requests/merge_with_push_rules_spec.rb · 348f7e66
  Jose Ivan Vargas authored Apr 11, 2017
  
  348f7e66
- fix features/project/merge_requests.feature · b034959f
  Jose Ivan Vargas authored Apr 11, 2017
  
  b034959f
- fix features/group_hooks.feature · 3848fa46
  Jose Ivan Vargas authored Apr 11, 2017
  
  3848fa46
- fix spec/features/merge_requests/squash_spec.rb · 3ac182d1
  Jose Ivan Vargas authored Apr 11, 2017
  
  3ac182d1
- fix spec/features/merge_requests/approvals_spec.rb · 88bddac0
  Jose Ivan Vargas authored Apr 11, 2017
  
  88bddac0
- Merge branch '2117-deploy-board-flickering' into 'master' · dc4945f2
  Jacob Schatz authored Apr 11, 2017
  dc4945f2
- Merge branch '30678-improve-dev-server-process' into 'master' · 19dd138c
  Jacob Schatz authored Apr 11, 2017
  19dd138c
Apr 10, 2017
- Merge branch 'fix_cache_expiration_in_repository' into 'master' · 100f4370
  Robert Speicher authored Apr 10, 2017
  100f4370
- Separate CE from EE params on V4 API · 4368a170
  Oswaldo Ferreira authored Apr 10, 2017
  
  4368a170