From d50cb230e46a76427b5df8f5a8cc35205d9a21fc Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 16 Oct 2012 16:45:00 +1300 Subject: [PATCH 1/2] BUG Fixed issue with MigrateSiteTreeLinkingTask test data being incorrectly loaded into database Fixed issue --- tests/tasks/MigrateSiteTreeLinkingTaskTest.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/tasks/MigrateSiteTreeLinkingTaskTest.yml b/tests/tasks/MigrateSiteTreeLinkingTaskTest.yml index 34faf015..084ae190 100644 --- a/tests/tasks/MigrateSiteTreeLinkingTaskTest.yml +++ b/tests/tasks/MigrateSiteTreeLinkingTaskTest.yml @@ -6,16 +6,16 @@ SiteTree: about: Title: About Us URLSegment: about - Content: HomeStaff + Content: 'HomeStaff' staff: Title: Staff URLSegment: staff - Content: HomeAbout + Content: 'HomeAbout' Parent: =>SiteTree.about action: Title: Action Link URLSegment: action - Content: Search Form + Content: 'Search Form' hash_link: Title: Hash Link URLSegment: hash-link @@ -23,7 +23,7 @@ SiteTree: admin_link: Title: Admin Link URLSegment: admin-link - Content: Admin + Content: 'Admin' no_links: Title: No Links URLSegment: No Links From d298ec9bc1cf029f21adc193bfd01d676dc8a213 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 16 Oct 2012 10:23:35 +0200 Subject: [PATCH 2/2] Blacklisting further travis branches --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index edfd3405..01c0b2c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,12 @@ script: branches: except: - - translation-staging + - 2.1 + - 2.2 + - 2.3 - 2.4 + - post-2.4 + - translation-staging notifications: irc: