History

Bump gems and switch to erubi

Thibaut Courouble committed 9 years ago

Commit 4e9daa81 parent f333f443 files · +8 −7Browse files

Unified · Split

3 files
  1. Gemfile +1 −1
  2. Gemfile.lock +6 −5
  3. lib/app.rb +1 −1
Gemfile+1−1
@@ -14,7 +14,7 @@ group :app do · 13 unmodified lines
1414 gem 'thin'
1515 gem 'sprockets'
1616 gem 'sprockets-helpers'
17− gem 'erubis'
17+ gem 'erubi'
1818 gem 'browser'
1919 gem 'sass'
2020 gem 'coffee-script'
Gemfile.lock+6−5
@@ -19,17 +19,18 @@ GEM · 18 unmodified lines
1919 coffee-script-source (1.12.2)
2020 concurrent-ruby (1.0.4)
2121 daemons (1.2.4)
22+ erubi (1.5.0)
2223 erubis (2.7.0)
2324 ethon (0.10.1)
2425 ffi (>= 1.3.0)
25− eventmachine (1.2.1)
26+ eventmachine (1.2.2)
2627 execjs (2.7.0)
2728 ffi (1.9.17)
2829 highline (1.7.8)
2930 html-pipeline (2.5.0)
3031 activesupport (>= 2)
3132 nokogiri (>= 1.4)
32− i18n (0.7.0)
33+ i18n (0.8.0)
3334 method_source (0.8.2)
3435 mini_portile2 (2.1.0)
3536 minitest (5.10.1)
@@ -52,7 +53,7 @@ GEM · 16 unmodified lines
5253 rake (12.0.0)
5354 rr (1.2.0)
5455 sass (3.4.23)
55− sinatra (1.4.7)
56+ sinatra (1.4.8)
5657 rack (~> 1.5)
5758 rack-protection (~> 1.4)
5859 tilt (>= 1.3, < 3)
@@ -75,7 +76,7 @@ GEM · 16 unmodified lines
7576 rack (>= 1, < 3)
7677 thor (0.19.4)
7778 thread_safe (0.3.5)
78− tilt (2.0.5)
79+ tilt (2.0.6)
7980 tty-pager (0.5.0)
8081 tty-screen (~> 0.5.0)
8182 tty-which (~> 0.2.0)
@@ -104,7 +105,7 @@ DEPENDENCIES · 22 unmodified lines
104105 better_errors
105106 browser
106107 coffee-script
107− erubis
108+ erubi
108109 html-pipeline
109110 minitest
110111 nokogiri
lib/app.rb+1−1
@@ -6,7 +6,7 @@ Bundler.require :app · 5 unmodified lines
66 class App < Sinatra::Application
77 Bundler.require environment
88 require 'sinatra/cookies'
9− require 'tilt/erubis'
9+ require 'tilt/erubi'
1010 require 'active_support/notifications'
1111
1212 Rack::Mime::MIME_TYPES['.webapp'] = 'application/x-web-app-manifest+json'