mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-27 11:14:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,700 Commits 54 Branches 76 Tags
ea2653ecfc1910ec68462d5c0ccbeea488d46aad
Commit Graph

5700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel O'Connor
ea2653ecfc Merge pull request #1779 from Br3nda/ignore-extra-files 
Switch to yarn && Ignore extra files
 2019-01-06 15:41:51 +10:30
Brenda Wallace
99ac99b399 Can't update pip on travis, so don't 2019-01-06 16:19:58 +13:00
Brenda Wallace
97b377cf83 Add --no-document to install of linters 
as suggested in https://github.com/brigade/overcommit/issues/610
 2019-01-06 16:17:34 +13:00
Brenda Wallace
7c354c9872 Re-enable linters on Travis 2019-01-06 09:53:47 +13:00
Brenda Wallace
88ccdadeb1 Tidy up .gitignore 2019-01-06 09:53:47 +13:00
Brenda Wallace
798b4a8b47 Switching to yarn 2019-01-06 09:53:47 +13:00
Brenda Wallace
a1e317e509 Merge pull request #1778 from Br3nda/fix/schema 
Fix modified schema deploy error
 2019-01-06 08:39:58 +13:00
Brenda Wallace
de8eba738e Fix modified schema deploy error 2019-01-05 19:44:40 +13:00
Brenda Wallace
0f1ce681d2 Merge pull request #1773 from Growstuff/dependabot/bundler/chartkick-3.0.2 
Bump chartkick from 3.0.1 to 3.0.2
 2019-01-05 19:32:55 +13:00
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