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