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

..

concerns

Changed order of photo association relationship declarations

2018-01-03 17:24:51 +13:00

.gitkeep

Moving development to top level directory

2012-08-23 10:41:00 -07:00

ability.rb

Ignore long method in ability.rb

2017-12-17 17:57:19 +13:00

account_type.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

account.rb

Fixing up member's account model creation, post rails 5 upgrade

2018-01-06 11:31:04 +13:00

alternate_name.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

application_record.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

authentication.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

comment.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

crop.rb

crop creator is optional

2018-01-07 18:44:03 +13:00

csv_importer.rb

Auto corrected by following Style/RescueStandardError

2018-01-10 20:18:17 +00:00

follow.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

forum.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

garden.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

harvest.rb

belongs_to defaults to required. setting some to optional

2018-01-04 14:55:36 +13:00

like.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

member.rb

Moved members.create_account_and_garden to private

2018-01-06 11:32:49 +13:00

notification.rb

Notifications don't have a post if they are a message

2018-01-06 09:01:18 +13:00

order_item.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

order.rb

Fixed order->member relationship, after change to paranoia gem

2018-01-03 17:21:40 +13:00

photo.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

photographing.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

plant_part.rb

Plant parts model using distinct query

2018-01-06 09:31:39 +13:00

planting.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

post.rb

belongs_to defaults to required. setting some to optional

2018-01-04 14:55:36 +13:00

product.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

role.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

scientific_name.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

seed.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00