[api] avoid tilt downgrade

tilt-2.0 does not match with bootstrap-sass-rails, but tilt-1.1 does not work with sprockets
openSUSE · Dec 4, 2013 · 5614f63 · 5614f63
1 parent 440f7e7
commit 5614f63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/api/Gemfile b/src/api/Gemfile
@@ -10,6 +10,8 @@ gem 'mysql2'
 # activexml require
 gem 'nokogiri', '~>1.6.0'
 
+gem 'tilt', '>= 1.4.1'
+
 # make sure we can delay tasks
 gem 'delayed_job_active_record', '>= 4.0.0'
 # to have the delayed job daemon

diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
     thor (0.18.1)
     thread_safe (0.1.3)
       atomic
-    tilt (1.1)
+    tilt (1.4.1)
     timecop (0.7.0)
     treetop (1.4.15)
       polyglot
@@ -251,6 +251,7 @@ DEPENDENCIES
   simplecov
   sprite-factory (>= 1.5.2)
   thinking-sphinx
+  tilt (>= 1.4.1)
   timecop
   uglifier (>= 1.2.2)
   unicorn-rails