mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2025-12-24 01:57:46 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,764 Commits 52 Branches 76 Tags
dev
Commit Graph

209 Commits

Author SHA1 Message Date
Brenda Wallace
550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12:00
Awesome Code
34470a8457 Auto corrected by following Ruby Layout/LeadingBlankLines 2018-09-10 22:20:20 +00:00
Brenda Wallace
4867c68984 Added stdout print when creating/refreshing elasticsearch index 2018-09-09 12:11:10 +12:00
Brenda Wallace
835e277f49 whitepace fix up 2018-09-09 11:58:43 +12:00
Brenda Wallace
7197843ac3 Reindex elasticsearch rake task 2018-09-09 11:56:37 +12:00
Brenda Wallace
ea1fb90279 Create the search index 2018-09-09 11:55:19 +12:00
Brenda Wallace
4be4e96a9f Fixed or => || 2018-06-04 16:30:38 +12:00
Brenda Wallace
fa32537c3b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	.rubocop_todo.yml
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/members.js.erb
	app/assets/stylesheets/predictions.sass
	app/controllers/crops_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/plantings_controller.rb
	app/models/account.rb
	app/models/account_type.rb
	app/models/member.rb
	app/models/order.rb
	app/models/order_item.rb
	app/models/product.rb
	app/views/gardens/show.html.haml
	app/views/layouts/application.html.haml
	config/initializers/assets.rb
	config/routes.rb
	db/schema.rb
	package-lock.json
	spec/controllers/account_types_controller_spec.rb
	spec/controllers/admin/orders_controller_spec.rb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/gardens_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/member_controller_spec.rb
	spec/controllers/order_items_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/controllers/photo_associations_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/controllers/seeds_controller_spec.rb
	spec/controllers/shop_controller_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/models/member_spec.rb
	spec/models/post_spec.rb
	spec/views/crops/_planting_advice.html.haml_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
	spec/views/orders/show.html.haml_spec.rb
	spec/views/posts/show.html.haml_spec.rb
	spec/views/shop/index_spec.rb
 2018-04-02 10:59:13 +12:00
Brenda Wallace
978523fd94 Merge branch 'dev' into awesomecode-style/andor-8234 2018-02-11 08:50:50 +13:00
Brenda Wallace
42de726405 Removing shop, products, accounts, orders 2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:58:47 +13:00
Brenda Wallace
33fb2408d6 Merge branch 'dev' into awesomecode-style/andor-8234 2018-02-07 14:25:41 +13:00
Awesome Code
ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Shiny
3d4598e4e1 style clean up 2018-01-29 12:56:41 +13:00
Awesome Code
94db28b3a9 Auto corrected by following Style/AndOr 2018-01-28 23:47:38 +00:00
Brenda Wallace
f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +13:00
Brenda Wallace
182c626226 Prefer if/unless modifier 2017-12-06 14:23:12 +13:00
Brenda Wallace
878fc7ebcd Use symbol procs 2017-12-06 14:17:34 +13:00
Brenda Wallace
25b1836146 Removed nil comparison 2017-12-06 14:13:01 +13:00
Brenda Wallace
c925c95398 Use next, instead of a if wrapper 2017-12-06 14:11:27 +13:00
Brenda Wallace
a6a7f789a3 Rubocop upgrade (and some style fixes) 2017-12-01 21:07:39 +13:00
Brenda Wallace
310f631f40 Ignore one Style/ClassAndModuleChildren 2017-10-18 20:45:27 +13:00
Brenda Wallace
d8f41b5ca0 Use ! to indicate the method changes class variables 2017-10-18 12:20:28 +13:00
Brenda Wallace
b5fbfaf515 Fixed duplicated code in growstuff member link markdown 2017-10-18 12:13:05 +13:00
Brenda Wallace
ce9a71cdad Moved member look up to a method (less duplicate code) 2017-10-18 12:10:59 +13:00
Brenda Wallace
42a10bcd80 Fixed members link in growstuff markdown 2017-10-18 12:10:04 +13:00
Brenda Wallace
33656a4104 Fixed links to crops in growstuff markdown 2017-10-18 12:05:22 +13:00
Brenda Wallace
bd396dabfe More simplification of growstuff markup 2017-10-17 22:29:02 +13:00
Brenda Wallace
1279dd63bc Reduced complexity of growstuff_markdown 2017-10-17 22:20:17 +13:00
Brenda Wallace
0ecc65bbe0 rubocop fix for redundant self 2017-03-02 22:21:15 +13:00
Brenda Wallace
e229438997 rubocop fox for numeric literals 2017-03-01 17:46:12 +13:00
Brenda Wallace
abbd2cf0a4 fix bug: look up parent crop by name in csv import 2017-02-23 15:35:29 +13:00
Brenda Wallace
4e722dd123 Move crop csv import to own file 2017-02-23 15:35:29 +13:00
Miles Gould
9030e5b978 Merge branch 'dev' into test_runners 2017-02-16 13:31:39 +00:00
Brenda Wallace
2b03381a24 Removed trailing commas 2017-02-15 23:33:06 +00:00
Brenda Wallace
be2426c99f Use timezone when creating dates 2017-02-10 21:53:18 +13:00
Miles Gould
2accb727e5 Describe rake static 2017-02-07 14:38:04 +00:00
Miles Gould
68120c5bbe Make rake spec depend on rake assets:precompile 2017-02-07 14:27:14 +00:00
Miles Gould
71ec9fd2d3 Run JS tests from rake and rake spec:unit 2017-02-07 14:27:14 +00:00
Miles Gould
7672b9ffc8 Add spec:unit Rake task 2017-02-07 14:27:14 +00:00
Miles Gould
8d237cc2ee Make rake run specs and static checks by default 2017-02-07 14:27:14 +00:00
Brenda Wallace
370938c9f9 change deliver_later to deliver_now, so we don't sys.exit() crash 2017-01-22 21:22:30 +13:00
Shiny
ee7fbb9ab9 Merge branch 'dev' into bw/guard-clauses 2016-12-21 20:53:47 +13:00
Miles Gould
b8385afb2f Remove apparently-unused Geocodable.geocode method 
We have unit tests for geocoding, but it's not being covered, so I
assume it's being shadowed by a method installed directly from Geocoder.
 2016-12-19 20:14:05 +00:00
Brenda Wallace
ca7868b79a Use guard clauses 2016-12-14 21:28:35 +00:00
Brenda Wallace
92195d51d2 Removed redundant returns 2016-12-04 21:21:35 +00:00
Shiny
1388aa3b06 Merge branch 'dev' into bw/useless-assignments 2016-12-03 08:23:19 +13:00
Daniel O'Connor
fa65be40a4 lib/tasks/i18n.rake:8:37: W: Lint/UnusedBlockArgument: Unused block argument - t. If it's necessary, use _ or _t as an argument name to indicate that it won't be used. 2016-12-02 15:51:29 +10:30
Jim Stallings
fe6e269c64 GS-658 - i18n automation POC 2016-12-02 15:34:38 +10:30
Jim Stallings
81f2fa5fa4 GS-658: sort locale keys, add rake task for it 2016-12-02 15:31:07 +10:30