mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-24 16:58:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into display

Browse Source
This commit is contained in:
Brenda Wallace
2019-09-05 10:13:54 +12:00
committed by GitHub
parent f16921d994 f3ac6c9a37
commit 2d6c022d43
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Gemfile.lock
View File

@@ -57,8 +57,8 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
anima (0.3.1)
abstract_type (~> 0.0.7)
adamantium (~> 0.2)
@@ -94,7 +94,7 @@ GEM
uniform_notifier (~> 1.11)
byebug (11.0.1)
cancancan (3.0.1)
capybara (3.28.0)
capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@@ -113,7 +113,7 @@ GEM
activesupport (>= 4.0.0)
mime-types (>= 1.16)
chartkick (3.2.1)
childprocess (1.0.1)
childprocess (2.0.0)
rake (< 13.0)
codeclimate-test-reporter (1.0.9)
simplecov (<= 0.13)
@@ -150,7 +150,7 @@ GEM
thor (~> 0.19.1)
tins (~> 1.6)
crass (1.0.4)
csv_shaper (1.3.0)
csv_shaper (1.3.1)
activesupport (>= 3.0.0)
dalli (2.7.10)
database_cleaner (1.7.0)
@@ -187,7 +187,7 @@ GEM
factory_bot_rails (5.0.2)
factory_bot (~> 5.0.2)
railties (>= 4.2.0)
faker (2.2.0)
faker (2.2.1)
i18n (>= 0.8)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
@@ -339,7 +339,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
oj (3.9.0)
oj (3.9.1)
omniauth (1.9.0)
hashie (>= 3.4.6, < 3.7.0)
rack (>= 1.6.2, < 3)
@@ -359,7 +359,7 @@ GEM
rack
orm_adapter (0.5.0)
parallel (1.17.0)
parser (2.6.3.0)
parser (2.6.4.0)
ast (~> 2.4.0)
percy-capybara (4.0.2)
pg (0.21.0)
@@ -368,7 +368,7 @@ GEM
moneta (~> 1.0.0)
popper_js (1.14.5)
procto (0.0.3)
public_suffix (3.1.1)
public_suffix (4.0.1)
puma (4.1.0)
nio4r (~> 2.0)
rack (2.0.7)
@@ -464,7 +464,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.3.1)
rubocop-rails (2.3.2)
rack (>= 1.1)
rubocop (>= 0.72.0)
rubocop-rspec (1.35.0)
@@ -500,15 +500,15 @@ GEM
activemodel (>= 5)
elasticsearch (>= 6)
hashie
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
selenium-webdriver (3.142.4)
childprocess (>= 0.5, < 3.0)
rubyzip (~> 1.2, >= 1.2.2)
sexp_processor (4.12.1)
sidekiq (5.2.7)
connection_pool (~> 2.2, >= 2.2.2)
rack (>= 1.5.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
sidekiq (6.0.0)
connection_pool (>= 2.2.2)
rack (>= 2.0.0)
rack-protection (>= 2.0.0)
redis (>= 4.1.0)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)

2
app/assets/stylesheets/overrides.scss
View File

@@ -10,7 +10,7 @@ body {
section {
margin: 0;
padding-top: 1em;
padding-bottom: 1em;
}
.ellipsis {

4
app/views/plantings/show.html.haml
View File

@@ -36,6 +36,6 @@
.row
.col-md-12
%hr/
= render 'plantings/harvests', planting: @planting
%section= render 'plantings/harvests', planting: @planting
%hr/
= render 'plantings/descendants', planting: @planting
%section= render 'plantings/descendants', planting: @planting