Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00
parent bf017a8557 86783db3c3
commit 358028c3e6
94 changed files with 1062 additions and 673 deletions
--- a/spec/features/comments_spec.rb
+++ b/spec/features/comments_spec.rb
@@ -31,7 +31,7 @@ feature 'Comments' do
      expect(page).to have_content("1")
      expect(page).to have_content("2")
      expect(page).to_not have_content("3")
-      click_link "Next"
+      click_link "Next", exact: false
    end

    expect(page).to have_css('.comment', count: 2)