gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #23 from snap-cloud/master

Browse source 
Pull in changes from golden repo
This commit is contained in:
CactusPuppy 2021-03-06 20:43:06 -08:00 • committed by GitHub
commit e4fea7188b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -273,6 +273,7 @@ group :development, :test, :linters do
# as debugger # as debugger
gem 'byebug' gem 'byebug'
gem 'pry' gem 'pry'
gem 'pry-byebug'
# Linters and static analysis. # Linters and static analysis.
gem 'pronto', require: false gem 'pronto', require: false

28
Gemfile.lock
View file

@ -164,10 +164,10 @@ GEM
docile (1.3.5) docile (1.3.5)
domain_name (0.5.20180417) domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.5) dotenv (2.7.6)
dotenv-rails (2.7.5) dotenv-rails (2.7.6)
dotenv (= 2.7.5) dotenv (= 2.7.6)
railties (>= 3.2, < 6.1) railties (>= 3.2)
erubi (1.10.0) erubi (1.10.0)
erubis (2.7.0) erubis (2.7.0)
execjs (2.7.0) execjs (2.7.0)
@ -191,8 +191,8 @@ GEM
path_expander (~> 1.0) path_expander (~> 1.0)
ruby_parser (~> 3.0) ruby_parser (~> 3.0)
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
font-awesome-rails (4.7.0.5) font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 6.1) railties (>= 3.2, < 7)
formatador (0.2.5) formatador (0.2.5)
formtastic (3.1.5) formtastic (3.1.5)
actionpack (>= 3.2.13) actionpack (>= 3.2.13)
@ -325,7 +325,7 @@ GEM
multipart-post (2.1.1) multipart-post (2.1.1)
nenv (0.3.0) nenv (0.3.0)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.5) nio4r (2.5.7)
nokogiri (1.11.1) nokogiri (1.11.1)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
@ -419,8 +419,11 @@ GEM
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
pry-byebug (3.8.0)
byebug (~> 11.0)
pry (~> 0.10)
public_suffix (3.1.1) public_suffix (3.1.1)
puma (5.2.1) puma (5.2.2)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.5.2) racc (1.5.2)
rack (2.2.3) rack (2.2.3)
@ -462,10 +465,10 @@ GEM
rails-assets-to-markdown (3.1.1) rails-assets-to-markdown (3.1.1)
rails-assets-trianglify (1.2.0) rails-assets-trianglify (1.2.0)
rails-assets-waypoints (4.0.0) rails-assets-waypoints (4.0.0)
rails-controller-testing (1.0.4) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.x) actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.x) actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.x) activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
@ -746,6 +749,7 @@ DEPENDENCIES
pronto-haml pronto-haml
pronto-rubocop pronto-rubocop
pry pry
pry-byebug
puma (~> 5.2) puma (~> 5.2)
rails (~> 5.2) rails (~> 5.2)
rails-assets-bootstrap-markdown! rails-assets-bootstrap-markdown!

1
config/initializers/carrierwave.rb
View file

@ -1,5 +1,6 @@
CarrierWave.configure do |config| CarrierWave.configure do |config|
config.storage = :file config.storage = :file
config.cache_storage = :file
config.cache_dir = "#{Rails.root}/tmp/uploads" config.cache_dir = "#{Rails.root}/tmp/uploads"
config.enable_processing = false if Rails.env.test? config.enable_processing = false if Rails.env.test?
end end