Commits · master · Hannes Rosenögger / GitLab Enterprise Edition · GitLab

May 23, 2018
- Merge branch 'ce-to-ee-2018-05-23' into 'master' · 756bd842
  Phil Hughes authored May 23, 2018
  756bd842
- fixed conflicts in api.js · 51b94860
  Phil Hughes authored May 23, 2018
  
  51b94860
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-23 · 15dae8c3
  🤖 GitLab Bot 🤖 authored May 23, 2018
  15dae8c3
- Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into 'master' · f0fbdad9
  Douwe Maan authored May 23, 2018
  f0fbdad9
- Resolve "Web IDE doesn't work for branches with slashes" · 8056a77d
  Tim Zallmann authored May 23, 2018
  
  8056a77d
- Merge branch 'ide-commit-state-bug' into 'master' · 3a3f542d
  Filipa Lacerda authored May 23, 2018
  3a3f542d
- Merge branch '46603-add-vue-loader-cache' into 'master' · 4ba8ff50
  Fatih Acet authored May 23, 2018
  4ba8ff50
- Merge branch 'ide-jobs-list' into 'master' · 7e1e3559
  Filipa Lacerda authored May 23, 2018
  7e1e3559
- Merge branch 'ide-file-finder-improve-order' into 'master' · 1623e4ac
  Filipa Lacerda authored May 23, 2018
  1623e4ac
- fixed spec · fff2b4f6
  Phil Hughes authored May 23, 2018
  
  fff2b4f6
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · 8d8c89ff
  Grzegorz Bizon authored May 23, 2018
  8d8c89ff
- resolve conflict in locale/gitlab.pot · bd7061ba
  Lukas Eipert authored May 23, 2018
  
  bd7061ba
- No deeplink needed · 5159a479
  Sid Sijbrandij authored May 23, 2018
  
  5159a479
May 22, 2018
- add file cache to vue-loader to speed up compilation · 7774b318
  Mike Greiling authored May 22, 2018
  
  7774b318
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · a3859c0f
  🤖 GitLab Bot 🤖 authored May 22, 2018
  a3859c0f
- Merge branch '44895-explicit-merge-conflict' into 'master' · 76e276cb
  Tim Zallmann authored May 22, 2018
  76e276cb
- Merge branch 'silver-to-premium' into 'master' · 49478523
  Victor Wu authored May 22, 2018
  49478523
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · e205e4b0
  Stan Hu authored May 22, 2018
  e205e4b0
- Update Silver to say Premium · 87d25d5c
  Victor Wu authored May 22, 2018
  
  87d25d5c
- Merge branch 'winh-make-it-right-now' into 'master' · 4c63e904
  Annabel Dunstone Gray authored May 22, 2018
  4c63e904
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · f7c55b83
  🤖 GitLab Bot 🤖 authored May 22, 2018
  
  f7c55b83
- Use "right now" for short time periods · 1d6025fd
  Winnie Hellmann authored May 22, 2018
  
  1d6025fd
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · 87aef527
  Rémy Coutable authored May 22, 2018
  87aef527
- Merge branch '5919_follow_up_on_5151_dismiss_vulnerability' into 'master' · 36c98d24
  Robert Speicher authored May 22, 2018
  36c98d24
- Resolve Follow up on dismiss vulnerability or create issue · a79d5d85
  Olivier Gonzalez authored May 22, 2018
  
  a79d5d85
- Merge branch 'dm-xcode-project-directory' into 'master' · f8568baa
  Robert Speicher authored May 22, 2018
  f8568baa
- added spec · 23a7c389
  Phil Hughes authored May 22, 2018
  
  23a7c389
- Merge branch 'fix/unverified-hover-state' into 'master' · 5045ca06
  Annabel Dunstone Gray authored May 22, 2018
  5045ca06
- unverified hover state color changed to almost-black · 683f9720
  Murat Dogan authored May 22, 2018 and Annabel Dunstone Gray committed May 22, 2018
  
  683f9720
- Merge branch 'workhorse-4.2.1' into 'master' · f80ba922
  Alessio Caiazza authored May 22, 2018
  f80ba922
- Merge branch 'dz-no-ee-check' into 'master' · 0c977d17
  Rémy Coutable authored May 22, 2018
  0c977d17
- They're not EE specific but a delay from CE -> EE · a40f2fd4
  Lin Jen-Shin authored May 23, 2018 and Rémy Coutable committed May 22, 2018
  
  a40f2fd4
- Remove ee/spec/features/projects/active_tabs_spec.rb · 78e3f835
  Rémy Coutable authored May 22, 2018
  78e3f835
- Merge branch... · 86c155a1
  Douwe Maan authored May 22, 2018
  86c155a1
- Merge branch 'ab-46530-mediumtext-for-gpg-keys' into 'master' · 45ec7d15
  Yorick Peterse authored May 22, 2018
  45ec7d15
- Upgrade workhorse to v4.2.1 · 49a9d9d8
  Alessio Caiazza authored May 22, 2018
  
  49a9d9d8
- Update no-ee-check with rubocop recommendation. · fba580e3
  Dmytro Zaporozhets (DZ) authored May 21, 2018
  fba580e3
- Merge branch 'sh-bump-prometheus-client-mmap' into 'master' · b884cfc6
  Nick Thomas authored May 22, 2018
  b884cfc6
- changed what bit of code stops the callback · a7ea0e6b
  Phil Hughes authored May 22, 2018
  
  a7ea0e6b
- Bump prometheus-client-mmap to 0.9.3 to fix nil exception error · 6cd1f4b8
  Stan Hu authored May 22, 2018
  6cd1f4b8