Permalink
Browse files

use new gem dependencies

  • Loading branch information...
1 parent a28fc66 commit 9829ac42b8ed8689ef55af56e1e9e20f6e1207e6 Kosmas Chatzimichalis committed Mar 4, 2013
Showing with 0 additions and 25 deletions.
  1. +0 −25 cucumber-rails.gemspec
View
25 cucumber-rails.gemspec
@@ -10,30 +10,6 @@ Gem::Specification.new do |s|
s.email = 'cukes@googlegroups.com'
s.homepage = "http://cukes.info"
-<<<<<<< HEAD
- s.add_runtime_dependency('cucumber', '>= 1.2.1')
- s.add_runtime_dependency('nokogiri', '>= 1.5.6')
- s.add_runtime_dependency('capybara', '>= 2.0.2')
- s.add_development_dependency('rails', '>= 3.2.12')
- s.add_development_dependency('rake', '>= 10.0.3')
- s.add_development_dependency('bundler', '>= 1.3.0')
- s.add_development_dependency('aruba', '>= 0.5.1')
- s.add_development_dependency('sqlite3', '>= 1.3.7')
- s.add_development_dependency('rspec', '~> 2.13.0')
- s.add_development_dependency('rspec-rails', '~> 2.13.0')
- s.add_development_dependency('ammeter', '>= 0.2.8')
- s.add_development_dependency('factory_girl', '>= 4.2.0')
- s.add_development_dependency('database_cleaner', '>= 0.9.1')
- s.add_development_dependency('mongoid', '>= 3.1.2')
- s.add_development_dependency('bson_ext', '>= 1.8.2')
-
- # Various Stuff that Rails 3.1 puts inside apps.
- s.add_development_dependency('turn', '>= 0.9.6')
- s.add_development_dependency('sass-rails', '>= 3.2.6')
- s.add_development_dependency('coffee-rails', '>= 3.2.2')
- s.add_development_dependency('uglifier', '>= 1.3.0')
- s.add_development_dependency('jquery-rails', '>= 2.2.1')
-=======
s.add_runtime_dependency('cucumber', '>= 1.2.0')
s.add_runtime_dependency('nokogiri', '>= 1.5.0')
s.add_runtime_dependency('capybara', '>= 1.1.2')
@@ -48,7 +24,6 @@ Gem::Specification.new do |s|
s.add_development_dependency('factory_girl', '>= 3.2.0')
s.add_development_dependency('database_cleaner', '>= 0.7.2')
s.add_development_dependency('appraisal', '~> 0.5.1')
->>>>>>> 5b086662637c7c654f8c3a70aa07cfb3e7d7edf8
# For Documentation:
s.add_development_dependency('yard', '~> 0.8.5.2')

0 comments on commit 9829ac4

Please sign in to comment.