diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-24 17:37:38 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-24 17:37:38 +0000 |
commit | 55be026e59e71073400a334cf746613f88c1d206 (patch) | |
tree | 0fecbccaf90aee9813077d670385f2aad46a429c /app | |
parent | cec02067ec1cab7c3f7d906d6742545acd3d652f (diff) | |
parent | 3ef0a625ac656e64861df912492dc3b8febb66c3 (diff) | |
download | gitlab-ce-55be026e59e71073400a334cf746613f88c1d206.tar.gz |
Merge branch 'application-js-coffee' into 'master'
Applications js to coffee
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/application.js | 33 | ||||
-rw-r--r-- | app/assets/javascripts/application.js.coffee (renamed from app/assets/javascripts/main.js.coffee) | 34 |
2 files changed, 34 insertions, 33 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js deleted file mode 100644 index f69b750bb69..00000000000 --- a/app/assets/javascripts/application.js +++ /dev/null @@ -1,33 +0,0 @@ -// This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically -// be included in the compiled file accessible from http://example.com/assets/application.js -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -//= require jquery -//= require jquery.ui.all -//= require jquery_ujs -//= require jquery.cookie -//= require jquery.endless-scroll -//= require jquery.highlight -//= require jquery.history -//= require jquery.waitforimages -//= require jquery.atwho -//= require jquery.scrollto -//= require jquery.blockUI -//= require turbolinks -//= require jquery.turbolinks -//= require bootstrap -//= require modernizr -//= require select2 -//= require raphael -//= require g.raphael-min -//= require g.bar-min -//= require branch-graph -//= require highlightjs.min -//= require ace/ace -//= require_tree . -//= require d3 -//= require underscore -//= require nprogress -//= require nprogress-turbolinks diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/application.js.coffee index 89f6a547ff8..5042221abe4 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -1,3 +1,37 @@ +# This is a manifest file that'll be compiled into including all the files listed below. +# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +# be included in the compiled file accessible from http://example.com/assets/application.js +# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +# the compiled file. +# +#= require jquery +#= require jquery.ui.all +#= require jquery_ujs +#= require jquery.cookie +#= require jquery.endless-scroll +#= require jquery.highlight +#= require jquery.history +#= require jquery.waitforimages +#= require jquery.atwho +#= require jquery.scrollto +#= require jquery.blockUI +#= require turbolinks +#= require jquery.turbolinks +#= require bootstrap +#= require modernizr +#= require select2 +#= require raphael +#= require g.raphael-min +#= require g.bar-min +#= require branch-graph +#= require highlightjs.min +#= require ace/ace +#= require d3 +#= require underscore +#= require nprogress +#= require nprogress-turbolinks +#= require_tree . + window.slugify = (text) -> text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase() |