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

..

assets

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

controllers

Merge branch 'charts' into upgrade/rails-5

2018-01-11 09:12:20 +13:00

helpers

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

jobs

Application job for Rails 5

2018-01-03 17:20:08 +13:00

mailers

Application mailer for rails 5

2018-01-03 17:18:41 +13:00

models

Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5

2018-01-11 16:10:36 +13:00

resources/api/v1

Request spec for photos api

2017-11-17 22:01:37 +13:00

services

fixes search

2017-11-01 13:57:49 +13:00

validators

Use guard clauses

2016-12-14 21:28:35 +00:00

views

add google js to gardens#show

2018-01-11 15:36:27 +13:00