mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-03-28 19:51:57 -04:00
Merge remote-tracking branch 'upstream/dev'
This commit is contained in:
14
Gemfile.lock
14
Gemfile.lock
@@ -137,7 +137,7 @@ GEM
|
||||
concord (0.1.5)
|
||||
adamantium (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
concurrent-ruby (1.1.5)
|
||||
concurrent-ruby (1.1.6)
|
||||
connection_pool (2.2.2)
|
||||
coveralls (0.8.19)
|
||||
json (>= 1.8, < 3)
|
||||
@@ -157,7 +157,7 @@ GEM
|
||||
responders
|
||||
warden (~> 1.2.3)
|
||||
diff-lcs (1.3)
|
||||
discard (1.1.0)
|
||||
discard (1.2.0)
|
||||
activerecord (>= 4.2, < 7)
|
||||
docile (1.1.5)
|
||||
elasticsearch (6.8.1)
|
||||
@@ -183,7 +183,7 @@ GEM
|
||||
factory_bot_rails (5.1.1)
|
||||
factory_bot (~> 5.1.0)
|
||||
railties (>= 4.2.0)
|
||||
faker (2.10.1)
|
||||
faker (2.10.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
faraday (0.17.3)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
@@ -358,7 +358,7 @@ GEM
|
||||
puma (4.3.1)
|
||||
nio4r (~> 2.0)
|
||||
query_diet (0.6.2)
|
||||
rack (2.1.2)
|
||||
rack (2.2.2)
|
||||
rack-protection (2.0.8.1)
|
||||
rack
|
||||
rack-test (1.1.0)
|
||||
@@ -463,7 +463,7 @@ GEM
|
||||
rubocop-rails (2.4.2)
|
||||
rack (>= 1.1)
|
||||
rubocop (>= 0.72.0)
|
||||
rubocop-rspec (1.38.0)
|
||||
rubocop-rspec (1.38.1)
|
||||
rubocop (>= 0.68.1)
|
||||
ruby-progressbar (1.10.1)
|
||||
ruby-units (2.3.1)
|
||||
@@ -499,9 +499,9 @@ GEM
|
||||
childprocess (>= 0.5, < 4.0)
|
||||
rubyzip (>= 1.2.2)
|
||||
sexp_processor (4.13.0)
|
||||
sidekiq (6.0.4)
|
||||
sidekiq (6.0.5)
|
||||
connection_pool (>= 2.2.2)
|
||||
rack (>= 2.0.0)
|
||||
rack (~> 2.0)
|
||||
rack-protection (>= 2.0.0)
|
||||
redis (>= 4.1.0)
|
||||
simplecov (0.12.0)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
- cache cache_key_for(Seed) do
|
||||
%h2.text-center= t('home.seeds.title')
|
||||
.row
|
||||
- Seed.homepage_records(6).each do |s|
|
||||
- Seed.homepage_records(9).each do |s|
|
||||
.col-6.col-md-4= render 'seeds/card', seed: s
|
||||
|
||||
Reference in New Issue
Block a user