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
14 gem 'thin'14 gem 'thin'
15 gem 'sprockets'15 gem 'sprockets'
16 gem 'sprockets-helpers'16 gem 'sprockets-helpers'
17 gem 'erubis'17 gem 'erubi'
18 gem 'browser'18 gem 'browser'
19 gem 'sass'19 gem 'sass'
20 gem 'coffee-script'20 gem 'coffee-script'
Gemfile.lock+6−5
@@ -19,17 +19,18 @@ GEM · 18 unmodified lines
19 coffee-script-source (1.12.2)19 coffee-script-source (1.12.2)
20 concurrent-ruby (1.0.4)20 concurrent-ruby (1.0.4)
21 daemons (1.2.4)21 daemons (1.2.4)
22 erubi (1.5.0)
22 erubis (2.7.0)23 erubis (2.7.0)
23 ethon (0.10.1)24 ethon (0.10.1)
24 ffi (>= 1.3.0)25 ffi (>= 1.3.0)
25 eventmachine (1.2.1)26 eventmachine (1.2.2)
26 execjs (2.7.0)27 execjs (2.7.0)
27 ffi (1.9.17)28 ffi (1.9.17)
28 highline (1.7.8)29 highline (1.7.8)
29 html-pipeline (2.5.0)30 html-pipeline (2.5.0)
30 activesupport (>= 2)31 activesupport (>= 2)
31 nokogiri (>= 1.4)32 nokogiri (>= 1.4)
32 i18n (0.7.0)33 i18n (0.8.0)
33 method_source (0.8.2)34 method_source (0.8.2)
34 mini_portile2 (2.1.0)35 mini_portile2 (2.1.0)
35 minitest (5.10.1)36 minitest (5.10.1)
@@ -52,7 +53,7 @@ GEM · 16 unmodified lines
52 rake (12.0.0)53 rake (12.0.0)
53 rr (1.2.0)54 rr (1.2.0)
54 sass (3.4.23)55 sass (3.4.23)
55 sinatra (1.4.7)56 sinatra (1.4.8)
56 rack (~> 1.5)57 rack (~> 1.5)
57 rack-protection (~> 1.4)58 rack-protection (~> 1.4)
58 tilt (>= 1.3, < 3)59 tilt (>= 1.3, < 3)
@@ -75,7 +76,7 @@ GEM · 16 unmodified lines
75 rack (>= 1, < 3)76 rack (>= 1, < 3)
76 thor (0.19.4)77 thor (0.19.4)
77 thread_safe (0.3.5)78 thread_safe (0.3.5)
78 tilt (2.0.5)79 tilt (2.0.6)
79 tty-pager (0.5.0)80 tty-pager (0.5.0)
80 tty-screen (~> 0.5.0)81 tty-screen (~> 0.5.0)
81 tty-which (~> 0.2.0)82 tty-which (~> 0.2.0)
@@ -104,7 +105,7 @@ DEPENDENCIES · 22 unmodified lines
104 better_errors105 better_errors
105 browser106 browser
106 coffee-script107 coffee-script
107 erubis108 erubi
108 html-pipeline109 html-pipeline
109 minitest110 minitest
110 nokogiri111 nokogiri
lib/app.rb+1−1
@@ -6,7 +6,7 @@ Bundler.require :app · 5 unmodified lines
6class App < Sinatra::Application6class App < Sinatra::Application
7 Bundler.require environment7 Bundler.require environment
8 require 'sinatra/cookies'8 require 'sinatra/cookies'
9 require 'tilt/erubis'9 require 'tilt/erubi'
10 require 'active_support/notifications'10 require 'active_support/notifications'
11 11
12 Rack::Mime::MIME_TYPES['.webapp'] = 'application/x-web-app-manifest+json'12 Rack::Mime::MIME_TYPES['.webapp'] = 'application/x-web-app-manifest+json'