Brenda Wallace 6e0e7e4de1 Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs ...

Conflicts:
	CONTRIBUTORS.md
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/crops.js.erb
	app/views/crops/show.html.haml

2016-12-07 11:17:30 +13:00

..

controllers

Removed redundant returns

2016-12-04 21:21:35 +00:00

factories

Fixed AmbiguousOperator

2016-12-06 21:09:39 +13:00

features

removed member look up that wasn't used in spec

2016-12-01 12:50:16 +13:00

helpers

Merge branch 'dev' into bw/useless-assignments

2016-12-01 12:51:13 +13:00

javascripts

add comments explaining each file per pull request

2015-03-06 07:03:06 -08:00

lib

Removed redundant returns

2016-12-04 21:21:35 +00:00

mailers

Removed extra empty blank lines

2016-11-26 12:06:02 +13:00

models

Merge branch 'dev' into bw/useless-assignments

2016-12-02 14:04:30 +13:00

requests

implement custom Sweeper class as stop gap against errors when running specs

2014-11-16 12:01:27 +11:00

routing

Removed extra empty blank lines

2016-11-26 12:06:02 +13:00

support

Fixed all useless assignments

2016-11-26 19:36:59 +13:00

views

Removed redundant returns

2016-12-04 21:21:35 +00:00

custom_matchers.rb

Spacing fixes

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

rails_helper.rb

Spacing fixes

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

spec_helper.rb

Removed extra empty blank lines

2016-11-26 12:06:02 +13:00