Download as
Browse Code »

Commit 2b2d43ed2a91b9a82608d26a6ece70929009b5ed

Authored by Dmitriy Zaporozhets
1 parent ed7a2136
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update develoment dependencies

Showing 2 changed files with 38 additions and 36 deletions   Show diff stats
Gemfile
  Diff comments   View file @2b2d43e
... ... @@ -153,9 +153,9 @@ end
153 153 group :development, :test do
154 154 gem 'coveralls', require: false
155 155 gem 'rails-dev-tweaks'
156   - gem 'spinach-rails', '0.2.0'
157   - gem "rspec-rails", '2.12.2'
158   - gem "capybara", '2.0.2'
  156 + gem 'spinach-rails'
  157 + gem "rspec-rails"
  158 + gem "capybara"
159 159 gem "pry"
160 160 gem "awesome_print"
161 161 gem "database_cleaner"
... ...
Gemfile.lock
  Diff comments   View file @2b2d43e
... ... @@ -95,7 +95,7 @@ GEM
95 95 thor (~> 0.14)
96 96 code_analyzer (0.3.1)
97 97 sexp_processor
98   - coderay (1.0.8)
  98 + coderay (1.0.9)
99 99 coffee-rails (3.2.2)
100 100 coffee-script (>= 2.2.0)
101 101 railties (~> 3.2.0)
... ... @@ -122,7 +122,7 @@ GEM
122 122 orm_adapter (~> 0.1)
123 123 railties (~> 3.1)
124 124 warden (~> 1.2.1)
125   - diff-lcs (1.1.3)
  125 + diff-lcs (1.2.1)
126 126 draper (1.1.0)
127 127 actionpack (>= 3.0)
128 128 activesupport (>= 3.0)
... ... @@ -201,12 +201,13 @@ GEM
201 201 grit_ext (0.8.1)
202 202 charlock_holmes (~> 0.6.9)
203 203 growl (1.0.3)
204   - guard (1.5.4)
205   - listen (>= 0.4.2)
  204 + guard (1.6.2)
  205 + listen (>= 0.6.0)
206 206 lumberjack (>= 1.0.2)
207 207 pry (>= 0.9.10)
  208 + terminal-table (>= 1.4.3)
208 209 thor (>= 0.14.6)
209   - guard-rspec (2.1.2)
  210 + guard-rspec (2.5.1)
210 211 guard (>= 1.1)
211 212 rspec (~> 2.11)
212 213 guard-spinach (0.0.2)
... ... @@ -247,8 +248,8 @@ GEM
247 248 letter_opener (1.0.0)
248 249 launchy (>= 2.0.4)
249 250 libv8 (3.3.10.4)
250   - listen (0.5.3)
251   - lumberjack (1.0.2)
  251 + listen (0.7.3)
  252 + lumberjack (1.0.3)
252 253 mail (2.5.3)
253 254 i18n (>= 0.4.0)
254 255 mime-types (~> 1.16)
... ... @@ -297,11 +298,10 @@ GEM
297 298 http_parser.rb (~> 0.5.3)
298 299 polyglot (0.3.3)
299 300 posix-spawn (0.3.6)
300   - progressbar (0.12.0)
301   - pry (0.9.10)
  301 + pry (0.9.12)
302 302 coderay (~> 1.0.5)
303 303 method_source (~> 0.8)
304   - slop (~> 3.3.1)
  304 + slop (~> 3.4)
305 305 pygments.rb (0.4.2)
306 306 posix-spawn (~> 0.3.6)
307 307 yajl-ruby (~> 1.1.0)
... ... @@ -334,14 +334,14 @@ GEM
334 334 rails-dev-tweaks (0.6.1)
335 335 actionpack (~> 3.1)
336 336 railties (~> 3.1)
337   - rails_best_practices (1.13.2)
  337 + rails_best_practices (1.13.4)
338 338 activesupport
339 339 awesome_print
340 340 code_analyzer
341 341 colored
342 342 erubis
343 343 i18n
344   - progressbar
  344 + ruby-progressbar
345 345 railties (3.2.13)
346 346 actionpack (= 3.2.13)
347 347 activesupport (= 3.2.13)
... ... @@ -350,7 +350,7 @@ GEM
350 350 rdoc (~> 3.4)
351 351 thor (>= 0.14.6, < 2.0)
352 352 raindrops (0.10.0)
353   - rake (10.0.3)
  353 + rake (10.0.4)
354 354 rb-fsevent (0.9.2)
355 355 rb-inotify (0.8.8)
356 356 ffi (>= 0.5.0)
... ... @@ -379,27 +379,28 @@ GEM
379 379 request_store (1.0.5)
380 380 rest-client (1.6.7)
381 381 mime-types (>= 1.16)
382   - rspec (2.12.0)
383   - rspec-core (~> 2.12.0)
384   - rspec-expectations (~> 2.12.0)
385   - rspec-mocks (~> 2.12.0)
386   - rspec-core (2.12.0)
387   - rspec-expectations (2.12.0)
388   - diff-lcs (~> 1.1.3)
389   - rspec-mocks (2.12.0)
390   - rspec-rails (2.12.2)
  382 + rspec (2.13.0)
  383 + rspec-core (~> 2.13.0)
  384 + rspec-expectations (~> 2.13.0)
  385 + rspec-mocks (~> 2.13.0)
  386 + rspec-core (2.13.1)
  387 + rspec-expectations (2.13.0)
  388 + diff-lcs (>= 1.1.3, < 2.0)
  389 + rspec-mocks (2.13.0)
  390 + rspec-rails (2.13.0)
391 391 actionpack (>= 3.0)
392 392 activesupport (>= 3.0)
393 393 railties (>= 3.0)
394   - rspec-core (~> 2.12.0)
395   - rspec-expectations (~> 2.12.0)
396   - rspec-mocks (~> 2.12.0)
  394 + rspec-core (~> 2.13.0)
  395 + rspec-expectations (~> 2.13.0)
  396 + rspec-mocks (~> 2.13.0)
  397 + ruby-progressbar (1.0.2)
397 398 rubyntlm (0.1.1)
398 399 rubyzip (0.9.9)
399 400 sanitize (2.0.3)
400 401 nokogiri (>= 1.4.4, < 1.6)
401   - sass (3.2.5)
402   - sass-rails (3.2.5)
  402 + sass (3.2.7)
  403 + sass-rails (3.2.6)
403 404 railties (~> 3.2.0)
404 405 sass (>= 3.1.10)
405 406 tilt (~> 1.3)
... ... @@ -418,7 +419,7 @@ GEM
418 419 rubyzip
419 420 websocket (~> 1.0.4)
420 421 settingslogic (2.0.9)
421   - sexp_processor (4.1.3)
  422 + sexp_processor (4.2.0)
422 423 shoulda-matchers (1.3.0)
423 424 activesupport (>= 3.0.0)
424 425 sidekiq (2.8.0)
... ... @@ -439,7 +440,7 @@ GEM
439 440 slim (1.3.6)
440 441 temple (~> 0.5.5)
441 442 tilt (~> 1.3.3)
442   - slop (3.3.3)
  443 + slop (3.4.4)
443 444 spinach (0.7.0)
444 445 colorize
445 446 gherkin-ruby (~> 0.2.0)
... ... @@ -457,6 +458,7 @@ GEM
457 458 state_machine (1.1.2)
458 459 stringex (1.5.1)
459 460 temple (0.5.5)
  461 + terminal-table (1.4.5)
460 462 test_after_commit (0.0.1)
461 463 therubyracer (0.10.2)
462 464 libv8 (~> 3.3.10)
... ... @@ -464,7 +466,7 @@ GEM
464 466 daemons (>= 1.0.9)
465 467 eventmachine (>= 0.12.6)
466 468 rack (>= 1.0.0)
467   - thor (0.17.0)
  469 + thor (0.18.0)
468 470 tilt (1.3.6)
469 471 timers (1.1.0)
470 472 treetop (1.4.12)
... ... @@ -502,7 +504,7 @@ DEPENDENCIES
502 504 better_errors
503 505 binding_of_caller
504 506 bootstrap-sass (= 2.2.1.1)
505   - capybara (= 2.0.2)
  507 + capybara
506 508 carrierwave
507 509 chosen-rails (= 0.9.8)
508 510 coffee-rails (~> 3.2.2)
... ... @@ -562,7 +564,7 @@ DEPENDENCIES
562 564 rb-inotify
563 565 redcarpet (~> 2.2.2)
564 566 redis-rails
565   - rspec-rails (= 2.12.2)
  567 + rspec-rails
566 568 sass-rails (~> 3.2.5)
567 569 sdoc
568 570 seed-fu
... ... @@ -574,7 +576,7 @@ DEPENDENCIES
574 576 sinatra
575 577 six
576 578 slim
577   - spinach-rails (= 0.2.0)
  579 + spinach-rails
578 580 spork (~> 1.0rc)
579 581 stamp
580 582 state_machine
... ...