Merge pull request #4 from adheerajkumar/master

Updated Gemfile for Rails 3.1
beerlington · Aug 28, 2011 · 1dfb80b · 1dfb80b
2 parents dfd3725 + 47fe724
commit 1dfb80b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,6 @@ pkg
 
 ## PROJECT::SPECIFIC
 .bundle/*
+
+## REDCAR
+.redcar
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '~> 3.0.0'
+gem 'rails', '>= 3.0.0'
 
 group :development do
   gem "jeweler", "~> 1.6.2"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -95,6 +95,6 @@ PLATFORMS
 DEPENDENCIES
   formtastic (~> 1.2.4)
   jeweler (~> 1.6.2)
-  rails (~> 3.0.0)
+  rails (>= 3.0.0)
   rspec-rails (~> 2.6.1)
   sqlite3-ruby
diff --git a/classy_enum.gemspec b/classy_enum.gemspec
@@ -53,20 +53,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.1"])
       s.add_development_dependency(%q<formtastic>, ["~> 1.2.4"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.6.1"])
       s.add_dependency(%q<formtastic>, ["~> 1.2.4"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0.0"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.6.1"])
     s.add_dependency(%q<formtastic>, ["~> 1.2.4"])