Brenda Wallace 586bc21e93 Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions ...

Conflicts:
	spec/features/members/profile_spec.rb
	spec/features/notifications_spec.rb
	spec/features/percy/percy_spec.rb

2019-08-17 16:09:32 +12:00

..

assets

lint

2019-08-07 22:34:53 +12:00

controllers

Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions

2019-08-17 16:09:32 +12:00

helpers

Removing unused notifications code

2019-08-08 09:31:53 +12:00

jobs

Application job for Rails 5

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

mailers

Restore notifier

2019-08-10 12:09:23 +12:00

models

Split up giant member model

2019-08-12 10:00:21 +12:00

resources/api/v1

Delete duplicate percentage_grown attribute

2019-07-05 10:49:29 +00:00

services

Removed slug from query

2019-07-08 09:40:21 +12:00

validators

Rubocop style fix ups

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

views

links to member from conversations#index

2019-08-11 20:55:20 +12:00