Commits · master · kbmap / GitLab Enterprise Edition · GitLab

May 03, 2018
- Merge branch 'ee-move-time-tracking-spent-only-pane-vue-component' into 'master' · 2963bc01
  Phil Hughes authored May 03, 2018
  2963bc01
- Merge branch 'change-docs-license-ee' into 'master' · 5d5f6ed7
  Rémy Coutable authored May 03, 2018
  5d5f6ed7
- Merge branch 'ce-to-ee-2018-05-03' into 'master' · 133568f4
  Robert Speicher authored May 03, 2018
  133568f4
- Resolve app/models/identity.rb · 83ce8f66
  Robert Speicher authored May 03, 2018
  
  83ce8f66
- Change the docs license to CC BY-SA · ab68ad87
  Achilleas Pipinellis authored May 03, 2018
  ab68ad87
- Merge branch 'tc-geo-fix-daemon-log-class' into 'master' · 4ed3c823
  Nick Thomas authored May 03, 2018
  4ed3c823
- ensure users are signed out properly in user_uses_slash_commands_spec.rb · fb681f68
  Lukas Eipert authored May 03, 2018 and Toon Claes committed May 03, 2018
  fb681f68
- Move TimeTrackingSpentOnlyPane vue component · bbae5109
  George Tsiolis authored May 03, 2018
  
  bbae5109
- Fixes doc/topics/autodevops/index.md conflicts · d0395212
  Mayra Cabrera authored May 03, 2018
  
  d0395212
- Merge branch 'dm-fix-typo-external-auth-help-text' into 'master' · c89c7b6c
  Rémy Coutable authored May 03, 2018
  c89c7b6c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-03 · 5a7f3cc1
  🤖 GitLab Bot 🤖 authored May 03, 2018
  5a7f3cc1
- Merge branch 'ce-to-ee-2018-05-02' into 'master' · 9763cc76
  Rémy Coutable authored May 03, 2018
  9763cc76
- DRY up things further in LogCursor::Logger · e1b4e6a9
  Toon Claes authored Apr 27, 2018
  
  e1b4e6a9
- Refactor the Geo LogCursor Logger to make class more descriptive · 406c702a
  Toon Claes authored Apr 25, 2018
  406c702a
- Merge branch '5480-sidebar-subscription-event-handling' into 'master' · bba847fe
  Phil Hughes authored May 03, 2018
  bba847fe
- Improve UpdateRepositoryStorageService spec · bc5cc956
  Zeger-Jan van de Weg authored May 03, 2018
  bc5cc956
- Merge branch '5078-ci-include-deep-merge' into 'master' · 20e12599
  Kamil Trzciński authored May 03, 2018
  20e12599
- Merge branch 'update-devise' into 'master' · d37d2c32
  Douwe Maan authored May 03, 2018
  d37d2c32
- Fix typo in external authorization URL help text · 832ae041
  Douwe Maan authored May 03, 2018
  
  832ae041
- Emit `toggleSidebar` event on component when icon is clicked · e164447b
  Kushal Pandya authored May 03, 2018
  
  e164447b
- Consume `toggleSubscription` event directly from Subscriptions component · 342fbbda
  Kushal Pandya authored May 03, 2018
  
  342fbbda
- Emit `toggleSubscription`, `toggleSidebar` events on component · d2665707
  Kushal Pandya authored May 03, 2018
  
  d2665707
- update devise 4.2 -> 4.4 · e72f2b02
  Praveen Arimbrathodiyil authored Mar 21, 2018
  
  e72f2b02
- Merge branch 'blackst0ne-rails5-fix-trusted-proxies' into 'master' · 1c7bab11
  Rémy Coutable authored May 03, 2018
  1c7bab11
- Merge branch 'blackst0ne-remove-spinach-group-active-tab-feature' into 'master' · 0bca017d
  Rémy Coutable authored May 03, 2018
  0bca017d
- Merge branch 'blackst0ne-remove-spinach-group-active-tab-feature' into 'master' · a195cbaf
  Rémy Coutable authored May 03, 2018
  a195cbaf
- Include note in YAML include docs about not supporting aliases · c2f919fd
  Dylan Griffith authored May 02, 2018
  
  c2f919fd
- Doc improvements for deep merging included ci yaml files · 47de97cd
  Dylan Griffith authored May 01, 2018
  
  47de97cd
- Add test to show behaviour of when script is defined in both files being merged · 874c6ba7
  Dylan Griffith authored May 01, 2018
  
  874c6ba7
- Add an additonal test to show behaviour of deep merging jobs · bb2e2db8
  Dylan Griffith authored May 01, 2018
  
  bb2e2db8
- Add space inside hash literal braces · e12ad8b8
  King Chung Huang authored Apr 08, 2018 and Dylan Griffith committed May 03, 2018
  
  e12ad8b8
- Fix expected values for merge specs · 50bc215e
  King Chung Huang authored Apr 07, 2018 and Dylan Griffith committed May 03, 2018
  50bc215e
- Modify the changelog title to focus on functionality · 73605824
  King Chung Huang authored Apr 07, 2018 and Dylan Griffith committed May 03, 2018
  73605824
- Note that recursive merging applies to dicts · 632e5746
  King Chung Huang authored Apr 07, 2018 and Dylan Griffith committed May 03, 2018
  632e5746
- Describe recursive merging in ci/yaml docs · 776d2ac1
  King Chung Huang authored Apr 07, 2018 and Dylan Griffith committed May 03, 2018
  776d2ac1
- Add Changelog entry · d68f43bd
  King Chung Huang authored Apr 07, 2018 and Dylan Griffith committed May 03, 2018
  
  d68f43bd
- Add a spec for merging overlapping dicts · ce42a90f
  King Chung Huang authored Apr 07, 2018 and Dylan Griffith committed May 03, 2018
  ce42a90f
- Add a spec for merge distinct dicts · efa481b8
  King Chung Huang authored Apr 07, 2018 and Dylan Griffith committed May 03, 2018
  efa481b8
- Use deep_merge when combining CI content · 4b0b78a5
  King Chung Huang authored Mar 29, 2018 and Dylan Griffith committed May 03, 2018
  4b0b78a5
- Merge branch 'docs/fix-menu' into 'master' · 090f7857
  Achilleas Pipinellis authored May 03, 2018
  090f7857