summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-02 09:11:55 +0000
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-02 09:11:55 +0000
commitef7001c9c641c1e77ae203650efc0d9aa71a2e3e (patch)
tree86a95ca38c95806f7d8177f59353776349235b52 /config
parentdc3d778fac4f9b0d4fbcb574f9ef3b0cd11ad640 (diff)
parent6068b863c66f785bea0a56881d60e8c23da08a0b (diff)
downloadgitlab-ce-ef7001c9c641c1e77ae203650efc0d9aa71a2e3e.tar.gz
Merge branch 'master' into 'balsalmiq-support'
# Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb
Diffstat (limited to 'config')
-rw-r--r--config/initializers/carrierwave.rb2
-rw-r--r--config/webpack.config.js5
2 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 1933afcbfb1..cd7df44351a 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -6,6 +6,8 @@ if File.exist?(aws_file)
AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env]
CarrierWave.configure do |config|
+ config.fog_provider = 'fog/aws'
+
config.fog_credentials = {
provider: 'AWS', # required
aws_access_key_id: AWS_CONFIG['access_key_id'], # required
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 8b5354809e7..2082b553cb1 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -83,6 +83,11 @@ var config = {
loader: 'raw-loader',
},
{
+ test: /\.gif$/,
+ loader: 'url-loader',
+ query: { mimetype: 'image/gif' },
+ },
+ {
test: /\.(worker\.js|pdf)$/,
exclude: /node_modules/,
loader: 'file-loader',