bump to 2.6.1.beta1

jredville · May 22, 2011 · 99687c0 · 99687c0
1 parent eb3f3be
commit 99687c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/features/Changelog.md b/features/Changelog.md
@@ -1,6 +1,6 @@
-### 2.6.1 / 2011-05-21
+### 2.6.1.beta1 / 2011-05-22
 
-[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0...v2.6.1)
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.6.0...v2.6.1.beta1)
 
 This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 

diff --git a/lib/rspec/rails/version.rb b/lib/rspec/rails/version.rb
@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0'
+      STRING = '2.6.1.beta1'
     end
   end
 end
diff --git a/rspec-rails.gemspec b/rspec-rails.gemspec
@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
   s.add_runtime_dependency(%q<actionpack>, ["~> 3.0"])
   s.add_runtime_dependency(%q<railties>, ["~> 3.0"])
-  if RSpec::Rails::Version::STRING =~ /[a-zA-Z]+/
-    s.add_runtime_dependency "rspec", "= #{RSpec::Rails::Version::STRING}"
-  else
+  # if RSpec::Rails::Version::STRING =~ /[a-zA-Z]+/
+    # s.add_runtime_dependency "rspec", "= #{RSpec::Rails::Version::STRING}"
+  # else
     s.add_runtime_dependency "rspec", "~> #{RSpec::Rails::Version::STRING.split('.')[0..1].concat(['0']).join('.')}"
-  end
+  # end
 end