Brandon Baker a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens

2019-01-08 12:03:39 -05:00

..

assets

Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

2018-04-28 21:25:06 +12:00

controllers

Merge branch 'dev' into bb-track-types-of-gardens

2019-01-08 12:03:39 -05:00

helpers

URI.escape -> CGI.escape

2018-12-30 15:39:06 +13:00

jobs

Application job for Rails 5

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

mailers

More locations with production email addresses

2019-01-01 13:56:08 +13:00

models

Merge branch 'dev' into bb-track-types-of-gardens

2019-01-08 12:03:39 -05:00

resources/api/v1

Request spec for photos api

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

services

Align all the hashes

2018-12-30 15:22:29 +13:00

validators

Rubocop style fix ups

2018-06-04 16:18:49 +12:00

views

Merge branch 'dev' into bb-track-types-of-gardens

2019-01-08 12:03:39 -05:00