diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-08 21:03:14 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-08 21:03:14 +0300 |
| commit | aee110e20dd81861a62ea458b5629619c32a2d0a (patch) | |
| tree | f1185b516463a9baf0a2cca023a4d7396d29bdbf /config | |
| parent | 5bd5d09b83c21bca1d6cd534622f410f9b0da4de (diff) | |
| download | gitlab-ce-aee110e20dd81861a62ea458b5629619c32a2d0a.tar.gz | |
Add extra config for some advanced customization
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 15 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 5 |
2 files changed, 18 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 42886e54aed..19b58bcc371 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -73,8 +73,6 @@ production: &base # 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 # ========================== @@ -157,6 +155,19 @@ production: &base # Git timeout to read a commit, in seconds timeout: 10 + # + # 4. Extra customization + # ========================== + + extra: + ## Google analytics. Uncomment if you want it + # google_analytics_id: '_your_tracking_id' + + ## Text under sign-in page (Markdown enabled) + # sign_in_text: | + #  + # [Learn more about CompanyName](http://www.companydomain.com/) + development: <<: *base diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index be5393b0483..27605efddfe 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -106,3 +106,8 @@ Settings.git['timeout'] ||= 10 Settings['satellites'] ||= Settingslogic.new({}) Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "tmp/repo_satellites/", Rails.root) + +# +# Extra customization +# +Settings['extra'] ||= Settingslogic.new({}) |