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

Conflicts:
	Gemfile.lock

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

..

controllers

Provide message to raise_error

2018-10-10 08:42:05 +02:00

factories

Code style fix up

2018-09-29 15:53:06 +12:00

features

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

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

helpers

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

2018-09-11 16:07:30 +12:00

javascripts

Removing jasmine, we have no jasmine specs

2018-04-02 09:58:02 +12:00

lib

Fixed linter issue, empty line after guard clause

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

mailers

Revert "Auto corrected by following Style/StringLiterals"

2018-02-09 07:58:47 +13:00

models

Adding missing inverswe relationship alternatename.creator

2018-10-16 10:16:45 +13:00

requests

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

2018-09-11 16:07:30 +12:00

routing

Removing shop, products, accounts, orders

2018-02-09 10:53:05 +13:00

support

Fixed linter issue, empty line after guard clause

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

views

Update seeds specs

2018-10-16 15:11:46 +13:00

custom_matchers.rb

Spacing fixes

2016-11-26 12:13:17 +13:00

rails_helper.rb

Code style fixup

2018-06-04 16:39:51 +12:00

spec_helper.rb

Revert "Auto corrected by following Style/StringLiterals"

2018-02-09 07:58:47 +13:00