Brenda Wallace f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb

2019-04-21 11:27:27 +12:00

..

controllers

Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace

2019-04-20 09:44:42 +00:00

factories

Fix a deprecation warning

2019-04-08 21:39:20 +12:00

features

Update spec

2019-04-20 12:16:58 +12:00

helpers

Revert spec

2019-04-20 19:57:45 +12:00

javascripts

Removing jasmine, we have no jasmine specs

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

lib

Auto corrected by following Lint Ruby RSpec/ExampleWording

2019-02-11 10:17:54 +13:00

mailers

Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace

2019-03-13 17:23:33 +13:00

models

Merge remote-tracking branch 'upstream/dev' into material-merge

2019-04-21 11:27:27 +12:00

requests

Auto corrected by following Lint Ruby Capybara/FeatureMethods

2019-04-01 23:02:50 +13:00

routing

Update test from containers to garden_types

2019-03-26 21:06:22 +13:00

services

Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace

2019-04-20 09:44:42 +00:00

support

Rubocop lint

2019-04-13 09:50:49 +12:00

views

lint

2019-04-20 15:10:08 +12:00

custom_matchers.rb

Spacing fixes

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

rails_helper.rb

Use %r for regexp

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

spec_helper.rb

Move crop searching specs from the crop model to the crop search service

2019-04-08 21:39:20 +12:00