Permalink
Browse files

Merge branch '2-0-stable'

Conflicts:
	Gemfile
	refinerycms-news.gemspec
  • Loading branch information...
2 parents 396ddef + d49180f commit 5e1193966a2120dffeb6a2b9d7a597355610ca72 @parndt parndt committed Apr 1, 2012
Showing with 8 additions and 3 deletions.
  1. +4 −1 app/models/refinery/news/item.rb
  2. +4 −2 refinerycms-news.gemspec
@@ -6,7 +6,10 @@ class Item < Refinery::Core::BaseModel
translates :title, :body
attr_accessor :locale # to hold temporarily
- attr_accessible :title, :body, :source, :publish_date, :expiration_date
+ attr_accessible :title, :body, :content, :source, :publish_date, :expiration_date
+ class Translation
+ attr_accessible :locale
+ end
alias_attribute :content, :body
validates :title, :content, :publish_date, :presence => true
View
@@ -1,3 +1,5 @@
+# Encoding: UTF-8
+
Gem::Specification.new do |s|
s.name = %q{refinerycms-news}
s.version = %q{2.1.0.dev}
@@ -6,13 +8,13 @@ Gem::Specification.new do |s|
s.summary = %q{Ruby on Rails news engine for Refinery CMS.}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
- s.authors = %w(Resolve\ Digital)
+ s.authors = ["Philip Arndt", "Uģis Ozols"]
s.require_paths = %w(lib)
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- spec/*`.split("\n")
s.add_dependency 'refinerycms-core', '~> 2.1.0.dev'
s.add_dependency 'refinerycms-settings', '~> 2.1.0.dev'
- s.add_dependency 'friendly_id', '~> 4.0.1'
+ s.add_dependency 'friendly_id', '~> 4.0.4'
end

0 comments on commit 5e11939

Please sign in to comment.