mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 21:22:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 102 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 8cdefb6fcc Scope js variables so they are not global 2018-01-21 18:39:00 +13:00
Shiny 0938e2839a Merge pull request #1531 from Growstuff/awesomecode-rspec/multiplesubjects-7391 
Auto corrected by following RSpec/MultipleSubjects
 2018-01-21 17:33:13 +13:00
Daniel O'Connor 4e080c7fcd Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391 2018-01-20 16:23:02 +10:30
Daniel O'Connor 0cdaa12000 Merge pull request #1535 from Growstuff/awesomecode-style/mutableconstant-7391 
Auto corrected by following Style/MutableConstant
 2018-01-20 16:22:32 +10:30
Shiny 505c084f47 Merge branch 'dev' into awesomecode-style/mutableconstant-7391 2018-01-20 17:28:49 +13:00
Daniel O'Connor a53fa7781c Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391 2018-01-18 14:07:34 +10:30
Daniel O'Connor 75d4740a91 Merge pull request #1532 from Growstuff/awesomecode-rspec/nottonot-7391 
Auto corrected by following RSpec/NotToNot
 2018-01-17 20:21:25 +10:30
Shiny 16c54d1c61 Merge branch 'dev' into awesomecode-style/mutableconstant-7391 2018-01-15 14:25:05 +13:00
Shiny 09045fabfc Merge branch 'dev' into awesomecode-rspec/nottonot-7391 2018-01-15 14:24:44 +13:00
Shiny a2bea8aaf4 Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391 2018-01-15 14:24:38 +13:00
pozorvlak 0491ec1e4c Merge pull request #1527 from Br3nda/charts-with-specs 
Charts specs
 2018-01-14 22:54:10 +00:00
Shiny 4f0c004e50 Update crop_detail_page_spec.rb 2018-01-14 12:04:32 +13:00
Awesome Code 7fb2690306 Auto corrected by following Style/MutableConstant 2018-01-13 22:51:04 +00:00
Awesome Code 273e4c07d8 Auto corrected by following RSpec/NotToNot 2018-01-13 22:49:49 +00:00
Awesome Code b6aef19be6 Auto corrected by following RSpec/MultipleSubjects 2018-01-13 22:49:36 +00:00
Shiny d18b7df611 Merge branch 'dev' into charts-with-specs 2018-01-14 10:06:06 +13:00
Shiny 5f28e3e02d Merge pull request #1526 from pozorvlak/deploy_only_once 
Only deploy from the Elasticsearch build job
 2018-01-13 23:30:50 +13:00
Shiny 6efdcb74d3 Merge branch 'dev' into charts-with-specs 2018-01-13 22:58:57 +13:00
Shiny d32d068527 Merge branch 'dev' into deploy_only_once 2018-01-13 22:58:15 +13:00
Shiny 09771d323a Merge pull request #1521 from Growstuff/awesomecode-style/orassignment-7269 
Auto corrected by following Style/OrAssignment
 2018-01-13 22:57:58 +13:00
Shiny c618f7a690 Merge branch 'dev' into awesomecode-style/orassignment-7269 2018-01-13 22:19:45 +13:00
Brenda Wallace 3a4443a4fe Permissions (and specs) for charts json 2018-01-13 22:15:27 +13:00
Shiny 238f87f616 Merge branch 'dev' into deploy_only_once 2018-01-13 22:11:34 +13:00
pozorvlak 2a2bef71da Merge pull request #1518 from Growstuff/awesomecode-factorybot/dynamicattributedefinedstatically-7220 
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
 2018-01-12 11:51:54 +00:00
pozorvlak b576b4b83e Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220 2018-01-12 11:38:49 +00:00
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