diff options
| -rw-r--r-- | config/application.yml.example | 17 | ||||
| -rw-r--r-- | config/initializers/smtp_settings.rb.sample | 2 | ||||
| -rw-r--r-- | config/resque.yml.example | 6 | ||||
| -rw-r--r-- | config/unicorn.rb.example | 4 |
4 files changed, 21 insertions, 8 deletions
diff --git a/config/application.yml.example b/config/application.yml.example index 760cab4..8d345b3 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -1,10 +1,13 @@ +# If you change this file in a Merge Request, please also create +# a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests + defaults: &defaults gitlab_server: url: 'https://gitlab.example.com/' # Replace with your gitlab server url app_id: '' app_secret: '' - ## Gitlab CI settings + ## Gitlab CI settings gitlab_ci: ## Web server settings host: localhost @@ -14,18 +17,18 @@ defaults: &defaults ## Email settings # Email address used in the "From" field in mails sent by GitLab-CI email_from: gitlab-ci@localhost - + # Email address of your support contact (default: same as email_from) support_email: support@localhost - - # Default project notifications settings: + + # Default project notifications settings: # # Send emails only on broken builds (default: true) # all_broken_builds: true - # + # # Add pusher to recipients list (default: false) # add_pusher: true - + gravatar: enabled: true plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm" @@ -55,7 +58,7 @@ development: test: <<: *defaults gitlab_server: - url: 'http://demo.gitlab.com/' + url: 'http://demo.gitlab.com/' app_id: 'id' app_secret: 'secret' gitlab_ci: diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample index cf71b0f..41b6fc3 100644 --- a/config/initializers/smtp_settings.rb.sample +++ b/config/initializers/smtp_settings.rb.sample @@ -3,6 +3,8 @@ # 2. Edit settings inside this file # 3. Restart GitLab CI instance # +# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests + if Rails.env.production? ActionMailer::Base.delivery_method = :smtp diff --git a/config/resque.yml.example b/config/resque.yml.example index 7c216c0..ba496bd 100644 --- a/config/resque.yml.example +++ b/config/resque.yml.example @@ -1,3 +1,7 @@ +# If you change this file in a Merge Request, please also create +# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests +# + development: redis://localhost:6379 test: redis://localhost:6379 -production: redis://redis.example.com:6379
\ No newline at end of file +production: redis://redis.example.com:6379 diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 20f92c9..fc29870 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -8,6 +8,10 @@ # See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete # documentation. +# Note: If you change this file in a Merge Request, please also create a +# Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests +# + # Use at least one worker per core if you're on a dedicated server, # more will usually help for _short_ waits on databases/caches. worker_processes 2 |