mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-30 04:35:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,677 Commits 54 Branches 76 Tags
84201c4f55653b2d586b16771c65cb303fc75866
Commit Graph

5677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
84201c4f55 Pin to ruby 2.5.3 on linting 2019-01-03 14:12:27 +13:00
Brenda Wallace
8229c7196c Don't install rubocop in linters. Use the one in the bundle 2019-01-03 13:50:30 +13:00
Brenda Wallace
3de23957a3 Updated package-lock for linters 2019-01-03 13:50:01 +13:00
Brenda Wallace
0971f3b5f4 Updated notification specs for Rails 5.2 2019-01-03 12:50:58 +13:00
Brenda Wallace
d89c8f0fbc Merge branch 'dev' into upgrade/rails-5-2 2019-01-03 12:31:37 +13:00
Brenda Wallace
301023b713 Merge pull request #1768 from Br3nda/upgrade-heroku-stack 
Upgrade heroku stack
 2019-01-03 12:31:07 +13:00
Brenda Wallace
fd2717ee01 Merge branch 'dev' into upgrade-heroku-stack 2019-01-03 08:51:06 +13:00
Cesy
26198d90e4 Merge pull request #1767 from Br3nda/fix-mailer-from 
Fix mailer from address
 2019-01-02 09:07:15 +00:00
Brenda Wallace
28dcc57307 Set email env on travis runs 2019-01-01 14:10:04 +13:00
Brenda Wallace
1627c347e4 App.json to configure heroku 2019-01-01 14:07:51 +13:00
Brenda Wallace
6df2d92720 Adding from email to example application.yml 2019-01-01 13:59:32 +13:00
Brenda Wallace
a76f5d3a22 More locations with production email addresses 2019-01-01 13:56:08 +13:00
Brenda Wallace
f4df42d136 Fixes not being able to find the 404 page file 2019-01-01 13:42:53 +13:00
Brenda Wallace
c7ad7bcc70 Fixed redundant begin block 2019-01-01 13:38:37 +13:00
Brenda Wallace
47a4b02ce4 Merge remote-tracking branch 'upstream/dev' into dev 2019-01-01 13:36:41 +13:00
Brenda Wallace
164e43f054 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5-2 2019-01-01 13:32:57 +13:00
Brenda Wallace
b7f876429a Upgrade to ruby 2.6.0 2019-01-01 13:31:09 +13:00
Cesy
f9aa6012aa Merge pull request #1765 from Br3nda/fix/1764 
Make mail sender host configurable
 2018-12-31 23:29:28 +00:00
Brenda Wallace
a43c235423 Upgrade to Rails 5.2 2019-01-01 10:31:53 +13:00
Brenda Wallace
a6a75050bb Make mail sender host configurable 2019-01-01 09:55:29 +13:00
Brenda Wallace
b18b397e1c Merge pull request #1511 from Br3nda/upgrade/rails-5 
Upgrade to rails 5
 2019-01-01 08:45:52 +13:00
Brenda Wallace
73e9a94167 Merge remote-tracking branch 'upstream/dev' into dev 2018-12-31 23:19:42 +13:00
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