diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-01-23 17:44:40 -0800 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-23 17:45:39 -0800 |
| commit | d66826630614c9b47f2062e3d2c98ad519d31ce4 (patch) | |
| tree | de4243517aabc9df92bb9a28b2cee7b28e2d8d75 /app | |
| parent | 5409fc49bd7fb1e24f048ec5b8931b216b6ceda8 (diff) | |
| parent | 82a3cfc151c4c96935387be3e94f703beb449b25 (diff) | |
| download | gitlab-ce-d66826630614c9b47f2062e3d2c98ad519d31ce4.tar.gz | |
Merge branch 'rs-no-minified-js'
Don't vendor minified JS
Fixes #4031
See merge request !2494
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index c095e5ae2b1..eb18d32b25c 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -21,9 +21,9 @@ #= require bootstrap #= require select2 #= require raphael -#= require g.raphael-min -#= require g.bar-min -#= require chart-lib.min +#= require g.raphael +#= require g.bar +#= require Chart #= require branch-graph #= require ace/ace #= require ace/ext-searchbox @@ -38,9 +38,9 @@ #= require shortcuts_dashboard_navigation #= require shortcuts_issuable #= require shortcuts_network -#= require jquery.nicescroll.min +#= require jquery.nicescroll #= require_tree . -#= require fuzzaldrin-plus.min +#= require fuzzaldrin-plus window.slugify = (text) -> text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase() |