Commits · v9.2.6-ee · Eric / GitLab Enterprise Edition · GitLab

Jun 16, 2017
- Update VERSION to 9.2.6-ee · 0f19285b
  Timothy Andrew authored Jun 16, 2017
  
  View commits for tag v9.2.6-ee v9.2.6-ee
  0f19285b
- Update CHANGELOG.md for 9.2.6 · e4e429f6
  Timothy Andrew authored Jun 16, 2017
  e4e429f6
- Update CHANGELOG-EE.md for 9.2.6-ee · 80b0db07
  Timothy Andrew authored Jun 16, 2017
  80b0db07
- Fix build on `9-2-stable-ee` · 8d96d4a0
  Timothy Andrew authored Jun 16, 2017
  
  8d96d4a0
- Merge branch '9-2-stable-upstream' into 9-2-stable-ee · 3d119ede
  Timothy Andrew authored Jun 16, 2017
  
  3d119ede
- Fix mr squash feature test · cf984079
  Dmytro Zaporozhets (DZ) authored Jun 01, 2017 and Timothy Andrew committed Jun 16, 2017
  cf984079
Jun 15, 2017
- Add squash_merge_param partial file · 2b70f8ac
  Luke Bennett authored Jun 15, 2017
  
  2b70f8ac
- Remove spec for checking the CE restriction for multiple assignees · 5a016ee7
  Valery Sizov authored Jun 15, 2017
  
  5a016ee7
Jun 14, 2017
- Improve conflict message in _merge_params.html.haml · bfd81bc7
  Luke Bennett authored Jun 14, 2017
  
  bfd81bc7
- Add missed newline at the end of `app/assets/javascripts/vue_merge_request_widget/dependencies.js` · 1d8f4309
  Timothy Andrew authored Jun 14, 2017
  1d8f4309
- Resolve conflicts in app/services/issuable_base_service.rb · 11a6c376
  Sean McGivern authored Jun 14, 2017
  11a6c376
- Correct _merge_params.html.haml squash partial location · 51f206f9
  Luke Bennett authored Jun 14, 2017
  
  51f206f9
- Fix KubernetesService failures · d1d7cad2
  Kamil Trzciński authored Jun 14, 2017
  
  d1d7cad2
Jun 13, 2017
- Resolved _merge_params.html.haml conflicts, improved check message and added... · 189cca83
  Luke Bennett authored Jun 13, 2017
  189cca83
- Resolve autocomplete_controller.rb conflicts · a783cc64
  Luke Bennett authored Jun 13, 2017
  
  a783cc64
- Resolve dependencies.js conflicts · 12765523
  Luke Bennett authored Jun 13, 2017
  
  12765523
- Resolve dispatcher.js conflicts · f294526c
  Luke Bennett authored Jun 13, 2017
  
  f294526c
- Fix conflict in spec/models/user_spec.rb · de195c07
  Rémy Coutable authored Jun 13, 2017
  de195c07
- Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-ee-mr-1968' into 9-2-stable-ee · 411eba67
  Timothy Andrew authored Jun 13, 2017
  
  411eba67
- Revert "Merge branch 'fix-9-2-stable-conflicts-for-ee-mr-1968' into 9-2-stable-ee" · e3497e23
  Timothy Andrew authored Jun 13, 2017
  e3497e23
- Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-ee-mr-1968'... · a684d1a5
  Timothy Andrew authored Jun 13, 2017
  a684d1a5
- Merge branch 'fix-9-2-stable-conflicts-for-ee-mr-1968' into 9-2-stable-ee · 648fa50a
  Timothy Andrew authored Jun 13, 2017
  
  648fa50a
- Merge remote-tracking branch 'ce/9-2-stable' into 9-2-stable-ee · e1316f9c
  Timothy Andrew authored Jun 13, 2017
  e1316f9c
- Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11706' into 9-2-stable · 23557433
  Timothy Andrew authored Jun 13, 2017
  
  23557433
- Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11744' into 9-2-stable · 670d8df5
  Timothy Andrew authored Jun 13, 2017
  
  670d8df5
- Ignore CVE-2017-5029 in Nokogiri · b83972f9
  winh authored Jun 12, 2017 and Timothy Andrew committed Jun 13, 2017
  
  b83972f9
- Fix merge conflicts on pipeline schedules · 34655464
  Z.J. van de Weg authored Jun 12, 2017 and Timothy Andrew committed Jun 13, 2017
  
  34655464
- Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master' · 16977ad3
  Kamil Trzciński authored May 29, 2017 and Timothy Andrew committed Jun 13, 2017
  16977ad3
Jun 12, 2017
- Fix conflicts · 598f1100
  Clement Ho authored Jun 12, 2017
  
  598f1100
- Use wait_for_ajax instead of wait_for_requests · af97988a
  Clement Ho authored Jun 12, 2017
  
  af97988a
- Merge branch '9-2-stable' into fix-9-2-stable-conflicts-for-mr-11744 · 4ba257b9
  Clement Ho authored Jun 12, 2017
  
  4ba257b9
- Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11700' into 9-2-stable · cd40278b
  Timothy Andrew authored Jun 12, 2017
  
  cd40278b
- Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-mr-11964' into 9-2-stable · 1e24ed3a
  Timothy Andrew authored Jun 12, 2017
  
  1e24ed3a
- Merge branch 'sh-recaptcha-fix-try2' into 'master' · 09420c6d
  Sean McGivern authored Jun 12, 2017 and Timothy Andrew committed Jun 12, 2017
  09420c6d
- Merge branch... · 0d0d0297
  Adam Niedzielski authored Jun 08, 2017 and Timothy Andrew committed Jun 12, 2017
  0d0d0297
- Fix up merge_reqest_tabs import/require conflicts · 0ef4d3cc
  Eric Eastwood authored Jun 08, 2017 and Timothy Andrew committed Jun 12, 2017
  0ef4d3cc
- Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into 'master' · 0d554df6
  Clement Ho authored May 26, 2017 and Timothy Andrew committed Jun 12, 2017
  0d554df6
- Merge branch 'counters_cache_invalidation' into 'master' · 04ba6ae5
  Rémy Coutable authored May 17, 2017 and Timothy Andrew committed Jun 12, 2017
  04ba6ae5
- Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee' into 'master' · b412bfde
  Phil Hughes authored May 30, 2017 and Timothy Andrew committed Jun 12, 2017
  b412bfde
- Merge remote-tracking branch 'origin/fix-9-2-stable-conflicts-for-ee-mr-1987' into 9-2-stable-ee · ac618d61
  Timothy Andrew authored Jun 12, 2017
  
  ac618d61