mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-07 23:57:07 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a69f5bf65f Merge branch 'dev' into UTFGardenNames 2019-01-18 18:54:13 +13:00
Brenda Wallace
1fc70e5a2b Rubocop linting 2019-01-18 14:54:24 +13:00
Brenda Wallace
4ea9dda5e9 Merge branch 'fix/1792-sparkhost-deprecated' into app-json-heroku 
Conflicts:
	app.json
 2019-01-18 14:52:53 +13:00
Brenda Wallace
03c8d75899 Fixing the app.json for Bonsai 2019-01-18 14:48:04 +13:00
Brenda Wallace
6273fa684c Models (plot and container) need to sub class ApplicationRecord 2019-01-18 14:34:47 +13:00
Brenda Wallace
f7d989bb61 Squashed migrations and set as Rails4.2 2019-01-18 14:31:35 +13:00
Brenda Wallace
ecb0d0bc0b Merge branch 'dev' into bb-track-types-of-gardens 2019-01-18 14:28:46 +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
6c70044a7f Switch to SendGrid (remove sparkhost) 2019-01-18 14:13:21 +13:00
Brenda Wallace
44f4cc621e Merge branch 'dev' into bb-track-types-of-gardens 2019-01-17 12:49:31 +13:00
Brenda Wallace
7a4f6fd512 Merge branch 'dev' into photos/seeds 2019-01-09 20:57:46 +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
Brandon Baker
a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-08 12:03:39 -05: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
Brenda Wallace
f8921d3ded Update reply notifications 2019-01-06 08:45:42 +13:00
Brenda Wallace
f638b9a5da Update path to member gardens in spec 2019-01-06 08:45:42 +13:00
Brenda Wallace
5528d9b5e9 Fix authors rss of posts link 2019-01-06 08:45:42 +13:00
Brenda Wallace
8b179ca2de Add new routes to spec 2019-01-06 08:45:42 +13:00