Commit 3b6c90a6e7535f77c11efae475c6ed53eba43704
1 parent
fcbe9050
Exists in
master
and in
1 other branch
update some dev gem
Showing
3 changed files
with
17 additions
and
20 deletions
Show diff stats
Gemfile
| @@ -103,7 +103,7 @@ end | @@ -103,7 +103,7 @@ end | ||
| 103 | group :test do | 103 | group :test do |
| 104 | gem 'capybara' | 104 | gem 'capybara' |
| 105 | gem 'launchy' | 105 | gem 'launchy' |
| 106 | - gem 'database_cleaner', '~> 0.6.0' | 106 | + gem 'database_cleaner' |
| 107 | gem 'email_spec' | 107 | gem 'email_spec' |
| 108 | gem 'timecop' | 108 | gem 'timecop' |
| 109 | gem 'coveralls', :require => false | 109 | gem 'coveralls', :require => false |
Gemfile.lock
| @@ -72,15 +72,12 @@ GEM | @@ -72,15 +72,12 @@ GEM | ||
| 72 | net-sftp (>= 2.0.0) | 72 | net-sftp (>= 2.0.0) |
| 73 | net-ssh (>= 2.0.14) | 73 | net-ssh (>= 2.0.14) |
| 74 | net-ssh-gateway (>= 1.1.0) | 74 | net-ssh-gateway (>= 1.1.0) |
| 75 | - capybara (1.1.2) | 75 | + capybara (2.1.0) |
| 76 | mime-types (>= 1.16) | 76 | mime-types (>= 1.16) |
| 77 | nokogiri (>= 1.3.3) | 77 | nokogiri (>= 1.3.3) |
| 78 | rack (>= 1.0.0) | 78 | rack (>= 1.0.0) |
| 79 | rack-test (>= 0.5.4) | 79 | rack-test (>= 0.5.4) |
| 80 | - selenium-webdriver (~> 2.0) | ||
| 81 | - xpath (~> 0.1.4) | ||
| 82 | - childprocess (0.3.5) | ||
| 83 | - ffi (~> 1.0, >= 1.0.6) | 80 | + xpath (~> 2.0) |
| 84 | coderay (1.0.9) | 81 | coderay (1.0.9) |
| 85 | colorize (0.5.8) | 82 | colorize (0.5.8) |
| 86 | columnize (0.3.6) | 83 | columnize (0.3.6) |
| @@ -95,7 +92,7 @@ GEM | @@ -95,7 +92,7 @@ GEM | ||
| 95 | addressable | 92 | addressable |
| 96 | rdoc | 93 | rdoc |
| 97 | daemons (1.1.9) | 94 | daemons (1.1.9) |
| 98 | - database_cleaner (0.6.7) | 95 | + database_cleaner (1.0.1) |
| 99 | debug_inspector (0.0.2) | 96 | debug_inspector (0.0.2) |
| 100 | debugger (1.6.0) | 97 | debugger (1.6.0) |
| 101 | columnize (>= 0.3.1) | 98 | columnize (>= 0.3.1) |
| @@ -121,7 +118,6 @@ GEM | @@ -121,7 +118,6 @@ GEM | ||
| 121 | multipart-post (~> 1.1) | 118 | multipart-post (~> 1.1) |
| 122 | faraday_middleware (0.8.8) | 119 | faraday_middleware (0.8.8) |
| 123 | faraday (>= 0.7.4, < 0.9) | 120 | faraday (>= 0.7.4, < 0.9) |
| 124 | - ffi (1.1.4) | ||
| 125 | foreman (0.63.0) | 121 | foreman (0.63.0) |
| 126 | dotenv (>= 0.7) | 122 | dotenv (>= 0.7) |
| 127 | thor (>= 0.13.6) | 123 | thor (>= 0.13.6) |
| @@ -161,8 +157,6 @@ GEM | @@ -161,8 +157,6 @@ GEM | ||
| 161 | launchy (2.3.0) | 157 | launchy (2.3.0) |
| 162 | addressable (~> 2.3) | 158 | addressable (~> 2.3) |
| 163 | libv8 (3.11.8.17) | 159 | libv8 (3.11.8.17) |
| 164 | - libwebsocket (0.1.5) | ||
| 165 | - addressable | ||
| 166 | libxml-ruby (2.6.0) | 160 | libxml-ruby (2.6.0) |
| 167 | lighthouse-api (2.0) | 161 | lighthouse-api (2.0) |
| 168 | activeresource (>= 3.0.0) | 162 | activeresource (>= 3.0.0) |
| @@ -172,7 +166,7 @@ GEM | @@ -172,7 +166,7 @@ GEM | ||
| 172 | mail (2.5.4) | 166 | mail (2.5.4) |
| 173 | mime-types (~> 1.16) | 167 | mime-types (~> 1.16) |
| 174 | treetop (~> 1.4.8) | 168 | treetop (~> 1.4.8) |
| 175 | - meta_request (0.2.5) | 169 | + meta_request (0.2.6) |
| 176 | callsite | 170 | callsite |
| 177 | rack-contrib | 171 | rack-contrib |
| 178 | railties | 172 | railties |
| @@ -300,15 +294,9 @@ GEM | @@ -300,15 +294,9 @@ GEM | ||
| 300 | linecache (>= 0.3) | 294 | linecache (>= 0.3) |
| 301 | ruby-fogbugz (0.1.1) | 295 | ruby-fogbugz (0.1.1) |
| 302 | crack | 296 | crack |
| 303 | - rubyzip (0.9.9) | ||
| 304 | rushover (0.3.0) | 297 | rushover (0.3.0) |
| 305 | json | 298 | json |
| 306 | rest-client | 299 | rest-client |
| 307 | - selenium-webdriver (2.25.0) | ||
| 308 | - childprocess (>= 0.2.5) | ||
| 309 | - libwebsocket (~> 0.1.3) | ||
| 310 | - multi_json (~> 1.0) | ||
| 311 | - rubyzip | ||
| 312 | simple_oauth (0.2.0) | 300 | simple_oauth (0.2.0) |
| 313 | simplecov (0.7.1) | 301 | simplecov (0.7.1) |
| 314 | multi_json (~> 1.0) | 302 | multi_json (~> 1.0) |
| @@ -340,7 +328,7 @@ GEM | @@ -340,7 +328,7 @@ GEM | ||
| 340 | uglifier (2.1.1) | 328 | uglifier (2.1.1) |
| 341 | execjs (>= 0.3.0) | 329 | execjs (>= 0.3.0) |
| 342 | multi_json (~> 1.0, >= 1.0.2) | 330 | multi_json (~> 1.0, >= 1.0.2) |
| 343 | - underscore-rails (1.4.2.1) | 331 | + underscore-rails (1.4.4) |
| 344 | unicorn (4.6.2) | 332 | unicorn (4.6.2) |
| 345 | kgio (~> 2.6) | 333 | kgio (~> 2.6) |
| 346 | rack | 334 | rack |
| @@ -352,7 +340,7 @@ GEM | @@ -352,7 +340,7 @@ GEM | ||
| 352 | addressable (>= 2.2.7) | 340 | addressable (>= 2.2.7) |
| 353 | crack (>= 0.3.2) | 341 | crack (>= 0.3.2) |
| 354 | xmpp4r (0.5) | 342 | xmpp4r (0.5) |
| 355 | - xpath (0.1.4) | 343 | + xpath (2.0.0) |
| 356 | nokogiri (~> 1.3) | 344 | nokogiri (~> 1.3) |
| 357 | yajl-ruby (1.1.0) | 345 | yajl-ruby (1.1.0) |
| 358 | 346 | ||
| @@ -372,7 +360,7 @@ DEPENDENCIES | @@ -372,7 +360,7 @@ DEPENDENCIES | ||
| 372 | capistrano | 360 | capistrano |
| 373 | capybara | 361 | capybara |
| 374 | coveralls | 362 | coveralls |
| 375 | - database_cleaner (~> 0.6.0) | 363 | + database_cleaner |
| 376 | debugger | 364 | debugger |
| 377 | devise (~> 1.5.4) | 365 | devise (~> 1.5.4) |
| 378 | email_spec | 366 | email_spec |