From fd13921720e714ccf69b5a4f9e9c76305c003d2a Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 29 Jun 2017 11:00:50 +0200 Subject: [PATCH 1/2] fixes repeat tutorial [fixes SCI-1410] --- app/models/my_module.rb | 2 +- config/initializers/paperclip.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 274702c66..23527d5c4 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -285,7 +285,7 @@ class MyModule < ApplicationRecord if !final.include?(my_module) final << my_module end - modules.push(*my_module.my_modules.flatten) + modules.push(*my_module.my_modules) end final end diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 7fdc8322f..5bbb96a3c 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -36,10 +36,10 @@ if ENV['PAPERCLIP_STORAGE'] == "s3" medium: :private }, s3_storage_class: { - medium: :reduced_redundancy, - thumb: :reduced_redundancy, - icon: :reduced_redundancy, - icon_small: :reduced_redundancy + medium: :REDUCED_REDUNDANCY, + thumb: :REDUCED_REDUNDANCY, + icon: :REDUCED_REDUNDANCY, + icon_small: :REDUCED_REDUNDANCY } }) elsif ENV['PAPERCLIP_STORAGE'] == "filesystem" From 68cfac4a38a777511752be17e2b98b037180456b Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 29 Jun 2017 11:04:31 +0200 Subject: [PATCH 2/2] adds images into assets folder --- .../assets}/images/office/Excel-color_16x16x32.png | Bin .../assets}/images/office/Excel-xlsx_20x20x32.png | Bin .../images/office/PowerPoint-Color_16x16x32.png | Bin .../images/office/PowerPoint-pptx_20x20x32.png | Bin .../assets}/images/office/Word-color_16x16x32.png | Bin .../assets}/images/office/Word-docx_20x20x32.png | Bin 6 files changed, 0 insertions(+), 0 deletions(-) rename {public => app/assets}/images/office/Excel-color_16x16x32.png (100%) rename {public => app/assets}/images/office/Excel-xlsx_20x20x32.png (100%) rename {public => app/assets}/images/office/PowerPoint-Color_16x16x32.png (100%) rename {public => app/assets}/images/office/PowerPoint-pptx_20x20x32.png (100%) rename {public => app/assets}/images/office/Word-color_16x16x32.png (100%) rename {public => app/assets}/images/office/Word-docx_20x20x32.png (100%) diff --git a/public/images/office/Excel-color_16x16x32.png b/app/assets/images/office/Excel-color_16x16x32.png similarity index 100% rename from public/images/office/Excel-color_16x16x32.png rename to app/assets/images/office/Excel-color_16x16x32.png diff --git a/public/images/office/Excel-xlsx_20x20x32.png b/app/assets/images/office/Excel-xlsx_20x20x32.png similarity index 100% rename from public/images/office/Excel-xlsx_20x20x32.png rename to app/assets/images/office/Excel-xlsx_20x20x32.png diff --git a/public/images/office/PowerPoint-Color_16x16x32.png b/app/assets/images/office/PowerPoint-Color_16x16x32.png similarity index 100% rename from public/images/office/PowerPoint-Color_16x16x32.png rename to app/assets/images/office/PowerPoint-Color_16x16x32.png diff --git a/public/images/office/PowerPoint-pptx_20x20x32.png b/app/assets/images/office/PowerPoint-pptx_20x20x32.png similarity index 100% rename from public/images/office/PowerPoint-pptx_20x20x32.png rename to app/assets/images/office/PowerPoint-pptx_20x20x32.png diff --git a/public/images/office/Word-color_16x16x32.png b/app/assets/images/office/Word-color_16x16x32.png similarity index 100% rename from public/images/office/Word-color_16x16x32.png rename to app/assets/images/office/Word-color_16x16x32.png diff --git a/public/images/office/Word-docx_20x20x32.png b/app/assets/images/office/Word-docx_20x20x32.png similarity index 100% rename from public/images/office/Word-docx_20x20x32.png rename to app/assets/images/office/Word-docx_20x20x32.png