aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Arndt <parndt@gmail.com>2012-01-28 20:03:11 -0800
committerPhilip Arndt <parndt@gmail.com>2012-01-28 20:03:11 -0800
commitf8cd5804ad8a26e59e2a2b18f624678934a3641b (patch)
treef2a88300b88a240315e37f7d4e16d4f96e8ecf08
parentd8bdcb482ce51205bfdde0b39a02f7eba49e23e9 (diff)
parentc89b4dfc1f9f3dea8d7b39cfdc85cae211c6f2c1 (diff)
downloadrefinerycms-blog-f8cd5804ad8a26e59e2a2b18f624678934a3641b.tar.gz
refinerycms-blog-f8cd5804ad8a26e59e2a2b18f624678934a3641b.tar.bz2
refinerycms-blog-f8cd5804ad8a26e59e2a2b18f624678934a3641b.zip
Merge pull request #187 from substantial/rails-3-2-compat
Rails 3 2 compat
-rw-r--r--Gemfile7
-rw-r--r--app/models/refinery/blog/post.rb4
2 files changed, 5 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index e55a3f3..e9e3b4d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,11 +53,10 @@ group :development, :test do
end
end
-# Gems used only for assets and not required
-# in production environments by default.
+# Refinery/rails should pull in the proper versions of these
group :assets do
- gem 'sass-rails', '~> 3.1.0'
- gem 'coffee-rails', '~> 3.1.0'
+ gem 'sass-rails'
+ gem 'coffee-rails'
gem 'uglifier'
end
diff --git a/app/models/refinery/blog/post.rb b/app/models/refinery/blog/post.rb
index 1eae99a..c119e44 100644
--- a/app/models/refinery/blog/post.rb
+++ b/app/models/refinery/blog/post.rb
@@ -52,7 +52,7 @@ module Refinery
live.includes(:categories).where(:categories => { Refinery::Categorization.table_name => { :blog_category_id => nil } })
}
- attr_accessible :title, :body, :custom_teaser, :tag_list, :draft, :published_at, :custom_url
+ attr_accessible :title, :body, :custom_teaser, :tag_list, :draft, :published_at, :custom_url, :author
attr_accessible :browser_title, :meta_keywords, :meta_description, :user_id, :category_ids
attr_accessible :source_url, :source_url_title
@@ -118,4 +118,4 @@ module Refinery
end
end
-end \ No newline at end of file
+end