about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock13
2 files changed, 8 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile index 05622f1..cbffc52 100644 --- a/Gemfile +++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'sassc-rails'
17# Use Uglifier as compressor for JavaScript assets 17# Use Uglifier as compressor for JavaScript assets
18gem 'uglifier', '>= 1.3.0' 18gem 'uglifier', '>= 1.3.0'
19# See https://github.com/rails/execjs#readme for more supported runtimes 19# See https://github.com/rails/execjs#readme for more supported runtimes
20gem 'therubyracer', platforms: :ruby 20gem 'node', platforms: :ruby
21 21
22# Use CoffeeScript for .coffee assets and views 22# Use CoffeeScript for .coffee assets and views
23gem 'coffee-rails', '~> 4.2' 23gem 'coffee-rails', '~> 4.2'
diff --git a/Gemfile.lock b/Gemfile.lock index f46a1da..eea9708 100644 --- a/Gemfile.lock +++ b/Gemfile.lock
@@ -139,7 +139,6 @@ GEM
139 railties (>= 3.2.16) 139 railties (>= 3.2.16)
140 js-routes (2.0.7) 140 js-routes (2.0.7)
141 railties (>= 4) 141 railties (>= 4)
142 libv8 (3.16.14.19)
143 listen (3.1.5) 142 listen (3.1.5)
144 rb-fsevent (~> 0.9, >= 0.9.4) 143 rb-fsevent (~> 0.9, >= 0.9.4)
145 rb-inotify (~> 0.9, >= 0.9.7) 144 rb-inotify (~> 0.9, >= 0.9.7)
@@ -165,6 +164,12 @@ GEM
165 net-ssh (>= 2.6.5, < 7.0.0) 164 net-ssh (>= 2.6.5, < 7.0.0)
166 net-ssh (6.1.0) 165 net-ssh (6.1.0)
167 nio4r (2.5.7) 166 nio4r (2.5.7)
167 node (2.1.0)
168 node_impl (~> 1.0.0)
169 node_int (~> 0.1.0)
170 node_impl (1.0.0)
171 node_int (~> 0.1.0)
172 node_int (0.1.3)
168 nokogiri (1.11.7) 173 nokogiri (1.11.7)
169 mini_portile2 (~> 2.5.0) 174 mini_portile2 (~> 2.5.0)
170 racc (~> 1.4) 175 racc (~> 1.4)
@@ -211,7 +216,6 @@ GEM
211 rb-fsevent (0.11.0) 216 rb-fsevent (0.11.0)
212 rb-inotify (0.10.1) 217 rb-inotify (0.10.1)
213 ffi (~> 1.0) 218 ffi (~> 1.0)
214 ref (2.0.0)
215 responders (3.0.1) 219 responders (3.0.1)
216 actionpack (>= 5.0) 220 actionpack (>= 5.0)
217 railties (>= 5.0) 221 railties (>= 5.0)
@@ -249,9 +253,6 @@ GEM
249 temple (0.8.2) 253 temple (0.8.2)
250 terrapin (0.6.0) 254 terrapin (0.6.0)
251 climate_control (>= 0.0.3, < 1.0) 255 climate_control (>= 0.0.3, < 1.0)
252 therubyracer (0.12.3)
253 libv8 (~> 3.16.14.15)
254 ref
255 thor (1.1.0) 256 thor (1.1.0)
256 thread_safe (0.3.6) 257 thread_safe (0.3.6)
257 tilt (2.0.10) 258 tilt (2.0.10)
@@ -301,6 +302,7 @@ DEPENDENCIES
301 js-routes 302 js-routes
302 listen (>= 3.0.5, < 3.2) 303 listen (>= 3.0.5, < 3.2)
303 mysql2 304 mysql2
305 node
304 normalize-rails 306 normalize-rails
305 paperclip 307 paperclip
306 pokeviewer! 308 pokeviewer!
@@ -312,7 +314,6 @@ DEPENDENCIES
312 spring-watcher-listen (~> 2.0.0) 314 spring-watcher-listen (~> 2.0.0)
313 sprockets (= 3.7.2) 315 sprockets (= 3.7.2)
314 sqlite3 316 sqlite3
315 therubyracer
316 turbolinks (~> 5) 317 turbolinks (~> 5)
317 tzinfo-data 318 tzinfo-data
318 uglifier (>= 1.3.0) 319 uglifier (>= 1.3.0)