Brenda Wallace 276accc314 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 ...

Conflicts:
	Gemfile.lock

2018-12-30 13:02:02 +13:00

..

assets

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

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

controllers

Fixed linter issue, empty line after guard clause

2018-09-13 23:10:43 +12:00

helpers

Fixed linter issue, empty line after guard clause

2018-09-13 23:10:43 +12:00

jobs

Application job for Rails 5

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

mailers

Merge branch 'dev' into upgrade/rails-5

2018-06-17 08:48:25 +12:00

models

Inverse relation ships

2018-10-16 13:26:54 +13:00

resources/api/v1

Request spec for photos api

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

services

whitespace fixups

2018-09-09 12:44:52 +12:00

validators

Rubocop style fix ups

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

views

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

2018-12-30 13:02:02 +13:00