diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-04 13:56:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-04 13:56:42 +0000 |
| commit | 382060b9270e5054e5c5c8e722e02deb77ae602f (patch) | |
| tree | 3feaf783ff69d0d0cc173f9ec56eb4cc1452ba07 | |
| parent | 796d65f1feeb13c5bbdedee3f7290bd962c4c421 (diff) | |
| parent | ecd75216c68ad96353b967c841177256572021fa (diff) | |
| download | gitlab-ce-382060b9270e5054e5c5c8e722e02deb77ae602f.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/24187-set-git-terminal-prompt-env-var-in-initializer.yml | 4 | ||||
| -rw-r--r-- | config/application.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/24187-set-git-terminal-prompt-env-var-in-initializer.yml b/changelogs/unreleased/24187-set-git-terminal-prompt-env-var-in-initializer.yml new file mode 100644 index 00000000000..7fe5c8a84af --- /dev/null +++ b/changelogs/unreleased/24187-set-git-terminal-prompt-env-var-in-initializer.yml @@ -0,0 +1,4 @@ +--- +title: Set GIT_TERMINAL_PROMPT env variable in initializer +merge_request: 10372 +author: diff --git a/config/application.rb b/config/application.rb index f9f01b66473..f2ecc4ce77c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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 |