429 Commits

Author	SHA1	Message	Date
Brenda Wallace	86781f3491	Bundle upgrade	2018-04-21 21:14:18 +12:00
Brenda Wallace	2d309b7645	Removing jasmine, we have no jasmine specs	2018-04-02 09:58:02 +12:00
Brenda Wallace	31d2aa052a	More bundle updates	2018-04-01 14:16:50 +12:00
deppbot	61468b3587	Bundle Update on 2018-03-22	2018-03-22 13:13:48 +08:00
deppbot	c80685bf0d	Security Update on 2018-03-20 (#1597) ... * Security Update on 2018-03-20 * Ordered gems, to please rubocop	2018-03-22 14:14:19 +13:00
deppbot	64a8cfb59f	Security Update on 2018-03-16 (#1593)	2018-03-16 14:54:36 +13:00
Brenda Wallace	aab91e2fa9	Removed active merchant	2018-02-09 10:53:05 +13:00
deppbot	ed2fcc2ada	Bundle Update on 2018-02-07	2018-02-07 08:40:54 +13:00
deppbot	24931381af	Bundle Update on 2018-02-03	2018-02-04 08:25:59 +13:00
deppbot	742c7e30a9	Bundle Update on 2018-01-31	2018-01-31 13:12:08 +13:00
deppbot	093a948922	Bundle Update on 2018-01-28	2018-01-29 09:54:30 +13:00
deppbot	be1553410f	Bundle Update on 2018-01-24	2018-01-29 09:54:20 +13:00
Shiny	caf41e80c9	Patching paperclip gem	2018-01-24 15:07:06 +13:00
deppbot	2eff7d6716	Bundle Update on 2018-01-21	2018-01-23 09:00:34 +13:00
Brenda Wallace	56ed61b2b3	Lock pg < 1.0.0 for now	2018-01-23 09:00:34 +13:00
Brenda Wallace	1bf05f81ab	Convert to use chartkick gem ... Conflicts: Gemfile Gemfile.lock config/initializers/assets.rb	2018-01-23 09:00:34 +13:00
deppbot	0feed2d359	Bundle Update on 2017-12-24	2018-01-23 09:00:34 +13:00
deppbot	0699716c19	Bundle Update on 2017-12-18	2017-12-18 00:08:58 +08:00
deppbot	ff652ae234	Bundle Update on 2017-12-14	2017-12-14 20:10:52 +08:00
deppbot	291f865f7f	Bundle Update on 2017-12-11	2017-12-11 16:09:34 +08:00
Shiny	9de991a075	Merge branch 'dev' into bundle-update-2017-12-08-121126	2017-12-08 20:19:39 +13:00
deppbot	ec149997b0	Bundle Update on 2017-12-08	2017-12-08 12:11:27 +08:00
Daniel O'Connor	07611e9a5d	Merge branch 'dev' into upgrade-rubocop	2017-12-05 11:38:52 +10:30
deppbot	00395ae68b	Bundle Update on 2017-12-05	2017-12-05 08:13:00 +08:00
deppbot	f08d02f4c5	Bundle Update on 2017-12-02	2017-12-02 20:32:08 +13:00
Brenda Wallace	a6a7f789a3	Rubocop upgrade (and some style fixes)	2017-12-01 21:07:39 +13:00
Brenda Wallace	33816d4312	Use faker gem, in account types - and add controller specs	2017-11-29 20:59:37 +13:00
deppbot	8a679670e4	Bundle Update on 2017-11-29	2017-11-29 07:00:25 +13:00
Brenda Wallace	c154a9b845	Upgraded leaflet maskercluster	2017-11-25 19:34:05 +13:00
Shiny	ad14ecb41b	Merge branch 'dev' into fix/1211	2017-11-25 17:03:23 +13:00
deppbot	08a73ce503	Bundle Update on 2017-11-24	2017-11-25 09:53:29 +13:00
deppbot	a91b8605c4	Bundle Update on 2017-11-21	2017-11-21 12:11:33 +08:00
Shiny	eea7e19ecf	Merge branch 'dev' into fix/1211	2017-11-18 22:27:04 +13:00
deppbot	949c7c31d8	Bundle Update on 2017-11-18	2017-11-18 15:27:04 +13:00
Brenda Wallace	13e8d1f5a5	Merge remote-tracking branch 'upstream/dev' into api	2017-11-17 21:51:39 +13:00
Shiny	83fea92353	Merge branch 'dev' into fix/1211	2017-11-15 09:27:17 +13:00
deppbot	2060d9ab9e	Bundle Update on 2017-11-15	2017-11-15 09:26:47 +13:00
Brenda Wallace	3d4f5c6917	upgrade leaflet-rails	2017-11-13 21:49:00 +13:00
Brenda Wallace	c96695258b	Basic read only api	2017-11-13 19:19:18 +13:00
deppbot	85cc9e77c6	Bundle Update on 2017-11-12	2017-11-12 09:29:21 +13:00
Brenda Wallace	2d384c9851	Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions	2017-11-09 17:36:50 +13:00
deppbot	f187b31653	Bundle Update on 2017-11-08	2017-11-08 20:12:32 +08:00
Brenda Wallace	9280049a84	Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions	2017-11-05 13:45:08 +13:00
deppbot	2422939b4f	Bundle Update on 2017-11-04	2017-11-04 20:10:52 +13:00
Brenda Wallace	20fe9e4cc5	Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions	2017-11-04 10:09:53 +13:00
Logan Gingerich	10a8df47a9	Factorygirl to factorybot - fixes #1413 (#1425) ... * FactoryGirl Changed to FactoryBot file fix changes based on comments received Bundle Update on 2017-10-29 style update to align hash literal added package-lock * indentation fixes with rubocop * name added to contributors	2017-11-01 15:03:31 +00:00
Brenda Wallace	a9cedc6a8a	Add active median gem	2017-11-01 13:57:49 +13:00
deppbot	4b445907d5	Bundle Update on 2017-11-01	2017-11-01 13:27:10 +13:00
deppbot	2946dca5fc	Bundle Update on 2017-10-29	2017-10-30 20:20:50 +13:00
deppbot	d9aa9df7fe	Bundle Update on 2017-10-26	2017-10-26 10:42:31 +13:00