Merge pull request #8340 from cirosantilli/multi-ruby-install-v2

Web edit and HTTPS push work if multiple Rubies installed v2

3 files changed, 4 insertions, 20 deletions

diff --git a/config/application.rb b/config/application.rb
index 44a5d68d126..8300cf57a61 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -92,5 +92,7 @@ module Gitlab
 
     redis_config_hash[:namespace] = 'cache:gitlab'
     config.cache_store = :redis_store, redis_config_hash
+
+    ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
   end
 end
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index bb0ffae0b70..14b5e134ce2 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -307,7 +307,7 @@ test:
     enabled: true
   gitlab:
     host: localhost
-    port: 80
+    port: 3001
 
     # When you run tests we clone and setup gitlab-shell
     # In order to setup it correctly you need to specify
diff --git a/config/initializers/gitlab_shell_secret_token.rb b/config/initializers/gitlab_shell_secret_token.rb
index 8d2b771e535..250b86caaf0 100644
--- a/config/initializers/gitlab_shell_secret_token.rb
+++ b/config/initializers/gitlab_shell_secret_token.rb
@@ -1,19 +1 @@
-# Be sure to restart your server when you modify this file.
-
-require 'securerandom'
-
-# Your secret key for verifying the gitlab_shell.
-
-
-secret_file = Rails.root.join('.gitlab_shell_secret')
-gitlab_shell_symlink = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret')
-
-unless File.exist? secret_file
-  # Generate a new token of 16 random hexadecimal characters and store it in secret_file.
-  token = SecureRandom.hex(16)
-  File.write(secret_file, token)
-end
-
-if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink)
-  FileUtils.symlink(secret_file, gitlab_shell_symlink)
-end
\ No newline at end of file
+Gitlab::Shell.setup_secret_token