aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Arndt <parndt@gmail.com>2011-08-18 15:03:23 -0700
committerPhilip Arndt <parndt@gmail.com>2011-08-18 15:03:23 -0700
commit6b73469c1a0864551f4b9e6bb8b40c84abf201f5 (patch)
treebc652539c9e29c12566fcf2fd130eb8b21198d55
parentd8f82439eb6596bc9854a91f1ccfa49d3c3221f0 (diff)
parentd0681c273c6c3dadbf9052a5e88f209c0b3e4c47 (diff)
downloadrefinerycms-blog-6b73469c1a0864551f4b9e6bb8b40c84abf201f5.tar.gz
refinerycms-blog-6b73469c1a0864551f4b9e6bb8b40c84abf201f5.tar.bz2
refinerycms-blog-6b73469c1a0864551f4b9e6bb8b40c84abf201f5.zip
Merge pull request #117 from enmasse-entertainment/rails-3-1-rc6-support
Rails 3 1 rc6 support
-rw-r--r--Gemfile4
-rw-r--r--lib/gemspec.rb2
-rw-r--r--refinerycms-blog.gemspec5
3 files changed, 5 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 7605ced..4301b0a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,8 @@ source "http://rubygems.org"
gemspec
## Uncomment the following lines to develop against edge refinery
-gem 'refinerycms', :git => 'git://github.com/resolve/refinerycms.git'
-gem 'seo_meta', :git => 'git://github.com/parndt/seo_meta.git'
+# gem 'refinerycms', :git => 'git://github.com/resolve/refinerycms.git'
+# gem 'seo_meta', :git => 'git://github.com/parndt/seo_meta.git'
gem 'jquery-rails'
diff --git a/lib/gemspec.rb b/lib/gemspec.rb
index 02fd018..df188fe 100644
--- a/lib/gemspec.rb
+++ b/lib/gemspec.rb
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_dependency 'refinerycms-core', '~> 2.0.0'
s.add_dependency 'filters_spam', '~> 0.2'
s.add_dependency 'acts-as-taggable-on'
- s.add_dependency 'seo_meta', '~> 1.1.0'
+ s.add_dependency 'seo_meta', '~> 1.2.0.rc1'
# Development dependencies
s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec
index 9b1311a..8e8de4a 100644
--- a/refinerycms-blog.gemspec
+++ b/refinerycms-blog.gemspec
@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
s.name = %q{refinerycms-blog}
s.version = %q{2.0.0}
s.description = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.}
- s.date = %q{2011-08-14}
+ s.date = %q{2011-08-18}
s.summary = %q{Ruby on Rails blogging engine for RefineryCMS.}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com/blog}
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.add_dependency 'refinerycms-core', '~> 2.0.0'
s.add_dependency 'filters_spam', '~> 0.2'
s.add_dependency 'acts-as-taggable-on'
- s.add_dependency 'seo_meta', '~> 1.1.0'
+ s.add_dependency 'seo_meta', '~> 1.2.0.rc1'
# Development dependencies
s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
@@ -204,7 +204,6 @@ Gem::Specification.new do |s|
script
script/rails
spec
- spec/factories
spec/models
spec/models/refinery
spec/models/refinery/blog_category_spec.rb