mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-29 20:25:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,653 Commits 54 Branches 76 Tags
e30b179bc836cf86f78cb4abdf7cbf03b6897bcb
Commit Graph

5653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
e30b179bc8 Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5 2018-12-31 21:35:47 +13:00
Brenda Wallace
f6e065301f Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-12-31 21:35:19 +13:00
Brenda Wallace
188477206f Merge branch 'dev' into upgrade/rails-5 2018-12-31 21:34:56 +13:00
Brenda Wallace
fb03923f75 Merge branch 'master' into dev 2018-12-31 21:33:05 +13:00
Brenda Wallace
04eb2c6448 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile.lock
 2018-12-31 21:28:48 +13:00
dependabot[bot]
d6c9132049 Bump friendly_id from 5.2.4 to 5.2.5 
Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.2.4 to 5.2.5.
- [Release notes](https://github.com/norman/friendly_id/releases)
- [Changelog](https://github.com/norman/friendly_id/blob/master/Changelog.md)
- [Commits](https://github.com/norman/friendly_id/compare/5.2.4...5.2.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-31 21:27:06 +13:00
Brenda Wallace
f2fc6b2a61 Reduce max class complexity 2018-12-30 19:41:08 +13:00
Brenda Wallace
b70dee5041 Update rubocop todo 2018-12-30 19:37:28 +13:00
Brenda Wallace
ac660e986c Wrap all action bar button groups in a div 
So we can find them in specs
 2018-12-30 16:14:00 +13:00
Brenda Wallace
c0f8c23976 Downgrade geocoder 2018-12-30 16:00:45 +13:00
Brenda Wallace
60f72652da URI.escape -> CGI.escape 2018-12-30 15:55:10 +13:00
Brenda Wallace
2faa2fd6f0 Content for other formats on photos#show 2018-12-30 15:42:51 +13:00
Brenda Wallace
3f5c63eb04 URI.escape -> CGI.escape 2018-12-30 15:39:06 +13:00
Brenda Wallace
93e1c5e5fc Disabled # rubocop:disable Rails/OutputSafety 2018-12-30 15:38:37 +13:00
Brenda Wallace
b1d2c46cff Whitespace fixup 2018-12-30 15:34:31 +13:00
Brenda Wallace
b8fae99bde Times with zone, in factories 2018-12-30 15:34:24 +13:00
Brenda Wallace
0083d1279a Marked htmlsafe as # rubocob:ignore Rails/OutputSafety 2018-12-30 15:33:26 +13:00
Brenda Wallace
98e492ad11 DRY 2018-12-30 15:33:10 +13:00
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
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