pozorvlak
e8bcce2ad3
Only deploy from the Elasticsearch build job
...
Fixes #1099 , or at least works around it, though a better solution would
be to rewrite our deployment system using Travis build stages or Heroku
build pipelines.
The Elasticsearch job was picked because it's the one most likely to
fail, and I can't work out how to deploy only if all three jobs pass.
2018-01-12 11:31:28 +00:00
pozorvlak
723c4d4345
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-12 11:22:08 +00:00
pozorvlak
a8eee7624a
Merge pull request #1522 from Growstuff/awesomecode-style/parallelassignment-7269
...
Auto corrected by following Style/ParallelAssignment
2018-01-12 11:21:46 +00:00
pozorvlak
c7a3911694
Merge branch 'dev' into awesomecode-style/parallelassignment-7269
2018-01-12 09:57:26 +00:00
Shiny
6ccfa7f008
Merge pull request #1515 from Br3nda/timeline
...
Garden Timeline
2018-01-12 10:59:15 +13:00
Brenda Wallace
b831c29c97
Use .presence to find finished ts in timeline
2018-01-12 09:27:09 +13:00
Brenda Wallace
cc1d3b4f43
Use predicted finish times to put current plantings on the timeline
2018-01-12 08:07:38 +13:00
Brenda Wallace
150a0dd99e
Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5
...
Conflicts:
spec/controllers/photo_associations_controller_spec.rb
2018-01-12 07:57:02 +13:00
Brenda Wallace
29be61c790
Merge branch 'timeline' into upgrade/rails-5
2018-01-12 07:56:09 +13:00
Brenda Wallace
c442bdbd45
add google js to gardens#show
2018-01-12 07:53:34 +13:00
Shiny
bf2b32ffaa
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-11 16:13:34 +13:00
Shiny
cba0a40246
Merge branch 'dev' into awesomecode-style/parallelassignment-7269
2018-01-11 16:13:24 +13:00
Shiny
dd536d607b
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-11 16:13:10 +13:00
Brenda Wallace
f4e87a974d
Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5
...
Conflicts:
app/views/gardens/show.html.haml
spec/controllers/photo_associations_controller_spec.rb
2018-01-11 16:10:36 +13:00
Brenda Wallace
2d813e49de
add google js to gardens#show
2018-01-11 15:36:27 +13:00
Shiny
43c2ac7244
Merge branch 'dev' into upgrade/rails-5
2018-01-11 15:00:28 +13:00
Shiny
31d3f17d78
Merge branch 'dev' into upgrade/rails-5
2018-01-11 14:59:57 +13:00
Shiny
d1e3322075
Merge branch 'dev' into timeline
2018-01-11 14:58:48 +13:00
Shiny
091ed0e1be
Merge pull request #1514 from Br3nda/charts
...
Use ChartKick gem for charts
2018-01-11 14:58:04 +13:00
Shiny
fb00f6a23a
Merge branch 'dev' into timeline
2018-01-11 13:12:29 +13:00
Shiny
01d6232bcf
Merge branch 'dev' into charts
2018-01-11 13:11:32 +13:00
Daniel O'Connor
3e5de8bce4
Merge branch 'dev' into upgrade/rails-5
2018-01-11 10:04:56 +10:30
Daniel O'Connor
609b468675
Merge branch 'dev' into upgrade/rails-5
2018-01-11 10:04:21 +10:30
Daniel O'Connor
b172c5f242
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-11 10:01:38 +10:30
Daniel O'Connor
8afff39c09
Merge pull request #1523 from Growstuff/awesomecode-style/rescuestandarderror-7269
...
Auto corrected by following Style/RescueStandardError
2018-01-11 10:00:50 +10:30
Brenda Wallace
f2b88a94ef
Merge branch 'charts' into upgrade/rails-5
2018-01-11 09:32:31 +13:00
Brenda Wallace
26a5ba70ef
Merge branch 'charts' into timeline
2018-01-11 09:32:14 +13:00
Brenda Wallace
7dab57f9ba
Removed d3 graph tests
2018-01-11 09:31:59 +13:00
Brenda Wallace
0d35b4ca6d
Updating rubocop todo
2018-01-11 09:26:48 +13:00
Awesome Code
1a4e0bd48a
Auto corrected by following Style/RescueStandardError
2018-01-10 20:18:17 +00:00
Awesome Code
e865e93665
Auto corrected by following Style/ParallelAssignment
2018-01-10 20:18:10 +00:00
Awesome Code
bd32647178
Auto corrected by following Style/OrAssignment
2018-01-10 20:17:58 +00:00
Shiny
a931f26b00
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-11 09:15:00 +13:00
Brenda Wallace
350787d4e4
Merge branch 'charts' into upgrade/rails-5
2018-01-11 09:12:20 +13:00
Brenda Wallace
7b59480928
Merge branch 'charts' into timeline
2018-01-11 09:12:06 +13:00
Brenda Wallace
390282f9f2
Added Harvested for chart
2018-01-11 09:03:13 +13:00
Brenda Wallace
8e0b7d9ded
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/crops.js.erb
spec/controllers/comments_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/models/post_spec.rb
spec/views/home/_crops.html.haml_spec.rb
2018-01-11 08:34:20 +13:00
Brenda Wallace
56a76004df
Merge branch 'charts' into timeline
2018-01-11 08:31:09 +13:00
Brenda Wallace
4af36f68b4
Merge remote-tracking branch 'origin/charts' into charts
2018-01-11 08:30:38 +13:00
Brenda Wallace
ad6601b356
Add planted_from chart
2018-01-11 08:29:20 +13:00
Brenda Wallace
15594c0209
Wrapped thre crops show js in a document.ready
2018-01-11 08:26:59 +13:00
Shiny
34715b5a2a
Merge branch 'dev' into charts
2018-01-10 16:37:32 +13:00
Shiny
6641ae8257
Merge pull request #1519 from Growstuff/awesomecode-rspec/emptylineafterfinallet-7220
...
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-10 16:37:07 +13:00
Shiny
ca860db074
Merge branch 'dev' into awesomecode-rspec/emptylineafterfinallet-7220
2018-01-09 21:52:49 +13:00
Shiny
5230dec20e
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-09 19:00:04 +13:00
Shiny
3029bdcb0d
Merge pull request #1517 from Growstuff/awesomecode-emptyline-7220
...
Auto corrected by following EmptyLine
2018-01-09 18:53:28 +13:00
Brenda Wallace
6d56f3f655
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/views/layouts/application.html.haml
2018-01-09 15:55:28 +13:00
Brenda Wallace
dc86404b6f
Fix predictions, it wasn't showing nil
2018-01-09 15:53:40 +13:00
Awesome Code
e46f530dc3
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-09 02:00:40 +00:00
Awesome Code
3ece584390
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
2018-01-09 01:59:43 +00:00
