From 23288f62da73fb0e30d8e7ce306665e8fda1b932 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 29 Jan 2020 15:08:59 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 Guardfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Guardfile')

diff --git a/Guardfile b/Guardfile
index 8a43f414ca9..21ee2a9d610 100644
--- a/Guardfile
+++ b/Guardfile
@@ -2,7 +2,7 @@
 
 # More info at https://github.com/guard/guard#readme
 
-cmd = ENV['SPRING'] ? 'spring rspec' : 'bundle exec rspec'
+cmd = ENV['GUARD_CMD'] || (ENV['SPRING'] ? 'spring rspec' : 'bundle exec rspec')
 
 guard :rspec, cmd: cmd do
   require "guard/rspec/dsl"
-- 
cgit v1.2.1