Merge pull request #2987 from Undev/support_env_in_settings

Environments support added to Gitlab config

config/gitlab.yml.example

@@ -7,12 +7,13 @@
 # 2. Replace gitlab -> host with your domain
 # 3. Replace gitlab -> email_from
 
-#
-# 1. GitLab app settings
-# ==========================
+production: &base
+  #
+  # 1. GitLab app settings
+  # ==========================
 
-## GitLab settings
-gitlab:
+  ## GitLab settings
+  gitlab:
     ## Web server settings
     host: localhost
     port: 80
@@ -35,20 +36,20 @@ gitlab:
     default_projects_limit: 10
     # signup_enabled: true          # default: false - Account passwords are not sent via the email if signup is enabled.
 
-## Gravatar
-gravatar:
+  ## Gravatar
+  gravatar:
     enabled: true                 # Use user avatar images from Gravatar.com (default: true)
     # plain_url: "http://..."     # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
     # ssl_url:   "https://..."    # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
 
 
 
-#
-# 2. Auth settings
-# ==========================
+  #
+  # 2. Auth settings
+  # ==========================
 
-## LDAP settings
-ldap:
+  ## LDAP settings
+  ldap:
     enabled: false
     host: '_your_ldap_server'
     base: '_the_base_where_you_search_for_users'
@@ -58,8 +59,8 @@ ldap:
     bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
     password: '_the_password_of_the_bind_user'
 
-## Omniauth settings
-omniauth:
+  ## Omniauth settings
+  omniauth:
     # Enable ability for users
     # Allow logging in via Twitter, Google, etc. using Omniauth providers
     enabled: false
@@ -88,22 +89,22 @@ omniauth:
 
 
 
-#
-# 3. Advanced settings
-# ==========================
+  #
+  # 3. Advanced settings
+  # ==========================
 
-# GitLab Satellites
-satellites:
+  # GitLab Satellites
+  satellites:
     # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
     path: /home/git/gitlab-satellites/
 
-## Backup settings
-backup:
+  ## Backup settings
+  backup:
     path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
     # keep_time: 604800   # default: 0 (forever) (in seconds)
 
-## GitLab Shell settings
-gitlab_shell:
+  ## GitLab Shell settings
+  gitlab_shell:
     # REPOS_PATH MUST NOT BE A SYMLINK!!!
     repos_path: /home/git/repositories/
     hooks_path: /home/git/gitlab-shell/hooks/
@@ -115,13 +116,22 @@ gitlab_shell:
     # If you use non-standart ssh port you need to specify it
     # ssh_port: 22
 
-## Git settings
-# CAUTION!
-# Use the default values unless you really know what you are doing
-git:
+  ## Git settings
+  # CAUTION!
+  # Use the default values unless you really know what you are doing
+  git:
     bin_path: /usr/bin/git
     # Max size of git object like commit, in bytes
     # This value can be increased if you have a very large commits
     max_size: 5242880 # 5.megabytes
     # Git timeout to read commit, in seconds
     timeout: 10
+
+development:
+  <<: *base
+
+test:
+  <<: *base
+
+staging:
+  <<: *base

config/initializers/1_settings.rb

 class Settings < Settingslogic
   source "#{Rails.root}/config/gitlab.yml"
+  namespace Rails.env
 
   class << self
     def gitlab_on_non_standard_port?