Download as
Browse Code »

Commit 983611ffe0ba9f798da703cc0f0a501e5b589971

Authored by Nathan Broadbent
1 parent 3580c017
Exists in master and in 1 other branch production

Use tilt from master branch until 1.3.7 is released, to fix 1.8.7 asset compiling

Showing 2 changed files with 10 additions and 1 deletions   Show diff stats
Gemfile
  Diff comments   View file @983611f
... ... @@ -8,6 +8,9 @@ gem 'haml'
8 8 gem 'htmlentities', "~> 4.3.0"
9 9 gem 'rack-ssl', :require => 'rack/ssl' # force SSL
10 10  
  11 +# Remove this when tilt 1.3.7 is released.
  12 +gem 'tilt', :git => 'git@github.com:rtomayko/tilt.git'
  13 +
11 14 gem 'useragent', '~> 0.4.16'
12 15 gem 'inherited_resources'
13 16 gem 'SystemTimer', :platform => :ruby_18
... ...
Gemfile.lock
  Diff comments   View file @983611f
... ... @@ -5,6 +5,12 @@ GIT
5 5 gitlab (2.2.0)
6 6 httparty
7 7  
  8 +GIT
  9 + remote: git@github.com:rtomayko/tilt.git
  10 + revision: 24ea7e9fa5a0624188069393abf033bb8b3f218c
  11 + specs:
  12 + tilt (1.3.6)
  13 +
8 14 GEM
9 15 remote: http://rubygems.org/
10 16 specs:
... ... @@ -311,7 +317,6 @@ GEM
311 317 eventmachine (>= 0.12.6)
312 318 rack (>= 1.0.0)
313 319 thor (0.17.0)
314   - tilt (1.3.6)
315 320 timecop (0.3.5)
316 321 treetop (1.4.12)
317 322 polyglot
... ... @@ -391,6 +396,7 @@ DEPENDENCIES
391 396 rushover
392 397 therubyracer
393 398 thin
  399 + tilt!
394 400 timecop
395 401 turbo-sprockets-rails3
396 402 uglifier (>= 1.0.3)
... ...