Merge branch 'master' into 0-1-stable

jipiboily · May 27, 2012 · fea5f41 · fea5f41
2 parents 57779f6 + 54bc045
commit fea5f41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@
 - the "comment" link in admin now works as expected and shows all comments from your Disqus account;
 - changed URL pattern (fix for https://github.com/jipiboily/monologue/issues/64 by https://github.com/jipiboily/monologue/issues/59);
 - you can now use your main_app layout with Monologue (https://github.com/jipiboily/monologue/issues/54) (use config: Monologue.layout. See wiki for more information);
+- added Open Graph tags
+- posts published to a later date are not displayed
+- multiple bug fixes
 
 
 ## 0.1.0: initial release (May 5, 2012)

diff --git a/spec/models/monologue/posts_revision_spec.rb b/spec/models/monologue/posts_revision_spec.rb
@@ -40,8 +40,8 @@
   end
 
   it "should generate unique URL" do
-    Factory(:posts_revision, :url => nil, :title => "unique title")
-    pr = Factory(:posts_revision, :url => nil, :title => "unique title")
+    Factory(:posts_revision, :url => nil, :title => "unique title", :published_at => DateTime.new(2011))
+    pr = Factory(:posts_revision, :url => nil, :title => "unique title", :published_at => DateTime.new(2011))
     pr.url.should == "2011/unique-title-1"
   end