Mercurial > hg > soundsoftware-site
diff test/fixtures/journals.yml @ 1337:077b8890835a cannam
Merge from live branch
author | Chris Cannam |
---|---|
date | Thu, 20 Jun 2013 13:14:02 +0100 |
parents | 433d4f72a19b |
children |
line wrap: on
line diff
--- a/test/fixtures/journals.yml Fri Jun 14 11:30:07 2013 +0100 +++ b/test/fixtures/journals.yml Thu Jun 20 13:14:02 2013 +0100 @@ -1,5 +1,5 @@ --- -journals_001: +journals_001: created_on: <%= 2.days.ago.to_date.to_s(:db) %> notes: "Journal notes" id: 1 @@ -13,21 +13,21 @@ journalized_type: Issue user_id: 2 journalized_id: 1 -journals_003: +journals_003: created_on: <%= 1.days.ago.to_date.to_s(:db) %> - notes: "A comment with inline image: !picture.jpg!" + notes: "A comment with inline image: !picture.jpg! and a reference to #1 and r2." id: 3 journalized_type: Issue user_id: 2 journalized_id: 2 -journals_004: +journals_004: created_on: <%= 1.days.ago.to_date.to_s(:db) %> notes: "A comment with a private version." id: 4 journalized_type: Issue user_id: 1 journalized_id: 6 -journals_005: +journals_005: id: 5 created_on: <%= 1.days.ago.to_date.to_s(:db) %> notes: "A comment on a private issue."