Merge branch 'master' of https://github.com/gitlabhq/gitlabhq

config/initializers/1_settings.rb

 class Settings < Settingslogic
-  source "#{Rails.root}/config/gitlab.yml"
+  source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" }
   namespace Rails.env
 
   class << self

config/initializers/secret_token.rb

@@ -9,7 +9,9 @@ require 'securerandom'
 
 def find_secure_token
   token_file = Rails.root.join('.secret')
-  if File.exist? token_file
+  if ENV.key?('SECRET_KEY_BASE')
+    ENV['SECRET_KEY_BASE']
+  elsif File.exist? token_file
     # Use the existing token.
     File.read(token_file).chomp
   else