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,691 Commits 54 Branches 76 Tags
cecc032dee5eaa3d03e11b8ad14877aa12e86363
Commit Graph

5691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
cecc032dee Bump chartkick from 3.0.1 to 3.0.2 
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-04 10:12:16 +00:00
dependabot[bot]
fddfdf0107 Merge pull request #1774 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.4 2019-01-04 10:09:23 +00:00
dependabot[bot]
cd43558120 Bump jsonapi-resources from 0.9.3 to 0.9.4 
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.3 to 0.9.4.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.3...v0.9.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-04 09:24:41 +00:00
Brenda Wallace
8e3db87f4e Merge pull request #1766 from Br3nda/upgrade/rails-5-2 
Upgrade to Rails 5.2
 2019-01-04 22:22:32 +13:00
Brenda Wallace
efc8fb85cb Merge branch 'dev' into upgrade/rails-5-2 2019-01-04 20:41:52 +13:00
Brenda Wallace
e9ead68e94 Revert "Auto corrected by following Format Javascript Code" 
This reverts commit 334b33c555.
 2019-01-04 18:17:27 +13:00
Awesome Code
334b33c555 Auto corrected by following Format Javascript Code 2019-01-04 05:15:13 +00:00
Brenda Wallace
4218688d8e Revert "Auto corrected by following Format Javascript Code" 
This reverts commit f83a2b6397.
 2019-01-04 18:14:36 +13:00
Awesome Code
f83a2b6397 Auto corrected by following Format Javascript Code 2019-01-03 10:00:13 +00:00
dependabot[bot]
eae3755af7 Merge pull request #1770 from Growstuff/dependabot/bundler/rubocop-rspec-1.31.0 2019-01-03 09:59:47 +00:00
dependabot[bot]
273da44406 Bump rubocop-rspec from 1.30.1 to 1.31.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.30.1 to 1.31.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.30.1...v1.31.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 07:31:04 +00:00
Brenda Wallace
4374a4800b Commenting out linter checks until overcommit is fixed 2019-01-03 14:44:35 +13:00
Brenda Wallace
12472d3762 Return to previous version 2019-01-03 14:41:11 +13:00
Brenda Wallace
7d7ae1f044 Pin to older childprocess 2019-01-03 14:19:45 +13:00
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