diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-21 13:38:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-21 16:41:30 +0100 |
| commit | 834dae6f64b13a6c4a4150f90f066e24bd2e9bad (patch) | |
| tree | b134306e325dceb150d5f5dd3b5fb2291c3a76c7 | |
| parent | c5e015e972d839966abba2710f2d63ed479962f5 (diff) | |
| download | gitlab-ce-834dae6f64b13a6c4a4150f90f066e24bd2e9bad.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e962a48476a..c108b643d83 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.6.0 (unreleased) - Fix bug where wrong commit ID was being used in a merge request diff to show old image (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 diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index d415bbd3476..7f983325049 100644 --- 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 |