no cofeescript

vipulnsward · Dec 2, 2014 · dc49e65 · dc49e65
1 parent 8f5e319
commit dc49e65
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,6 @@ gem 'arel'
 gem 'jquery-rails'
 gem 'sprockets-rails', '~> 2.0'
 gem 'sass-rails',   github: 'rails/sass-rails'
-gem 'coffee-rails', github: 'rails/coffee-rails'
 gem 'uglifier', '>= 1.0.3'
 
 # database

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,14 +15,6 @@ GIT
       ransack (~> 1.0)
       sass-rails
 
-GIT
-  remote: git://github.com/rails/coffee-rails.git
-  revision: 044d0d683b436128dedf45f780b8fca138d005e2
-  specs:
-    coffee-rails (4.0.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-
 GIT
   remote: git://github.com/rails/sass-rails.git
   revision: 57ec3397ff99655890895df29a7bf3f683410256
@@ -79,10 +71,13 @@ GEM
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
+    coffee-rails (4.1.0)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.8.0)
     daemons (1.1.9)
     delayed_job (4.0.2)
       activesupport (>= 3.0, < 4.2)
@@ -239,7 +234,6 @@ DEPENDENCIES
   arel
   browser
   carrierwave
-  coffee-rails!
   delayed_job_active_record
   delayed_job_web (>= 1.2.0)
   devise (= 3.2.3)

diff --git a/...javascripts/common/active_admin.js.coffee → ...assets/javascripts/common/active_admin.js b/...javascripts/common/active_admin.js.coffee → ...assets/javascripts/common/active_admin.js
diff --git a/app/assets/javascripts/common/bootstrap.js b/app/assets/javascripts/common/bootstrap.js
@@ -0,0 +1,4 @@
+jQuery(function() {
+  $("a[rel~=popover], .has-popover").popover();
+  return $("a[rel~=tooltip], .has-tooltip").tooltip();
+});
diff --git a/app/assets/javascripts/common/bootstrap.js.coffee b/app/assets/javascripts/common/bootstrap.js.coffee