mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-26 18:56:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,749 Commits 54 Branches 76 Tags
987f50c87efc052d1cfef7033d9d806571b0a29a
Commit Graph

216 Commits

Author SHA1 Message Date
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
Brenda Wallace
87a091d694 Bundle alpha-order to comply with stricter rubocop 2017-01-08 20:50:52 +00:00
Shiny
0c8345d1e2 Merge branch 'dev' into bw/bar_graphs 2016-12-22 10:22:29 +13:00
Brenda Wallace
b0dd53eb63 Upgrade to ruby 2.3.3 2016-12-17 20:32:07 +13:00
Shiny
27520e9aa6 Merge branch 'dev' into bw/bar_graphs 2016-12-16 12:52:16 +13:00
Daniel O'Connor
1982dc76be Pin to elasticsearch API 2.0 for now 2016-12-09 10:51:13 +10:30
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
Jim Stallings
fe6e269c64 GS-658 - i18n automation POC 2016-12-02 15:34:38 +10:30
Cesy Avon
3d845f47b9 Update rails 2016-12-01 09:42:55 +00:00
Brenda Wallace
20c72e1205 Upgrading poltergeist 2016-11-26 13:43:04 +13:00
Miles Gould
2fa282e131 Install PhantomJS 2.1.1 on Travis-CI 
I've found it to be much more stable locally - hopefully it will help
with our flaky CI issues (#901).

Code mostly cargo-culted from
9d3afe3d04
 2016-11-20 17:22:05 +13:00
Brenda Wallace
c685b970d3 Add rubocop to bundle 
So we can manage which version of rubocop to use.
 2016-11-13 10:07:41 +13:00
Mackenzie Morgan
5092c78fba merge 2016-10-06 21:48:18 -04:00
Cesy
fe137a11bb Merge pull request #1031 from CloCkWeRX/queue_mail 
Queue mail in sidekiq
 2016-08-24 10:38:13 +01:00
Daniel O'Connor
aeb8792165 Merge remote-tracking branch 'upstream/dev' into queue_mail 2016-08-24 06:35:51 +09:30
Daniel O'Connor
c60609d507 Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-08-23 16:34:03 +09:30
Cesy Avon
3798e386ae Upgrading rails to 4.2.1 2016-08-22 14:14:58 +00:00
Daniel O'Connor
ece0fdfe6c Drop sidekiq web for the moment 2016-08-16 11:08:59 +09:30
Daniel O'Connor
4deb895b4c #951 Add sidekiq 2016-08-16 10:59:30 +09:30
Daniel O'Connor
43e7d6f7c2 Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-07-05 03:09:36 +09:30
Daniel O'Connor
ee604dc2b0 Upgrade activemerchant, fixing rails 5 deprecation warnings 2016-06-10 16:04:00 +09:30
Daniel O'Connor
e3d7bf9a62 Upgrade to rails 4.2.* 2016-06-10 15:43:04 +09:30
Mackenzie Morgan
8c624cfacd merge 2016-06-09 14:13:02 -04:00
pozorvlak
e419acea6e Install BogusPayPalGateway gem 
We were maintaining a vendor fork of active_merchant because they
refused to merge this feature in; it's now been released as a
separate gem.
 2016-06-07 17:43:35 +00:00
Daniel O'Connor
88a66a705b Update devise to 4.1.X and unpin 2016-06-03 00:23:58 +09:30
Daniel O'Connor
f77fd00931 Remove version pin for rspec-rails 2016-06-03 00:19:49 +09:30
Daniel O'Connor
b5c030905a Upgrade to geocoder current (we shouldn't be affected by the deprecations in 1.2.X or 1.3.X) 2016-06-03 00:16:00 +09:30
Daniel O'Connor
2844e13298 Upgrade factory_girl_rails, factory_girl 2016-06-03 00:10:25 +09:30
Cesy
608a921fce Merge pull request #956 from CloCkWeRX/upgrade_devise4 
Upgrade to devise 4.0.*
 2016-06-02 10:18:29 +01:00
pozorvlak
4bedf1e6ac Merge pull request #955 from CloCkWeRX/upgrade_geocoder 
Swap to geocoder 1.1.9
 2016-06-02 09:49:04 +01:00
Daniel O'Connor
a74ef7de6b Upgrade to devise 4.0.3 2016-06-02 13:49:13 +09:30
Daniel O'Connor
10064121a6 #953 Swap to geocoder 1.1.9; which is the release just after what we had previously pinned 2016-06-02 13:30:42 +09:30
Daniel O'Connor
40d7b11d90 #952 Try ruby 2.3.1 2016-06-02 13:13:52 +09:30
Mackenzie Morgan
8d982c7e3e Add capybara-screenshot to assist with feature testing 2016-05-26 22:39:58 -04:00
pozorvlak
d6999b2a8a Merge pull request #879 from Growstuff/code_climate 
Add code climate to README
 2016-05-23 19:00:26 +01:00
Daniel O'Connor
083035c924 Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup 2016-05-23 16:58:22 +09:30
Mackenzie Morgan
51a0a33b2a upgrade gems and make API change for ruby-units 2016-05-21 16:33:42 -04:00
Mackenzie Morgan
8659ebca2d switch from less to sass 
* dependency hell + bit rot on upstream libraries  prevents installation on OS X
 2016-05-19 15:52:54 -04:00
Miles Gould
bcb74c7ed8 Merge branch 'dev' into bump_ruby_22x 2016-05-19 14:15:33 +01:00
Mackenzie
1442a9106c add code climate / travis gem 2016-05-17 13:58:55 -04:00
pozorvlak
1791ed5b01 Merge pull request #843 from CloCkWeRX/fix_CVE-2015-7551_upgrade_ruby 
Fix CVE-2015-7551
 2016-03-29 20:04:56 +01:00
Daniel O'Connor
df952a1779 Bump rspec to fix https://github.com/rspec/rspec-rails/issues/1532 2016-03-29 00:00:07 +10:30
Daniel O'Connor
3748f954c5 Name: uglifier 
Version: 2.5.3
Advisory: 126747
Criticality: Unknown
URL: https://github.com/mishoo/UglifyJS2/issues/751
Title: uglifier incorrectly handles non-boolean comparisons during minification
Solution: upgrade to >= 2.7.2
 2016-03-28 23:54:29 +10:30
Daniel O'Connor
6905cd410d Bump to current ruby 2.2.*, as there's an end of life for 2.1.* https://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/ 2016-03-28 23:38:25 +10:30
Daniel O'Connor
66bb130a1a Fix CVE-2015-7551 (https://www.ruby-lang.org/en/news/2015/12/16/unsafe-tainted-string-usage-in-fiddle-and-dl-cve-2015-7551/) 2016-03-28 23:33:34 +10:30
Daniel O'Connor
c1fde41f1f Name: devise 
Version: 3.4.1
Advisory: CVE-2015-8314
Criticality: Unknown
URL: http://blog.plataformatec.com.br/2016/01/improve-remember-me-cookie-expiration-in-devise/
Title: Devise Gem for Ruby Unauthorized Access Using Remember Me Cookie
Solution: upgrade to >= 3.5.4
 2016-03-28 23:23:56 +10:30