Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into 'master'

Adds git terminal prompt env var to application rb

Closes #24187

See merge request !10372
This commit is contained in:
Douwe Maan 2017-04-04 13:56:42 +00:00
commit 382060b927
2 changed files with 5 additions and 0 deletions

View file

@ -0,0 +1,4 @@
---
title: Set GIT_TERMINAL_PROMPT env variable in initializer
merge_request: 10372
author:

View file

@ -150,6 +150,7 @@ module Gitlab
# This is needed for gitlab-shell
ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
ENV['GIT_TERMINAL_PROMPT'] = '0'
config.generators do |g|
g.factory_girl false