mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-30 12:45:48 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,614 Commits 54 Branches 76 Tags
3fec343f2c16d39c1fc529d760fca4c79fd8a6b1
Commit Graph

5614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
3fec343f2c Rubocop for hash alignment 2018-12-30 15:13:59 +13:00
Brenda Wallace
22e456f3af Time stamps need a timezone 2018-12-30 15:06:24 +13:00
Brenda Wallace
d5676338d6 Use the expect syntax 2018-12-30 15:06:14 +13:00
Brenda Wallace
9f90b0368b Use %r for regexp 2018-12-30 15:06:06 +13:00
Brenda Wallace
ac6a308ea0 Update URL -> CGI 2018-12-30 15:05:41 +13:00
Brenda Wallace
914e9ef3be photos needs a show method 2018-12-30 15:05:10 +13:00
Brenda Wallace
8e160a4c93 Fixed another wrong method name 2018-12-30 15:05:00 +13:00
Brenda Wallace
24b58c5ac2 FIXED wrong method name 2018-12-30 15:04:50 +13:00
Brenda Wallace
b82b4fa642 Comments controller has no show 2018-12-30 15:04:38 +13:00
Brenda Wallace
1e4cdc9511 Change rake to rails 2018-12-30 14:57:24 +13:00
Brenda Wallace
1574f4b90a Downgrade active_median gem until we upgrade postgresql. 
see #1757
 2018-12-30 14:39:30 +13:00
Brenda Wallace
c2b64ffbc0 pull elastic search version back 2018-12-30 14:19:33 +13:00
Brenda Wallace
ca28812d83 No longer need to create the active median function in a migration 2018-12-30 13:49:50 +13:00
Brenda Wallace
007e61e76a Freeze mutable objects assigned to constants. 2018-12-30 13:36:32 +13:00
Brenda Wallace
9e6f0af373 More things detected by rubocop, that we shouldn't ignore 2018-12-30 13:33:34 +13:00
Brenda Wallace
2cc37464fc Some rubocop ignores that we shouldn't ignore 2018-12-30 13:31:33 +13:00
Brenda Wallace
27e471b7b3 Set rubocop to 0.60 2018-12-30 13:30:16 +13:00
Brenda Wallace
7e8aa7a435 bundle update 2018-12-30 13:22:52 +13:00
Brenda Wallace
0c78791d01 Remove unnecesary whitesapce in specs 2018-12-30 13:22:42 +13:00
Brenda Wallace
276accc314 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile.lock
 2018-12-30 13:02:02 +13:00
Brenda Wallace
8348530e22 Tell capybara to normalise whitespace 2018-12-30 12:58:22 +13:00
Daniel O'Connor
3df0e2da2b Merge pull request #1750 from Growstuff/dependabot/bundler/newrelic_rpm-5.6.0.349 
Bump newrelic_rpm from 5.5.0.348 to 5.6.0.349
 2018-12-14 12:42:11 +10:30
dependabot[bot]
c8e625c45d Bump newrelic_rpm from 5.5.0.348 to 5.6.0.349 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.5.0.348 to 5.6.0.349.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-13 07:50:43 +00:00
Brandon Baker
7b15ae319d corrects more inflections 2018-12-12 09:37:31 +13:00
Brandon Baker
2c0746073e removes extra empty line detected at block body end 2018-12-12 09:37:31 +13:00
Brandon Baker
c0450477c6 adds plural form of words with māori origin 2018-12-12 09:37:31 +13:00
Brandon Baker
e6007dc094 adds inflections for irregular plural crop names 2018-12-12 09:37:31 +13:00
dependabot[bot]
012cd75f5f Bump letter_opener from 1.6.0 to 1.7.0 
Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases)
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-12 09:37:09 +13:00
dependabot[bot]
43f0cbe0ca Bump pry from 0.12.0 to 0.12.2 
Bumps [pry](https://github.com/pry/pry) from 0.12.0 to 0.12.2.
- [Release notes](https://github.com/pry/pry/releases)
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pry/pry/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 10:12:32 +13:00
dependabot[bot]
a91faecaa3 [Security] Bump rails from 4.2.10 to 4.2.11 
Bumps [rails](https://github.com/rails/rails) from 4.2.10 to 4.2.11. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v4.2.10...v4.2.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 10:08:47 +13:00
dependabot[bot]
e2c3c26edc Bump active_utils from 3.3.13 to 3.3.15 
Bumps [active_utils](https://github.com/shopify/active_utils) from 3.3.13 to 3.3.15.
- [Release notes](https://github.com/shopify/active_utils/releases)
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.13...v3.3.15)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 10:08:12 +13:00
dependabot[bot]
11e8d1f702 Bump active_utils from 3.3.12 to 3.3.13 
Bumps [active_utils](https://github.com/shopify/active_utils) from 3.3.12 to 3.3.13.
- [Release notes](https://github.com/shopify/active_utils/releases)
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.12...v3.3.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-27 21:36:30 +13:00
Brandon Baker
beab7fcfda hides crop varieties that have not been approved 2018-11-26 17:29:27 +13:00
dependabot[bot]
6c6724b558 Bump guard from 2.14.2 to 2.15.0 
Bumps [guard](https://github.com/guard/guard) from 2.14.2 to 2.15.0.
- [Release notes](https://github.com/guard/guard/releases)
- [Changelog](https://github.com/guard/guard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guard/guard/compare/v2.14.2...v2.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-15 21:50:23 +13:00
dependabot[bot]
3506cf59de Bump bullet from 5.8.1 to 5.9.0 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.8.1...5.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-13 15:15:29 +13:00
dependabot[bot]
825d8b6b3f Bump pry from 0.11.3 to 0.12.0 
Bumps [pry](https://github.com/pry/pry) from 0.11.3 to 0.12.0.
- [Release notes](https://github.com/pry/pry/releases)
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pry/pry/compare/v0.11.3...v0.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-10 10:42:29 +13:00
dependabot[bot]
0d183cee25 Bump newrelic_rpm from 5.4.0.347 to 5.5.0.348 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.4.0.347 to 5.5.0.348.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-10 10:41:56 +13:00
dependabot[bot]
2d10abcc59 Bump font-awesome-sass from 5.5.0 to 5.5.0.1 
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.5.0 to 5.5.0.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
release49 		2018-11-08 22:27:57 +13:00
dependabot[bot]
832ec2e15e [Security] Bump rack from 1.6.10 to 1.6.11 
Bumps [rack](https://github.com/rack/rack) from 1.6.10 to 1.6.11. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/1.6.10...1.6.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-07 08:33:36 +13:00
dependabot[bot]
709d188004 Bump font-awesome-sass from 5.4.1 to 5.5.0 
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.4.1...5.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-06 08:53:58 +13:00
dependabot[bot]
d5dff62b48 Bump selenium-webdriver from 3.14.1 to 3.141.0 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.14.1 to 3.141.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits/selenium-3.141.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-04 01:15:49 +13:00
dependabot[bot]
d290c8bf90 Merge pull request #1722 from Growstuff/dependabot/bundler/dalli-2.7.9 2018-10-31 10:01:29 +00:00
dependabot[bot]
ea286e8300 Bump dalli from 2.7.8 to 2.7.9 
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.8 to 2.7.9.
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.8...v2.7.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-31 09:47:09 +00:00
dependabot[bot]
3a75e69459 Merge pull request #1720 from Growstuff/dependabot/bundler/rails-assets-leaflet.markercluster-1.4.1 2018-10-31 09:43:39 +00:00
dependabot[bot]
d0ce89a9a5 Bump rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1 
Bumps rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-31 09:20:19 +00:00
dependabot[bot]
37a3e9e9e1 Bump bullet from 5.7.6 to 5.8.1 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-31 22:16:38 +13:00
dependabot[bot]
825883b323 [Security] Bump loofah from 2.2.2 to 2.2.3 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-31 09:54:56 +13:00
dependabot[bot]
77f5bcffb0 Bump rspec-rails from 3.8.0 to 3.8.1 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-25 11:59:50 +13:00
dependabot[bot]
122daca7d6 Bump capybara-screenshot from 1.0.21 to 1.0.22 
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.21 to 1.0.22.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases)
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.21...v1.0.22)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-23 12:19:16 +13:00
Brenda Wallace
a635032df1 Merge branch 'master' into dev 2018-10-21 16:09:01 +13:00