diff options
| author | Uģis Ozols <ugis.ozolss@gmail.com> | 2014-01-20 11:25:47 +0200 |
|---|---|---|
| committer | Uģis Ozols <ugis.ozolss@gmail.com> | 2014-01-20 11:25:47 +0200 |
| commit | 249af183145b1608686528255af9c031485683b8 (patch) | |
| tree | ade3dcf168e5bf700154228044d588615e991975 /spec/factories/blog_posts.rb | |
| parent | a8b5bce609089af8795768230c7dd3a9b87cd5e0 (diff) | |
| parent | d891009d8b26cbccfc7fcdec645e1e2382c641bc (diff) | |
| download | refinerycms-blog-249af183145b1608686528255af9c031485683b8.tar.gz refinerycms-blog-249af183145b1608686528255af9c031485683b8.tar.bz2 refinerycms-blog-249af183145b1608686528255af9c031485683b8.zip | |
Merge branch 'master' into rails4
Conflicts:
app/helpers/refinery/blog/controller_helper.rb
app/models/refinery/blog/post.rb
Diffstat (limited to 'spec/factories/blog_posts.rb')
| -rw-r--r-- | spec/factories/blog_posts.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/factories/blog_posts.rb b/spec/factories/blog_posts.rb index ff4cf16..51c6b8a 100644 --- a/spec/factories/blog_posts.rb +++ b/spec/factories/blog_posts.rb @@ -3,7 +3,6 @@ FactoryGirl.define do sequence(:title) { |n| "Top #{n} Shopping Centers in Chicago" } body "These are the top ten shopping centers in Chicago. You're going to read a long blog post about them. Come to peace with it." draft false - tag_list "chicago, shopping, fun times" published_at Time.now author { FactoryGirl.create(:refinery_user) } |