Merge pull request #5926 from jekyll/allow-releases-from-stable-branches

Merge pull request 5926

.travis.yml

@@ -28,6 +28,7 @@ branches:
   only:
     - master
     - themes
+    - /*-stable/
 
 notifications:
   slack:

rake/release.rake

@@ -6,7 +6,8 @@
 
 desc "Release #{name} v#{version}"
 task :release => :build do
-  unless `git branch` =~ %r!^\* master$!
+  current_branch = `git branch`.to_s.strip.match(%r!^\* (.+)$!)[1]
+  unless current_branch == "master" || current_branch.end_with?("-stable")
     puts "You must be on the master branch to release!"
     exit!
   end