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

Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into 'master'
382060b9 · Douwe Maan · 796d65f1 · ecd75216 · 382060b9 · 382060b9
Commit 382060b9 authored Apr 04, 2017 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

24187-set-git-terminal-prompt-env-var-in-initializer.yml .../24187-set-git-terminal-prompt-env-var-in-initializer.yml +4 -0

application.rb config/application.rb +1 -0

No files found.
--- 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
+---
+title: Set GIT_TERMINAL_PROMPT env variable in initializer
+merge_request: 10372
+author:
--- 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