Commits · master · Paulo Matos / GitLab Enterprise Edition · GitLab

Apr 09, 2018
- Merge branch 'ce-to-ee-2018-04-09' into 'master' · c105ce64
  Dmytro Zaporozhets (DZ) authored Apr 09, 2018
  c105ce64
- Merge branch 'ee-move-board-blank-state-vue-component' into 'master' · 48c538f0
  Filipa Lacerda authored Apr 09, 2018
  48c538f0
- Fix conflicts for app/assets/javascripts/boards/index.js · f45b741a
  Filipa Lacerda authored Apr 09, 2018
  
  f45b741a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-09 · 4144d68e
  🤖 GitLab Bot 🤖 authored Apr 09, 2018
  4144d68e
- Merge branch 'blackst0ne-rails5-add-rails-controller-testing-gem' into 'master' · fb0bb32f
  Rémy Coutable authored Apr 09, 2018
  fb0bb32f
- Merge branch 'sh-fix-issue-45152' into 'master' · d4cfb730
  Grzegorz Bizon authored Apr 09, 2018
  d4cfb730
- Merge branch 'ee-44224-remove-gl' into 'master' · f8463f77
  Phil Hughes authored Apr 09, 2018
  f8463f77
- Merge branch '44224-remove-gl' into 'master' · feb149f8
  Phil Hughes authored Apr 09, 2018
  feb149f8
- Merge branch 'blackst0ne-rails5-replace-true-values-with-false-values' into 'master' · 1917d53b
  Sean McGivern authored Apr 09, 2018
  1917d53b
- Merge branch '32617-fix-template-selector-menu-visibility' into 'master' · e7ddb40c
  Phil Hughes authored Apr 09, 2018
  e7ddb40c
- Merge branch 'sh-handle-legacy-archive-requests' into 'master' · e9947951
  Douwe Maan authored Apr 09, 2018
  e9947951
Apr 08, 2018
- Merge branch 'ce-to-ee-2018-04-08' into 'master' · d87a9904
  Stan Hu authored Apr 08, 2018
  d87a9904
- Handle legacy repository archive requests with no ref given · 5c735af3
  Stan Hu authored Apr 08, 2018
  5c735af3
- Resolve conflicts in _home_panel.html.haml · 086d9d5c
  Winnie Hellmann authored Apr 08, 2018
  
  086d9d5c
- Resolve conflicts in _project.html.haml · e074239f
  Winnie Hellmann authored Apr 08, 2018
  
  e074239f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-08 · e57baac0
  🤖 GitLab Bot 🤖 authored Apr 08, 2018
  e57baac0
- Merge branch 'winh-badges-docs' into 'master' · 86ca1a77
  Douwe Maan authored Apr 08, 2018
  86ca1a77
- Add user documentation for badges · 42411b05
  Winnie Hellmann authored Apr 08, 2018
  
  42411b05
- Merge branch 'winh-41174-projects-groups-badges-ui-ee' into 'master' · 8deed29f
  Douwe Maan authored Apr 08, 2018
  8deed29f
- Merge branch 'winh-41174-projects-groups-badges-ui' into 'master' · 14f183de
  Douwe Maan authored Apr 08, 2018
  14f183de
- Projects and groups badges settings UI (EE-port) · b787b1bc
  Winnie Hellmann authored Apr 08, 2018
  
  b787b1bc
- Projects and groups badges settings UI · 31dd86b6
  Francisco Javier López authored Apr 08, 2018
  
  31dd86b6
- Fix template selector menu visibility · d2482f15
  Fabian Schneider authored Mar 31, 2018
  
  d2482f15
- Fix undefined method `one?` when pushing to an existing merge request · 47b1528a
  Stan Hu authored Apr 07, 2018
  47b1528a
- [Rails5] Add `rails-controller-testing` gem · 2efa9bed
  blackst0ne authored Apr 08, 2018
  2efa9bed
Apr 07, 2018
- [Rails5] Add FALSE_VALUES constant to Service#boolean_accessor · 432e57fc
  blackst0ne authored Apr 08, 2018
  432e57fc
- Merge branch 'ce-to-ee-2018-04-07' into 'master' · 521ae960
  Stan Hu authored Apr 07, 2018
  521ae960
- Re-adjust code for EE · 99ec007d
  Mayra Cabrera authored Apr 06, 2018
  
  99ec007d
- Merge branch 'jej/branch-unprotection-restrictions' into 'master' · 326e39bb
  Douwe Maan authored Apr 07, 2018
  326e39bb
- Resolve conflicts in doc/user/project/index.md · 1afb5cf3
  Stan Hu authored Apr 07, 2018
  
  1afb5cf3
- Resolve conflicts in config/routes/project.rb · b359a697
  Stan Hu authored Apr 07, 2018
  
  b359a697
- Resolve conflicts in app/views/projects/settings/repository/show.html.haml · f4359dfc
  Stan Hu authored Apr 07, 2018
  
  f4359dfc
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-07 · 79f4d514
  🤖 GitLab Bot 🤖 authored Apr 07, 2018
  79f4d514
- Merge branch '31591-project-deploy-tokens-to-allow-permanent-access' into 'master' · dd552d06
  Kamil Trzciński authored Apr 07, 2018
  dd552d06
- Merge branch 'ce-to-ee-2018-04-06' into 'master' · 4182fe0b
  Stan Hu authored Apr 07, 2018
  4182fe0b
- Use proper auth_scope for deploy token · b38439a3
  Kamil Trzciński authored Apr 07, 2018
  
  b38439a3
- Merge branch 'mk/geo/mark-missing-primary-files-as-synced-and-add-metrics' into 'master' · 5eab5bbd
  Stan Hu authored Apr 07, 2018
  5eab5bbd
- Merge branch 'blackst0ne-bump-parser-2-5-0-5' into 'master' · 671e93dc
  Stan Hu authored Apr 07, 2018
  671e93dc
- Resolve conflicts in spec/migrations/remove_soft_removed_objects_spec.rb · cecf041a
  Stan Hu authored Apr 07, 2018
  
  cecf041a
- Resolve conflicts in app/assets/javascripts/pipelines/components/graph/stage_column_component.vue · e46dc315
  Stan Hu authored Apr 07, 2018
  
  e46dc315