File tree Expand file tree Collapse file tree 4 files changed +28
-26
lines changed
Expand file tree Collapse file tree 4 files changed +28
-26
lines changed Original file line number Diff line number Diff line change @@ -10,16 +10,7 @@ gem "cancan"
1010gem "jquery-slick-rails"
1111gem 'pg'
1212gem 'kaminari'
13-
14- group :development , :test do
15- gem 'rspec-rails'
16- gem 'pry-byebug'
17- end
18-
19- group :test do
20- gem 'selenium-webdriver'
21- gem 'capybara'
22- end
13+ gem 'mini_magick'
2314
2415gem 'sass-rails'
2516gem 'uglifier'
@@ -28,10 +19,20 @@ gem 'jquery-rails'
2819gem 'fancybox2-rails'
2920gem 'jbuilder'
3021gem 'factory_girl_rails'
31- gem 'aws-sdk'
22+ gem 'aws-sdk' , require : false
3223gem 'nokogiri' , '>= 1.10.4'
3324gem 'rubyzip' , '>= 1.2.2'
3425
26+ group :development , :test do
27+ gem 'rspec-rails'
28+ gem 'pry-byebug'
29+ end
30+
31+ group :test do
32+ gem 'selenium-webdriver'
33+ gem 'capybara'
34+ end
35+
3536group :doc do
3637 gem 'sdoc' , require : false
3738end
Original file line number Diff line number Diff line change 904904 mime-types-data (~> 3.2015 )
905905 mime-types-data (3.2019.0904 )
906906 mimemagic (0.3.3 )
907+ mini_magick (4.5.1 )
907908 mini_mime (1.0.2 )
908909 mini_portile2 (2.4.0 )
909910 minitest (5.11.3 )
@@ -1030,6 +1031,7 @@ DEPENDENCIES
10301031 jquery-rails
10311032 jquery-slick-rails
10321033 kaminari
1034+ mini_magick
10331035 nokogiri (>= 1.10.4 )
10341036 paperclip
10351037 pg
@@ -1048,4 +1050,4 @@ RUBY VERSION
10481050 ruby 2.5.3p105
10491051
10501052BUNDLED WITH
1051- 1.17.1
1053+ 1.17.3
Original file line number Diff line number Diff line change 3535 # Raises error for missing translations
3636 # config.action_view.raise_on_missing_translations = true
3737
38- # config/environments/production.rb
39- Paperclip . options [ :command_path ] = "/usr/local/bin/"
38+ config . active_storage . service = :local
39+
40+ # Paperclip.options[:command_path] = "/usr/local/bin/"
4041 # Paperclip.options[:command_path] = "C:/Program Files/ImageMagick-6.9.1-Q16"
4142end
Original file line number Diff line number Diff line change 8181 # Do not dump schema after migrations.
8282 # config.active_record.dump_schema_after_migration = false
8383
84- # config/environments/production.rb
85- config . paperclip_defaults = {
86- :storage => :s3 ,
87- :s3_protocol => :https ,
88- :s3_credentials => {
89- :bucket => ENV [ 'S3_BUCKET_NAME' ] ,
90- :access_key_id => ENV [ 'AWS_ACCESS_KEY_ID' ] ,
91- :secret_access_key => ENV [ 'AWS_SECRET_ACCESS_KEY' ]
92- } ,
93- :s3_region => ENV [ 'AWS_REGION' ]
94- }
95-
9684 config . active_storage . service = :amazon
85+ # config.paperclip_defaults = {
86+ # :storage => :s3,
87+ # :s3_protocol => :https,
88+ # :s3_credentials => {
89+ # :bucket => ENV['S3_BUCKET_NAME'],
90+ # :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
91+ # :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
92+ # },
93+ # :s3_region => ENV['AWS_REGION']
94+ # }
9795end
You can’t perform that action at this time.
0 commit comments