From 9f3985c6133507ac721abbb4c19049656008ec68 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 11 Apr 2017 22:44:22 -0400 Subject: Move PDFLab into GitLab --- config/webpack.config.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index cb0a57a3a41..0ec9e48845e 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -77,6 +77,11 @@ var config = { test: /\.svg$/, loader: 'raw-loader', }, + { + test: /\.gif$/, + loader: 'url-loader', + query: { mimetype: 'image/gif' }, + }, { test: /\.(worker\.js|pdf)$/, exclude: /node_modules/, -- cgit v1.2.3 From d261f83626b9abde93f91d9850ae3e989348e12d Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Mon, 1 May 2017 20:15:16 +0000 Subject: Update Carrierwave and fog-core --- config/initializers/carrierwave.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') 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 -- cgit v1.2.3