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 crops-show

Browse Source
This commit is contained in:
Brenda Wallace
2019-02-13 09:04:51 +13:00
committed by GitHub
parent f57a423c29 c0dd3534d3
commit fa00262f80
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@@ -164,7 +164,7 @@ GEM
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
faker (1.9.1)
faker (1.9.2)
i18n (>= 0.7)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
@@ -406,7 +406,7 @@ GEM
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.1)
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -415,7 +415,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.61.1)
rubocop (0.64.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)

3
app/views/plantings/_quick_actions.haml
View File

@@ -11,6 +11,3 @@
%li= planting_finish_button(planting)
%li= planting_harvest_button(planting)
%li= planting_save_seeds_button(planting)
-# - if can? :destroy, planting
-# %li= delete_button(planting)