Merge branch 'fix-image-mode-view-diff' into 'master'

Fix diff image view modes (2-up, swipe, onion skin) not working Example test case: https://gitlab.com/mrtzcspr/test/commit/5d983226b1308d98ef3d8919b978ad49f34496b8 Closes #13856 See merge request !3316

Merge branch 'fix-image-mode-view-diff' into 'master'
08a892b0 · Dmitriy Zaporozhets · cbc07625 · ba92b7ca · 08a892b0 · 08a892b0
Commit 08a892b0 authored Mar 21, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

application.js.coffee app/assets/javascripts/application.js.coffee +1 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.6.0 (unreleased)
  - Make HTTP(s) label consistent on clone bar (Stan Hu)
  - Add confidential issues
  - Bump gitlab_git to 9.0.3 (Stan Hu)
+  - Fix diff image view modes (2-up, swipe, onion skin) not working (Stan Hu)
  - Support Golang subpackage fetching (Stan Hu)
  - Bump Capybara gem to 2.6.2 (Stan Hu)
  - New branch button appears on issues where applicable

--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -7,6 +7,7 @@
 #= require jquery
 #= require jquery-ui/autocomplete
 #= require jquery-ui/datepicker
+#= require jquery-ui/draggable
 #= require jquery-ui/effect-highlight
 #= require jquery-ui/sortable
 #= require jquery_ujs