Download as
Browse Code »

Commit b782a3406ddfb8590e03ef641cd66b3c2474b4ba

Authored by Fernando Brito
1 parent 6f15c634
Exists in master and in 2 other branches v2, wikilibras

Update gem versions

Showing 2 changed files with 19 additions and 17 deletions   Show diff stats
@@ -8,15 +8,15 @@ gem 'activeadmin', github: 'gregbell/active_admin' @@ -8,15 +8,15 @@ gem 'activeadmin', github: 'gregbell/active_admin'
8 gem 'haml-rails' 8 gem 'haml-rails'
9 gem 'sass-rails', '~> 4.0.3' 9 gem 'sass-rails', '~> 4.0.3'
10 10
11 -# gem 'bootstrap-sass'  
12 gem 'twitter-bootstrap-rails' 11 gem 'twitter-bootstrap-rails'
13 gem 'less-rails' 12 gem 'less-rails'
14 13
15 -gem 'httmultiparty'  
16 -  
17 gem 'uglifier', '>= 1.3.0' 14 gem 'uglifier', '>= 1.3.0'
18 gem 'coffee-rails', '~> 4.0.0' 15 gem 'coffee-rails', '~> 4.0.0'
19 gem 'jquery-rails' 16 gem 'jquery-rails'
  17 +
  18 +gem 'httmultiparty'
  19 +
20 gem 'therubyracer', :platform => :ruby 20 gem 'therubyracer', :platform => :ruby
21 gem 'websocket-rails' 21 gem 'websocket-rails'
22 22
@@ -202,12 +202,12 @@ GEM @@ -202,12 +202,12 @@ GEM
202 activesupport (>= 3.0.0) 202 activesupport (>= 3.0.0)
203 launchy (2.4.2) 203 launchy (2.4.2)
204 addressable (~> 2.3) 204 addressable (~> 2.3)
205 - less (2.2.2)  
206 - commonjs (~> 0.2.6)  
207 - less-rails (2.2.6) 205 + less (2.5.0)
  206 + commonjs (~> 0.2.7)
  207 + less-rails (2.5.0)
208 actionpack (>= 3.1) 208 actionpack (>= 3.1)
209 - less (~> 2.2.0)  
210 - libv8 (3.3.10.4) 209 + less (~> 2.5.0)
  210 + libv8 (3.16.14.3)
211 listen (2.7.4) 211 listen (2.7.4)
212 celluloid (>= 0.15.2) 212 celluloid (>= 0.15.2)
213 celluloid-io (>= 0.15.0) 213 celluloid-io (>= 0.15.0)
@@ -221,7 +221,7 @@ GEM @@ -221,7 +221,7 @@ GEM
221 mime-types (1.25.1) 221 mime-types (1.25.1)
222 mimemagic (0.2.1) 222 mimemagic (0.2.1)
223 mini_portile (0.5.3) 223 mini_portile (0.5.3)
224 - minitest (5.3.3) 224 + minitest (5.3.4)
225 multi_json (1.10.0) 225 multi_json (1.10.0)
226 multi_xml (0.5.5) 226 multi_xml (0.5.5)
227 multipart-post (2.0.0) 227 multipart-post (2.0.0)
@@ -270,7 +270,7 @@ GEM @@ -270,7 +270,7 @@ GEM
270 activesupport (= 4.1.1) 270 activesupport (= 4.1.1)
271 rake (>= 0.8.7) 271 rake (>= 0.8.7)
272 thor (>= 0.18.1, < 2.0) 272 thor (>= 0.18.1, < 2.0)
273 - rake (10.3.1) 273 + rake (10.3.2)
274 ransack (1.2.3) 274 ransack (1.2.3)
275 actionpack (>= 3.0) 275 actionpack (>= 3.0)
276 activerecord (>= 3.0) 276 activerecord (>= 3.0)
@@ -285,6 +285,7 @@ GEM @@ -285,6 +285,7 @@ GEM
285 redis (3.0.7) 285 redis (3.0.7)
286 redis-objects (0.9.1) 286 redis-objects (0.9.1)
287 redis (>= 3.0.2) 287 redis (>= 3.0.2)
  288 + ref (1.0.5)
288 responders (1.0.0) 289 responders (1.0.0)
289 railties (>= 3.2, < 5) 290 railties (>= 3.2, < 5)
290 rolify (3.4.0) 291 rolify (3.4.0)
@@ -346,25 +347,26 @@ GEM @@ -346,25 +347,26 @@ GEM
346 activesupport (>= 3.0) 347 activesupport (>= 3.0)
347 sprockets (~> 2.8) 348 sprockets (~> 2.8)
348 sqlite3 (1.3.9) 349 sqlite3 (1.3.9)
349 - therubyracer (0.10.2)  
350 - libv8 (~> 3.3.10) 350 + therubyracer (0.12.1)
  351 + libv8 (~> 3.16.14.0)
  352 + ref
351 thin (1.6.2) 353 thin (1.6.2)
352 daemons (>= 1.0.9) 354 daemons (>= 1.0.9)
353 eventmachine (>= 1.0.0) 355 eventmachine (>= 1.0.0)
354 rack (>= 1.0.0) 356 rack (>= 1.0.0)
355 thor (0.19.1) 357 thor (0.19.1)
356 - thread_safe (0.3.3) 358 + thread_safe (0.3.4)
357 tilt (1.4.1) 359 tilt (1.4.1)
358 timers (1.1.0) 360 timers (1.1.0)
359 treetop (1.4.15) 361 treetop (1.4.15)
360 polyglot 362 polyglot
361 polyglot (>= 0.3.1) 363 polyglot (>= 0.3.1)
362 - twitter-bootstrap-rails (2.0.9) 364 + twitter-bootstrap-rails (2.2.8)
363 actionpack (>= 3.1) 365 actionpack (>= 3.1)
364 - less-rails (~> 2.2.2) 366 + execjs
  367 + rails (>= 3.1)
365 railties (>= 3.1) 368 railties (>= 3.1)
366 - therubyracer (~> 0.10.1)  
367 - tzinfo (1.1.0) 369 + tzinfo (1.2.0)
368 thread_safe (~> 0.1) 370 thread_safe (~> 0.1)
369 uglifier (2.5.0) 371 uglifier (2.5.0)
370 execjs (>= 0.3.0) 372 execjs (>= 0.3.0)