Download as
Browse Code »

Commit 3da74a7fec226408865dc03e1dfe4340cf491126

Authored by renansoares
1 parent ca9cffab
Exists in master and in 1 other branch v2

update rails version

Showing 4 changed files with 26 additions and 39 deletions   Show diff stats
1 -1.9.3 1 +2.1.1
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 ruby '2.1.1' 3 ruby '2.1.1'
4 -  
5 -if RUBY_VERSION =~ /1.9/  
6 - Encoding.default_external = Encoding::UTF_8  
7 - Encoding.default_internal = Encoding::UTF_8  
8 -end  
9 -  
10 gem 'rails', '4.1.1' 4 gem 'rails', '4.1.1'
11 5
12 gem 'activeadmin', github: 'gregbell/active_admin' 6 gem 'activeadmin', github: 'gregbell/active_admin'
@@ -91,6 +85,3 @@ group :test do @@ -91,6 +85,3 @@ group :test do
91 gem 'launchy' 85 gem 'launchy'
92 gem 'selenium-webdriver' 86 gem 'selenium-webdriver'
93 end 87 end
94 -  
95 -gem 'libv8', '~>3.16.14.3'  
96 -  
@@ -87,6 +87,11 @@ GEM @@ -87,6 +87,11 @@ GEM
87 activesupport (>= 3.2.0) 87 activesupport (>= 3.2.0)
88 json (>= 1.7) 88 json (>= 1.7)
89 mime-types (>= 1.16) 89 mime-types (>= 1.16)
  90 + celluloid (0.15.2)
  91 + timers (~> 1.1.0)
  92 + celluloid-io (0.15.0)
  93 + celluloid (>= 0.15.0)
  94 + nio4r (>= 0.5.0)
90 childprocess (0.5.3) 95 childprocess (0.5.3)
91 ffi (~> 1.0, >= 1.0.11) 96 ffi (~> 1.0, >= 1.0.11)
92 coderay (1.1.0) 97 coderay (1.1.0)
@@ -134,7 +139,7 @@ GEM @@ -134,7 +139,7 @@ GEM
134 eventmachine (>= 0.12.9) 139 eventmachine (>= 0.12.9)
135 http_parser.rb (~> 0.6.0) 140 http_parser.rb (~> 0.6.0)
136 erubis (2.7.0) 141 erubis (2.7.0)
137 - eventmachine (1.0.9.1) 142 + eventmachine (1.0.3)
138 execjs (2.0.2) 143 execjs (2.0.2)
139 factory_girl (4.4.0) 144 factory_girl (4.4.0)
140 activesupport (>= 3.0.0) 145 activesupport (>= 3.0.0)
@@ -146,30 +151,25 @@ GEM @@ -146,30 +151,25 @@ GEM
146 faye-websocket (0.7.3) 151 faye-websocket (0.7.3)
147 eventmachine (>= 0.12.0) 152 eventmachine (>= 0.12.0)
148 websocket-driver (>= 0.3.1) 153 websocket-driver (>= 0.3.1)
149 - ffi (1.9.10) 154 + ffi (1.9.3)
150 foreman (0.66.0) 155 foreman (0.66.0)
151 dotenv (~> 0.7.0) 156 dotenv (~> 0.7.0)
152 thor (~> 0.19.1) 157 thor (~> 0.19.1)
153 - formatador (0.2.5) 158 + formatador (0.2.4)
154 formtastic (2.3.0.rc3) 159 formtastic (2.3.0.rc3)
155 actionpack (>= 3.0) 160 actionpack (>= 3.0)
156 - guard (2.13.0) 161 + guard (2.6.1)
157 formatador (>= 0.2.4) 162 formatador (>= 0.2.4)
158 - listen (>= 2.7, <= 4.0) 163 + listen (~> 2.7)
159 lumberjack (~> 1.0) 164 lumberjack (~> 1.0)
160 - nenv (~> 0.1)  
161 - notiffany (~> 0.0)  
162 pry (>= 0.9.12) 165 pry (>= 0.9.12)
163 - shellany (~> 0.0)  
164 thor (>= 0.18.1) 166 thor (>= 0.18.1)
165 guard-bundler (2.0.0) 167 guard-bundler (2.0.0)
166 bundler (~> 1.0) 168 bundler (~> 1.0)
167 guard (~> 2.2) 169 guard (~> 2.2)
168 - guard-compat (1.2.1)  
169 - guard-livereload (2.5.1) 170 + guard-livereload (2.1.2)
170 em-websocket (~> 0.5) 171 em-websocket (~> 0.5)
171 - guard (~> 2.8)  
172 - guard-compat (~> 1.0) 172 + guard (~> 2.0)
173 multi_json (~> 1.8) 173 multi_json (~> 1.8)
174 guard-rails (0.5.0) 174 guard-rails (0.5.0)
175 guard (>= 2.0.0) 175 guard (>= 2.0.0)
@@ -230,10 +230,12 @@ GEM @@ -230,10 +230,12 @@ GEM
230 actionpack (>= 3.1) 230 actionpack (>= 3.1)
231 less (~> 2.5.0) 231 less (~> 2.5.0)
232 libv8 (3.16.14.3) 232 libv8 (3.16.14.3)
233 - listen (3.0.5) 233 + listen (2.7.4)
  234 + celluloid (>= 0.15.2)
  235 + celluloid-io (>= 0.15.0)
234 rb-fsevent (>= 0.9.3) 236 rb-fsevent (>= 0.9.3)
235 rb-inotify (>= 0.9) 237 rb-inotify (>= 0.9)
236 - lumberjack (1.0.10) 238 + lumberjack (1.0.5)
237 mail (2.5.4) 239 mail (2.5.4)
238 mime-types (~> 1.16) 240 mime-types (~> 1.16)
239 treetop (~> 1.4.8) 241 treetop (~> 1.4.8)
@@ -242,19 +244,16 @@ GEM @@ -242,19 +244,16 @@ GEM
242 mimemagic (0.2.1) 244 mimemagic (0.2.1)
243 mini_portile (0.5.3) 245 mini_portile (0.5.3)
244 minitest (5.3.4) 246 minitest (5.3.4)
245 - multi_json (1.11.2) 247 + multi_json (1.10.0)
246 multi_xml (0.5.5) 248 multi_xml (0.5.5)
247 multipart-post (2.0.0) 249 multipart-post (2.0.0)
248 mysql2 (0.3.15) 250 mysql2 (0.3.15)
249 - nenv (0.2.0)  
250 net-scp (1.2.1) 251 net-scp (1.2.1)
251 net-ssh (>= 2.6.5) 252 net-ssh (>= 2.6.5)
252 net-ssh (2.9.1) 253 net-ssh (2.9.1)
  254 + nio4r (1.0.0)
253 nokogiri (1.6.2) 255 nokogiri (1.6.2)
254 mini_portile (~> 0.5.2) 256 mini_portile (~> 0.5.2)
255 - notiffany (0.0.8)  
256 - nenv (~> 0.1)  
257 - shellany (~> 0.0)  
258 orm_adapter (0.5.0) 257 orm_adapter (0.5.0)
259 polyamorous (1.0.0) 258 polyamorous (1.0.0)
260 activerecord (>= 3.0) 259 activerecord (>= 3.0)
@@ -273,8 +272,8 @@ GEM @@ -273,8 +272,8 @@ GEM
273 pry 272 pry
274 quiet_assets (1.0.2) 273 quiet_assets (1.0.2)
275 railties (>= 3.1, < 5.0) 274 railties (>= 3.1, < 5.0)
276 - rack (1.5.5)  
277 - rack-livereload (0.3.16) 275 + rack (1.5.2)
  276 + rack-livereload (0.3.15)
278 rack 277 rack
279 rack-protection (1.5.3) 278 rack-protection (1.5.3)
280 rack 279 rack
@@ -305,8 +304,8 @@ GEM @@ -305,8 +304,8 @@ GEM
305 polyamorous (~> 1.0.0) 304 polyamorous (~> 1.0.0)
306 rb-fchange (0.0.6) 305 rb-fchange (0.0.6)
307 ffi 306 ffi
308 - rb-fsevent (0.9.7)  
309 - rb-inotify (0.9.5) 307 + rb-fsevent (0.9.4)
  308 + rb-inotify (0.9.4)
310 ffi (>= 0.5.0) 309 ffi (>= 0.5.0)
311 redis (3.0.7) 310 redis (3.0.7)
312 redis-objects (0.9.1) 311 redis-objects (0.9.1)
@@ -354,7 +353,6 @@ GEM @@ -354,7 +353,6 @@ GEM
354 rubyzip (~> 1.0) 353 rubyzip (~> 1.0)
355 websocket (~> 1.0.4) 354 websocket (~> 1.0.4)
356 sexp_processor (4.4.3) 355 sexp_processor (4.4.3)
357 - shellany (0.0.1)  
358 simple_form (3.0.2) 356 simple_form (3.0.2)
359 actionpack (~> 4.0) 357 actionpack (~> 4.0)
360 activemodel (~> 4.0) 358 activemodel (~> 4.0)
@@ -362,7 +360,7 @@ GEM @@ -362,7 +360,7 @@ GEM
362 rack (~> 1.4) 360 rack (~> 1.4)
363 rack-protection (~> 1.4) 361 rack-protection (~> 1.4)
364 tilt (~> 1.3, >= 1.3.4) 362 tilt (~> 1.3, >= 1.3.4)
365 - slop (3.6.0) 363 + slop (3.5.0)
366 spring (1.1.3) 364 spring (1.1.3)
367 sprockets (2.11.0) 365 sprockets (2.11.0)
368 hike (~> 1.2) 366 hike (~> 1.2)
@@ -379,7 +377,7 @@ GEM @@ -379,7 +377,7 @@ GEM
379 net-scp (>= 1.1.2) 377 net-scp (>= 1.1.2)
380 net-ssh (>= 2.8.0) 378 net-ssh (>= 2.8.0)
381 therubyracer (0.12.1) 379 therubyracer (0.12.1)
382 - libv8 (~> 3.16.14.3) 380 + libv8 (~> 3.16.14.0)
383 ref 381 ref
384 thin (1.6.2) 382 thin (1.6.2)
385 daemons (>= 1.0.9) 383 daemons (>= 1.0.9)
@@ -388,6 +386,7 @@ GEM @@ -388,6 +386,7 @@ GEM
388 thor (0.19.1) 386 thor (0.19.1)
389 thread_safe (0.3.4) 387 thread_safe (0.3.4)
390 tilt (1.4.1) 388 tilt (1.4.1)
  389 + timers (1.1.0)
391 treetop (1.4.15) 390 treetop (1.4.15)
392 polyglot 391 polyglot
393 polyglot (>= 0.3.1) 392 polyglot (>= 0.3.1)
@@ -456,7 +455,6 @@ DEPENDENCIES @@ -456,7 +455,6 @@ DEPENDENCIES
456 kaminari-bootstrap (~> 0.1.3) 455 kaminari-bootstrap (~> 0.1.3)
457 launchy 456 launchy
458 less-rails 457 less-rails
459 - libv8 (~> 3.16.14.3)  
460 mysql2 458 mysql2
461 pry-debugger 459 pry-debugger
462 pry-rails 460 pry-rails
1 # Add your own tasks in files placed in lib/tasks ending in .rake, 1 # Add your own tasks in files placed in lib/tasks ending in .rake,
2 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. 2 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
3 3
4 -#encoding: utf-8  
5 -  
6 require File.expand_path('../config/application', __FILE__) 4 require File.expand_path('../config/application', __FILE__)
7 5
8 Rails.application.load_tasks 6 Rails.application.load_tasks