Merge branch 'note_about_omnibus_changes' into 'master'

config/aws.yml.example

 # See https://github.com/jnicklas/carrierwave#using-amazon-s3
 # for more options
+# 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
+#
 production:
   access_key_id: AKIA1111111111111UA
   secret_access_key: secret

config/gitlab.yml.example

@@ -4,9 +4,13 @@
 #
 ###########################  NOTE  #####################################
 # This file should not receive new settings. All configuration options #
-# are being moved to ApplicationSetting model!                         #
+# that do not require application restart are being moved to           #
+# ApplicationSetting model!                                            #
+# If you change this file in a Merge Request, please also create       #
+# a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests  #
 ########################################################################
 #
+#
 # How to use:
 # 1. Copy file as gitlab.yml
 # 2. Update gitlab -> host with your fully qualified domain name
@@ -149,7 +153,7 @@ production: &base
         allow_username_or_email_login: false
 
         # To maintain tight control over the number of active users on your GitLab installation,
-        # enable this setting to keep new users blocked until they have been cleared by the admin 
+        # enable this setting to keep new users blocked until they have been cleared by the admin
         # (default: false).
         block_auto_created_users: false
 

config/initializers/rack_attack.rb.example

 # 1. Rename this file to rack_attack.rb
 # 2. Review the paths_to_be_protected and add any other path you need protecting
 #
+# 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
 
 paths_to_be_protected = [
   "#{Rails.application.config.relative_url_root}/users/password",

config/initializers/smtp_settings.rb.sample

@@ -5,6 +5,7 @@
 #
 # For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
 #
+# 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?
   Gitlab::Application.config.action_mailer.delivery_method = :smtp

config/resque.yml.example

+# 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: unix:/var/run/redis/redis.sock

config/unicorn.rb.example

@@ -8,6 +8,9 @@
 # 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
+#
 # WARNING: See config/application.rb under "Relative url support" for the list of
 # other files that need to be changed for relative url support
 #

lib/support/nginx/gitlab

 ## GitLab
-## Contributors: randx, yin8086, sashkab, orkoden, axilleas, bbodenmiller, DouweM
 ##
 ## Lines starting with two hashes (##) are comments with information.
 ## Lines starting with one hash (#) are configuration parameters that can be uncommented.
 ##
 ##################################
+##        CONTRIBUTING          ##
+##################################
+##
+## 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
+##
+##################################
 ##        CHUNKED TRANSFER      ##
 ##################################
 ##

lib/support/nginx/gitlab-ssl

 ## GitLab
-## Contributors: randx, yin8086, sashkab, orkoden, axilleas, bbodenmiller, DouweM
 ##
 ## Modified from nginx http version
 ## Modified from http://blog.phusion.nl/2012/04/21/tutorial-setting-up-gitlab-on-debian-6/
@@ -9,6 +8,13 @@
 ## Lines starting with one hash (#) are configuration parameters that can be uncommented.
 ##
 ##################################
+##        CONTRIBUTING          ##
+##################################
+##
+## 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
+##
+##################################
 ##        CHUNKED TRANSFER      ##
 ##################################
 ##