13034 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel O'Connor	23ed7f91ba	Merge pull request #1220 from Br3nda/ReversibleMigration ... Marked our one ReversibleMigration as okay	2017-02-16 10:29:02 +10:30
Daniel O'Connor	aa511aedb4	Merge pull request #1219 from Br3nda/TrailingCommas ... Removed trailing commas	2017-02-16 10:28:43 +10:30
Brenda Wallace	2b03381a24	Removed trailing commas	2017-02-15 23:33:06 +00:00
Brenda Wallace	6017c4ba23	Marked our one ReversibleMigration as okay	2017-02-16 12:32:37 +13:00
Brenda Wallace	a46b8ebe76	Fix up all UnneededInterpolation	2017-02-16 12:26:47 +13:00
Brenda Wallace	a4f8b3a0e6	Rubocop fix for MultilineHashBraceLayout	2017-02-16 12:20:32 +13:00
Daniel O'Connor	1b8c413b90	Merge pull request #1215 from Br3nda/likeable-dry ... Likeable even more dry	2017-02-14 10:27:51 +10:30
Shiny	7a334abf1d	Merge branch 'dev' into likeable-dry	2017-02-14 12:40:05 +13:00
pozorvlak	5c067c87b8	Merge pull request #1201 from Br3nda/bw/harvest-planting-link ... Linking existing harvests to a planting	2017-02-13 23:02:04 +00:00
Brenda Wallace	87bc1becb0	Reduced repeating code in likes controller	2017-02-14 11:52:20 +13:00
pozorvlak	7c0d6c04df	Merge branch 'dev' into bw/harvest-planting-link	2017-02-13 22:39:15 +00:00
pozorvlak	01415fd04f	Merge pull request #1214 from Br3nda/authentication-scoping ... User can only sign out their own session	2017-02-13 22:38:40 +00:00
pozorvlak	e0def646ce	Merge branch 'dev' into authentication-scoping	2017-02-13 22:22:47 +00:00
pozorvlak	a52731dc4b	Merge pull request #1198 from Br3nda/bw/grand-haml-cleanup-of-2017 ... All the haml clean up	2017-02-13 22:20:16 +00:00
Shiny	cd2500c99a	Merge branch 'dev' into bw/harvest-planting-link	2017-02-14 00:19:28 +13:00
Shiny	c9a197bc61	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-14 00:18:53 +13:00
Mackenzie Morgan	c5439c8650	use symbols for status codes	2017-02-13 20:56:22 +13:00
Brenda Wallace	6d0a7ebc8f	Only show plantings with overlapping date ranges on harvest options	2017-02-13 20:41:43 +13:00
Brenda Wallace	0d1bab04d5	don't load the record again	2017-02-13 20:28:29 +13:00
Brenda Wallace	e6b23262da	User can only sign out their own session	2017-02-13 20:08:31 +13:00
Brenda Wallace	06ea3db252	Use .field to format planting options on harvests	2017-02-13 17:30:41 +13:00
Brenda Wallace	8d24ffbffb	spec for harvesting from a planting	2017-02-13 17:21:11 +13:00
Brenda Wallace	cce9f513db	Linking existing harvests to a planting	2017-02-13 17:21:11 +13:00
Brenda Wallace	c37ba9f041	Use @harvest.planting, instead of @planting	2017-02-13 17:21:11 +13:00
Shiny	f8c56cc217	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-13 17:19:58 +13:00
Daniel O'Connor	d11e6f484a	Pin leaflet-rails for the moment, until we fix tests	2017-02-13 17:19:40 +13:00
Daniel O'Connor	9218a03e2b	Upgrade only geocoder	2017-02-13 17:19:40 +13:00
Daniel O'Connor	da760a8a4c	Revert "Update geocoder, leaflet-rails" ... This reverts commit ecd2bb1c01.	2017-02-13 17:19:40 +13:00
Daniel O'Connor	9ccecf0e04	Update i18n-tasks bootstrap_form font-awesome-sass	2017-02-13 17:19:40 +13:00
Daniel O'Connor	5ec105ad19	Upgrade sidekiq	2017-02-13 17:19:40 +13:00
Daniel O'Connor	5c1f5f4312	Update poltergeist	2017-02-13 17:19:40 +13:00
Daniel O'Connor	48d3a64e7b	Update cancancan	2017-02-13 17:19:40 +13:00
Daniel O'Connor	decd48a970	Update geocoder, leaflet-rails	2017-02-13 17:19:40 +13:00
Daniel O'Connor	540ac7b034	Update warden	2017-02-13 17:19:40 +13:00
Daniel O'Connor	8112133cf2	Update unicorn	2017-02-13 17:19:40 +13:00
Daniel O'Connor	55f00ed0f8	Update newrelic	2017-02-13 17:19:40 +13:00
Daniel O'Connor	d0999c2f9a	Update activemerchant	2017-02-13 17:19:40 +13:00
Daniel O'Connor	47150a8ad8	Update selenium-webdriver	2017-02-13 17:19:40 +13:00
Daniel O'Connor	9301688763	Update guard	2017-02-13 17:19:40 +13:00
Daniel O'Connor	248b89a564	Update elasticsearch	2017-02-13 17:19:40 +13:00
Daniel O'Connor	8e9ffac64e	Pin to hashie 3.4.* for https://github.com/intridea/hashie/issues/408	2017-02-13 17:19:40 +13:00
Brenda Wallace	65024d8f83	Moved hash in haml onto one line, for clarity and glory	2017-02-12 20:41:25 +00:00
Shiny	8ab70a1c1c	Merge branch 'dev' into bw/grand-haml-cleanup-of-2017	2017-02-13 08:04:41 +13:00
Brenda Wallace	2c871abd03	don't allow owner in params	2017-02-13 07:41:53 +13:00
Brenda Wallace	8b4491d0ab	Tabulation on wrapped form_for	2017-02-13 07:38:26 +13:00
Brenda Wallace	93202fc13c	haml clean up for devise views	2017-02-13 07:34:41 +13:00
Brenda Wallace	0f520c0928	More haml clean up for home views	2017-02-13 07:34:31 +13:00
Brenda Wallace	21c989989c	add missing new line at end of haml file	2017-02-13 07:34:13 +13:00
Brenda Wallace	123c34b6d1	Haml cleanup for layout	2017-02-13 07:33:48 +13:00
Brenda Wallace	f5e786401d	fixed typo	2017-02-13 07:32:43 +13:00