mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-29 04:02:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,786 Commits 54 Branches 76 Tags
45890fec59c97dcfa63ebf72fcb69ddf0d65e095
Commit Graph

5786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
45890fec59 Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up 2019-01-24 13:47:17 +13:00
Brenda Wallace
5a2f7dfe25 Merge branch 'dev' into routes-tidy-up 2019-01-23 13:58:01 +13:00
apdarr
4f4421cb38 enforce ssl for new relic 2019-01-23 13:57:32 +13:00
apdarr
58f8a88242 set newrelic to use ssl 2019-01-23 13:57:32 +13:00
Brenda Wallace
2b20d32645 Merge branch 'dev' into routes-tidy-up 2019-01-21 11:36:25 +13:00
Brenda Wallace
2539899934 Fix notification specs 2019-01-21 10:50:22 +13:00
Brenda Wallace
31321fce17 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 2019-01-19 12:52:19 +13:00
Brenda Wallace
45793c1cec Merge branch 'dev' into routes-tidy-up 2019-01-19 12:37:53 +13:00
Brenda Wallace
f453682696 Fixing sendgrid 2019-01-19 12:33:58 +13:00
Brenda Wallace
6f23a203a2 Switch to SendGrid (remove sparkhost) 2019-01-19 11:57:50 +13:00
dependabot[bot]
4be6169c93 Bump jsonapi-resources from 0.9.4 to 0.9.5 
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.4 to 0.9.5.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.4...v0.9.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-19 09:33:19 +13:00
Brenda Wallace
2bb80746e0 Merge branch 'dev' into routes-tidy-up 2019-01-19 09:32:48 +13:00
Brenda Wallace
2c48596de9 Merge branch 'master' into dev 2019-01-19 09:00:15 +13:00
Brenda Wallace
e296f15981 Merge branch 'dev' into routes-tidy-up 2019-01-19 08:57:19 +13:00
Awesome Code
36765808b9 Auto corrected by following Format Css Code 2019-01-19 08:54:52 +13:00
Brenda Wallace
b6a7fa0efd Force to redirect to ssl 2019-01-19 08:51:55 +13:00
pozorvlak
83f3872488 Merge pull request #1761 from Growstuff/dev 
Release 50
 2019-01-18 17:31:10 +00:00
Brenda Wallace
b35d13d5e5 Update seeds_controller.rb 2019-01-18 20:05:41 +13:00
Brenda Wallace
d1a3f41462 Throw if can't find the @crop 2019-01-18 20:04:19 +13:00
Brenda Wallace
3212f748b4 Update crops_controller.rb 2019-01-18 20:03:22 +13:00
Brenda Wallace
cb6a06feb6 find by slug 2019-01-18 20:02:15 +13:00
Brenda Wallace
e337fcb7f7 Put displayed member back to using member.slug 2019-01-18 20:00:59 +13:00
Brenda Wallace
a06516b80f Put displayed link back to using login_name 2019-01-18 20:00:31 +13:00
Brenda Wallace
9a18918b42 Merge branch 'dev' into routes-tidy-up 2019-01-18 14:27:42 +13:00
Brenda Wallace
656510855d Switch to new syntax for initing uglifier 2019-01-18 14:21:11 +13:00
Brenda Wallace
3145df9153 Merge pull request #1785 from Growstuff/dependabot/bundler/sidekiq-5.2.5 
Bump sidekiq from 5.2.3 to 5.2.5
 2019-01-09 20:57:08 +13:00
dependabot[bot]
51f977fc8f Bump sidekiq from 5.2.3 to 5.2.5 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.3 to 5.2.5.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.3...v5.2.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-09 07:18:00 +00:00
Brenda Wallace
fb02c187ab Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 
Conflicts:
	.gitignore
 2019-01-08 10:33:50 +13:00
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
8cb9361462 only look up member/crop if an slug is passed 2019-01-06 08:45:42 +13:00
Brenda Wallace
c0e957b051 Places params is :place 2019-01-06 08:45:42 +13:00
Brenda Wallace
1660629cf9 DRY crop.interesting? 2019-01-06 08:45:42 +13:00
Brenda Wallace
4587dc711f Use to_param to make parts of the csv filename 2019-01-06 08:45:42 +13:00
Brenda Wallace
061bd31220 Use owner param in filename 2019-01-06 08:45:42 +13:00
Brenda Wallace
df7a59c629 Use slug in filename, not name/login_name 2019-01-06 08:45:42 +13:00
Brenda Wallace
90386221bc Update notification reply url in helper spec 2019-01-06 08:45:42 +13:00
Brenda Wallace
8846627096 Update notification controller spec to send notification_id 2019-01-06 08:45:42 +13:00
Brenda Wallace
106497c841 Rubocop fix ups 2019-01-06 08:45:42 +13:00
Brenda Wallace
fb5c631ec9 Fixed notification url in helper 2019-01-06 08:45:42 +13:00
Brenda Wallace
1e6c204df2 Rubcop fix up 2019-01-06 08:45:42 +13:00
Brenda Wallace
62a8f6b8d3 Fixed look up of reply notification 2019-01-06 08:45:42 +13:00
Brenda Wallace
0e0bf98c37 Specs for admin routing 2019-01-06 08:45:42 +13:00
Brenda Wallace
c2bcae47d2 Use the admin/members controller 2019-01-06 08:45:42 +13:00
Brenda Wallace
74e30aeb1d move cms into admin scope 2019-01-06 08:45:42 +13:00
Brenda Wallace
bf6dd049ae Fixed up admin routes 2019-01-06 08:45:42 +13:00