Permalink
Browse files

retirando thin, retirando fork para capibara

  • Loading branch information...
1 parent 4059f94 commit 0fa086c102865bedf50aa4c18f07f6a55508013d @thejamespinto committed Dec 17, 2011
Showing with 13 additions and 26 deletions.
  1. +1 −2 Gemfile
  2. +12 −24 Gemfile.lock
View
@@ -9,7 +9,6 @@ gem 'sqlite3'
gem 'paperclip'
gem 'nifty-generators'
gem 'haml'
-gem 'thin'
gem 'colorize'
gem 'newrelic_rpm'
gem 'kaminari'
@@ -45,7 +44,7 @@ group :test do
end
group :development, :test do
gem 'rspec-rails'
- gem 'capybara', :git => 'git://github.com/jnicklas/capybara.git'
+ gem 'capybara'
gem 'fabrication'
gem 'launchy'
gem 'database_cleaner'
View
@@ -1,15 +1,3 @@
-GIT
- remote: git://github.com/jnicklas/capybara.git
- revision: 8399429874dc9b567e35d39d1bd6d82fba1a85c8
- specs:
- capybara (1.1.1)
- mime-types (>= 1.16)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- selenium-webdriver (~> 2.0)
- xpath (~> 0.1.4)
-
GEM
remote: http://rubygems.org/
specs:
@@ -46,7 +34,14 @@ GEM
arel (2.2.1)
bcrypt-ruby (3.0.1)
builder (3.0.0)
- childprocess (0.2.2)
+ capybara (1.1.2)
+ mime-types (>= 1.16)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ selenium-webdriver (~> 2.0)
+ xpath (~> 0.1.4)
+ childprocess (0.2.3)
ffi (~> 1.0.6)
cocaine (0.2.0)
coffee-rails (3.1.1)
@@ -57,13 +52,11 @@ GEM
execjs
coffee-script-source (1.1.2)
colorize (0.5.8)
- daemons (1.1.4)
database_cleaner (0.7.0)
diff-lcs (1.1.3)
draper (0.9.5)
activesupport (>= 2.3.10)
erubis (2.7.0)
- eventmachine (0.12.10)
execjs (1.2.9)
multi_json (~> 1.0)
fabrication (1.2.0)
@@ -79,7 +72,7 @@ GEM
railties (~> 3.0)
thor (~> 0.14)
json (1.6.1)
- json_pure (1.6.1)
+ json_pure (1.6.3)
kaminari (0.12.4)
rails (>= 3.0.0)
launchy (2.0.5)
@@ -147,15 +140,15 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.7.0)
- rubyzip (0.9.4)
+ rubyzip (0.9.5)
sass (3.1.10)
sass-rails (3.1.4)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (>= 3.1.4)
sprockets (~> 2.0.0)
tilt (~> 1.3.2)
- selenium-webdriver (2.12.2)
+ selenium-webdriver (2.13.0)
childprocess (>= 0.2.1)
ffi (~> 1.0.9)
json_pure
@@ -165,10 +158,6 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.4)
- thin (1.2.11)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -188,7 +177,7 @@ PLATFORMS
DEPENDENCIES
bcrypt-ruby (~> 3.0.0)
- capybara!
+ capybara
coffee-rails (~> 3.1.1)
colorize
database_cleaner
@@ -211,6 +200,5 @@ DEPENDENCIES
rspec-rails
sass-rails (~> 3.1.4)
sqlite3
- thin
turn
uglifier (>= 1.0.3)

0 comments on commit 0fa086c

Please sign in to comment.