mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-24 01:32:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,893 Commits 64 Branches 76 Tags
2b69db77bf30e2dbfc37139a979a00a615bfc623
Commit Graph

261 Commits

Author SHA1 Message Date
Brenda Wallace
46cfe527bc add in gem 'rails-controller-testing' 2018-01-04 16:38:09 +13:00
Brenda Wallace
9d2732fffa removing comfortable mexican sofa for now 2018-01-04 14:29:09 +13:00
Brenda Wallace
7bc91e415a Re-instate active_median gem 2018-01-03 19:09:32 +13:00
Brenda Wallace
26f525e88a Upgrade gems for rails 5 
Note: Unlocks elastic search gem, and removes debuggers
 2018-01-03 17:06:54 +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
Brenda Wallace
c154a9b845 Upgraded leaflet maskercluster 2017-11-25 19:34:05 +13:00
Shiny
eea7e19ecf Merge branch 'dev' into fix/1211 2017-11-18 22:27:04 +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
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
Brenda Wallace
19205cb6a8 update from erubi to erubis gem broke stuff - rolling back 2017-09-13 22:08:21 +12:00
Brenda Wallace
43da004ccb Bundle update and change to platform-api instead of heroku 2017-09-05 13:58:56 +12:00
Brenda Wallace
9732553d3b Added xmlrpc gem to solve rake errors on travis 2017-08-31 21:04:55 +12:00
Brenda Wallace
9142613b6b Bump ruby version to 2.4.1 2017-08-22 13:49:43 +12:00
Cesy Avon
4116e201b5 Making rubocop happy 2017-06-15 15:28:50 +00:00
Cesy Avon
5788c0c5ce Putting jquery-ui-rails back so things work 2017-06-15 15:28:50 +00:00
Cesy Avon
15b49672ee Removing any locks on versions that don't have comments explaining why 2017-06-15 15:28:14 +00:00
Shiny
174040aa1b Merge branch 'dev' into issue-1044-account-deletion 2017-06-09 21:04:41 +12:00
Cesy Avon
142be72fc3 Upgrading Rails 2017-06-08 16:07:30 +00:00
Shiny
7621da7041 Merge branch 'dev' into issue-1044-account-deletion 2017-05-30 20:39:44 +12:00
Brenda Wallace
ff1c835cda Moving the planting predictions to own service 2017-05-29 22:45:14 +12:00
Brenda Wallace
c4938e00e4 Member acts as paranoid 2017-05-21 11:33:12 +12:00
Brenda Wallace
4dbdbc4285 Pull haml gem back to version 4 2017-05-13 11:31:32 +12:00
Brenda Wallace
dadc5b96c6 Reduced duplicate code further, with responders gem 
This makes locale-friendly flash notices
 2017-04-28 20:48:25 +12:00
Brenda Wallace
f08068c289 Upgrade haml_lint 2017-04-14 01:43:42 +00:00
Daniel O'Connor
8615df264e Ruby 2.3.4 2017-03-31 16:29:21 +10:00
Daniel O'Connor
3cead5fb6b Pin to earlier rubocop 2017-03-31 16:15:55 +10:00
Shiny
b72a3d6942 Merge branch 'dev' into query-optimising 2017-03-24 18:31:18 +13:00
Brenda Wallace
5baa357bb3 Use bullet to find queries to optomise 2017-03-24 16:07:05 +13:00
Brenda Wallace
4c189b4d56 Lock haml_lint to 0.20.0 and update other gems 2017-03-12 10:53:55 +13:00
Brenda Wallace
a3e0bc0798 Rubocop fix for Gemfile 2017-03-02 19:59:59 +13:00
Brenda Wallace
dd710860de Run the linters etc from overcommit 2017-03-01 20:48:15 +00:00
Daniel O'Connor
14f3dc7526 Add explaining notes 2017-02-23 14:34:38 +10:30
Daniel O'Connor
f2d3c88c85 Revert "Upgrade to the 4.x series of d3-rails" 
This reverts commit 5bd7d9aa43.
 2017-02-23 14:33:33 +10:30
Daniel O'Connor
13bfdeaa1a Pin Kaminari for the moment, until https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md#100 assessed 2017-02-23 14:31:47 +10:30
Daniel O'Connor
5bd7d9aa43 Upgrade to the 4.x series of d3-rails 2017-02-23 14:28:19 +10:30
Daniel O'Connor
72603a2db0 Pin to specific omniauth versions for the moment, to avoid login test regression 2017-02-23 14:24:29 +10:30
Daniel O'Connor
221dd45681 Upgrade to d3 3.5 “Mount Sharp” 2017-02-23 14:19:33 +10:30
Daniel O'Connor
fb2a600433 Pin d3-rails for the moment 2017-02-23 14:18:31 +10:30
Daniel O'Connor
bcc89674d4 Upgrade to current Hashie 2017-02-16 17:18:44 +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
8e9ffac64e Pin to hashie 3.4.* for https://github.com/intridea/hashie/issues/408 2017-02-13 17:19:40 +13:00
Brenda Wallace
9b57a44f6c Adding haml-lint 2017-02-04 11:41:02 +13:00
Miles Gould
18e6e8510c Install d3-rails gem in production and staging 
It was only being installed in development and test environments,
causing deployment failures.

Fixes #1170
 2017-01-30 20:17:42 +00:00
Shiny
d6de147661 Merge branch 'dev' into bw/bar_graphs 2017-01-22 18:39:53 +13:00
Daniel O'Connor
8b4c8fef3b Pin to earlier version of rainbow until https://github.com/sickill/rainbow/issues/44 is sorted 2017-01-21 16:14:37 +10:30
Miles Gould
d0351bad70 Merge branch 'dev' into bw/bar_graphs 2017-01-09 15:21:38 +00:00