diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-03-03 16:54:20 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-03-03 16:54:20 -0600 |
| commit | 982dd5040b3bb2b74534ecddf6fc6c3668ae08c0 (patch) | |
| tree | 957af8635ab6dd759444c8c88804ad134a46184d | |
| parent | ed3e3317de6e386364c1949b939c087b7aed6258 (diff) | |
| download | gitlab-ce-commons-chunk-plugin.tar.gz | |
merge cropper library into profile_bundlecommons-chunk-plugin
| -rw-r--r-- | app/assets/javascripts/lib/cropper.js | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/profile/gl_crop.js.es6 | 2 | ||||
| -rw-r--r-- | app/views/profiles/_head.html.haml | 1 | ||||
| -rw-r--r-- | config/application.rb | 1 |
4 files changed, 2 insertions, 9 deletions
diff --git a/app/assets/javascripts/lib/cropper.js b/app/assets/javascripts/lib/cropper.js deleted file mode 100644 index 7862c6797c3..00000000000 --- a/app/assets/javascripts/lib/cropper.js +++ /dev/null @@ -1,7 +0,0 @@ -/* eslint-disable func-names, space-before-function-paren */ - -/*= require cropper */ - -(function() { - -}).call(window); diff --git a/app/assets/javascripts/profile/gl_crop.js.es6 b/app/assets/javascripts/profile/gl_crop.js.es6 index 192b1192d07..cf1566eeb87 100644 --- a/app/assets/javascripts/profile/gl_crop.js.es6 +++ b/app/assets/javascripts/profile/gl_crop.js.es6 @@ -1,5 +1,7 @@ /* eslint-disable no-useless-escape, max-len, quotes, no-var, no-underscore-dangle, func-names, space-before-function-paren, no-unused-vars, no-return-assign, object-shorthand, one-var, one-var-declaration-per-line, comma-dangle, consistent-return, class-methods-use-this, new-parens */ +import 'vendor/cropper'; + ((global) => { // Matches everything but the file name const FILENAMEREGEX = /^.*[\\\/]/; diff --git a/app/views/profiles/_head.html.haml b/app/views/profiles/_head.html.haml index 1df04ea614e..83ae9129807 100644 --- a/app/views/profiles/_head.html.haml +++ b/app/views/profiles/_head.html.haml @@ -1,3 +1,2 @@ - content_for :page_specific_javascripts do - = page_specific_javascript_tag('lib/cropper.js') = page_specific_javascript_bundle_tag('profile') diff --git a/config/application.rb b/config/application.rb index 45f3b20d214..f1a986d1731 100644 --- a/config/application.rb +++ b/config/application.rb @@ -100,7 +100,6 @@ module Gitlab config.assets.precompile << "katex.js" config.assets.precompile << "xterm/xterm.css" config.assets.precompile << "lib/ace.js" - config.assets.precompile << "lib/cropper.js" config.assets.precompile << "lib/raphael.js" config.assets.precompile << "u2f.js" config.assets.precompile << "vendor/assets/fonts/*" |