summaryrefslogtreecommitdiff
path: root/config/aws.yml.example
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-06-11 15:11:37 +0200
committerMarin Jankovski <maxlazio@gmail.com>2015-06-11 15:11:37 +0200
commitdf346e9507a057ccb72d4edad53674ac014333a0 (patch)
tree94fcf01971e599c32b04dcfa254a96c4d3d270d3 /config/aws.yml.example
parent3de35168fd556a9ba980c9ffdb6705990a53a37a (diff)
downloadgitlab-ce-df346e9507a057ccb72d4edad53674ac014333a0.tar.gz
Add a note that changing example configuration files requires changing omnibus-gitlab.note_about_omnibus_changes
Diffstat (limited to 'config/aws.yml.example')
-rw-r--r--config/aws.yml.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/aws.yml.example b/config/aws.yml.example
index 29d029b078d..bb10c3cec7b 100644
--- a/config/aws.yml.example
+++ b/config/aws.yml.example
@@ -1,5 +1,8 @@
# 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