Merge pull request #724 from ZmagoD/zd_SCI_1410

Fix Repeat Tutorial Action / Tutorial
This commit is contained in:
Zmago Devetak 2017-06-29 13:56:26 +02:00 committed by GitHub
commit 29413f2e55
8 changed files with 5 additions and 5 deletions

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -285,7 +285,7 @@ class MyModule < ApplicationRecord
if !final.include?(my_module) if !final.include?(my_module)
final << my_module final << my_module
end end
modules.push(*my_module.my_modules.flatten) modules.push(*my_module.my_modules)
end end
final final
end end

View file

@ -36,10 +36,10 @@ if ENV['PAPERCLIP_STORAGE'] == "s3"
medium: :private medium: :private
}, },
s3_storage_class: { s3_storage_class: {
medium: :reduced_redundancy, medium: :REDUCED_REDUNDANCY,
thumb: :reduced_redundancy, thumb: :REDUCED_REDUNDANCY,
icon: :reduced_redundancy, icon: :REDUCED_REDUNDANCY,
icon_small: :reduced_redundancy icon_small: :REDUCED_REDUNDANCY
} }
}) })
elsif ENV['PAPERCLIP_STORAGE'] == "filesystem" elsif ENV['PAPERCLIP_STORAGE'] == "filesystem"