From a054e4ae80bfca0fa812a5bf482c79672c62e0d4 Mon Sep 17 00:00:00 2001
From: Frank Taillandier <frank.taillandier@gmail.com>
Date: Sun, 18 Feb 2018 16:47:31 +0100
Subject: [PATCH 1/3] Backport #6784 to 3.7.x : Fix theme gem feature

---
 features/step_definitions.rb | 2 --
 features/theme_gem.feature   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/features/step_definitions.rb b/features/step_definitions.rb
index 4bd023dfc..369240cca 100644
--- a/features/step_definitions.rb
+++ b/features/step_definitions.rb
@@ -216,8 +216,6 @@ end
 
 When(%r!^I decide to build the theme gem$!) do
   Dir.chdir(Paths.theme_gem_dir)
-  gemspec = "my-cool-theme.gemspec"
-  File.write(gemspec, File.read(gemspec).sub("TODO: ", ""))
   File.new("_includes/blank.html", "w")
   File.new("_sass/blank.scss", "w")
   File.new("assets/blank.scss", "w")
diff --git a/features/theme_gem.feature b/features/theme_gem.feature
index c46d37e04..621acfa39 100644
--- a/features/theme_gem.feature
+++ b/features/theme_gem.feature
@@ -17,7 +17,7 @@ Feature: Building Theme Gems
     Then the "assets/blank.scss" file should exist
     When I run git add .
     Then I should get an updated git index
-    When I run gem build my-cool-theme.gemspec
+    When I run gem build --force my-cool-theme.gemspec
     Then the "./my-cool-theme-0.1.0.gem" file should exist
     When I run gem unpack my-cool-theme-0.1.0.gem
     Then the my-cool-theme-0.1.0 directory should exist

From 9c66c3cbcc2a281c4739c2cfbd149c59c772de08 Mon Sep 17 00:00:00 2001
From: olivia hugger <olivia@fastmail.com>
Date: Sun, 4 Nov 2018 20:41:10 +0100
Subject: [PATCH 2/3] Backport 564f773 to 3.7-stable

test for stable and backport branches on travis
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 69fe26331..8c39b21fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,8 @@ branches:
   only:
     - master
     - themes
-    - /*-stable/
+    - /^.*-stable/
+    - /.*backport.*/
 
 notifications:
   slack:

From 888fb4c8d2e4614686d0f0f509de440e32becf90 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Fri, 14 Dec 2018 23:58:58 +0530
Subject: [PATCH 3/3] Backport e41c427 to 3.7-stable

CI: Build stable branches during backport
---
 .travis.yml  | 3 +--
 appveyor.yml | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8c39b21fe..c898c4702 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,7 @@ branches:
   only:
     - master
     - themes
-    - /^.*-stable/
-    - /.*backport.*/
+    - /.*-stable/
 
 notifications:
   slack:
diff --git a/appveyor.yml b/appveyor.yml
index 66c44d9f1..baa5e0064 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,7 @@ branches:
   only:
     - master
     - themes
+    - /.*-stable/
 
 build: off