mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-07 15:47:21 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
468dded162 Remove controller actions for method that don't exist 2018-12-30 15:32:59 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace
7399346354 one line method 2018-12-30 15:18:11 +13:00
Brenda Wallace
0330809e4b Re-enable rubocop cops 2018-12-30 15:17:22 +13:00
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
5b7cdf2572 Merge branch 'dev' into bb-track-types-of-gardens 2018-12-27 09:14:06 +10:30
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
Brenda Wallace
f9d655034b Merge branch 'dev' into bb-track-types-of-gardens 2018-12-12 09:37:52 +13: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
Brandon Baker
178c6cd944 fixes bug in setting slug on container 2018-12-06 15:51:00 -07: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
Brandon Baker
bb97082868 adds friendly_id to containers 2018-12-01 19:46:49 -07:00
Brandon Baker
f35284c403 adds more basic specs 2018-12-01 14:08:11 -07:00
Brandon Baker
02174a0acb builds views for containers 2018-11-30 11:56:58 -07:00
Brandon Baker
f5abc592f1 cleans up rubocop violations 2018-11-29 14:30:02 -07:00
Brandon Baker
5f6852b45c adds basic specs for container and adds a plot spec for garden 2018-11-29 13:22:35 -07:00
Brandon Baker
c898a958a5 adds container to garden form 2018-11-29 12:51:15 -07:00
Brandon Baker
45ba5ff48a creates containers, plots, and associations among gardens, plots, and containers 2018-11-29 10:54:04 -07: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