mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-12 01:59:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,967 Commits 61 Branches 82 Tags
RSpec/IncludeExamples
Commit Graph

11967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel O'Connor
0cde6ad684 Merge branch 'dev' into dependabot/bundler/newrelic_rpm-5.2.0.345 2018-07-02 09:46:25 +09:30
Daniel O'Connor
8b4951c71a Merge branch 'dev' into dependabot/bundler/rack-protection-2.0.3 2018-07-02 09:46:08 +09:30
Daniel O'Connor
8fe3b1da15 Update CONTRIBUTORS.md 2018-07-02 09:44:50 +09:30
dependabot[bot]
d2c81d6b29 Bump newrelic_rpm from 5.0.0.342 to 5.2.0.345 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.0.0.342 to 5.2.0.345.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:55:29 +00:00
dependabot[bot]
5ad44c10af Bump uglifier from 4.1.10 to 4.1.13 
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.10 to 4.1.13.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.10...v4.1.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:54:50 +00:00
dependabot[bot]
008537a324 Bump rack-protection from 2.0.1 to 2.0.3 
Bumps [rack-protection](http://www.sinatrarb.com/protection/) from 2.0.1 to 2.0.3.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:52:31 +00:00
dependabot[bot]
116a9a8bab Bump comfortable_mexican_sofa from 1.12.10 to 1.12.11 
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) from 1.12.10 to 1.12.11.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases)
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:51:52 +00:00
dependabot[bot]
dc7cbadfc0 Bump selenium-webdriver from 3.11.0 to 3.13.0 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.11.0 to 3.13.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.11.0...selenium-3.13.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-01 11:50:30 +00:00
Brenda Wallace
1c7a3e27d9 Merge pull request #1648 from Growstuff/dependabot/bundler/sprockets-3.7.2 
[Security] Bump sprockets from 3.7.1 to 3.7.2
 2018-06-25 15:59:59 +12:00
dependabot[bot]
e66924151a [Security] Bump sprockets from 3.7.1 to 3.7.2 
Bumps [sprockets](http://getsprockets.org/) from 3.7.1 to 3.7.2. **This update includes security fixes.**

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-06-25 03:31:45 +00:00
Brenda Wallace
6f1eed06cc Merge pull request #1646 from robotscissors/issue-565-create-harvests-rss 
Issue 565 create harvests RSS
 2018-06-19 10:52:10 +12:00
robotscissors
605e2e1392 Add to contributors file 2018-06-18 15:22:27 -07:00
Brenda Wallace
9b6db4cde7 Merge branch 'dev' into upgrade/rails-5 2018-06-17 20:59:49 +12:00
Brenda Wallace
19fa8bb167 Merge branch 'dev' into UTFGardenNames 2018-06-17 20:58:54 +12:00
Brenda Wallace
77d2dc6144 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 20:58:32 +12:00
Brenda Wallace
678dabf710 Merge branch 'master' into dev 2018-06-17 10:42:55 +12:00
Brenda Wallace
3a7be86ef9 Merge pull request #1607 from Br3nda/fix/plants-parts-dupe 
Don't allow duplicate plant parts names
 2018-06-17 10:42:14 +12:00
Brenda Wallace
a8ab21d3bc Merge branch 'dev' into upgrade/rails-5 2018-06-17 08:48:25 +12:00
Brenda Wallace
a5fa69c7c7 Merge branch 'dev' into fix/plants-parts-dupe 2018-06-17 08:47:27 +12:00
Brenda Wallace
1d8c2db674 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 08:47:12 +12:00
Cesy
945edd1cbc Merge pull request #1644 from Br3nda/fix/reminder-email-ordering 
Order plantings and harvests in email
 2018-06-16 21:37:29 +01:00
Brenda Wallace
f67d39ed63 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-16 07:53:38 +12:00
Brenda Wallace
103d7375d3 Merge branch 'dev' into fix/plants-parts-dupe 2018-06-16 07:52:51 +12:00
Brenda Wallace
3b2c4a7893 Merge branch 'dev' into fix/reminder-email-ordering 2018-06-16 07:49:06 +12:00
Brenda Wallace
ecf2e82e9e Merge pull request #1645 from Growstuff/Br3nda-patch-1 
Pin coverage badge to dev branch
 2018-06-16 07:48:36 +12:00
robotscissors
82b83ca7a4 Fix linter issues 2018-06-12 10:00:45 -07:00
robotscissors
e784790e19 add .to_s to accomodate hound 2018-06-11 11:16:47 -07:00
robotscissors
f9bdae77d3 add tests for harvests/index.rss 2018-06-11 10:38:26 -07:00
robotscissors
dff6827761 create rss feed for harvests 2018-06-10 20:38:43 -07:00
Brenda Wallace
2f65939d5c Pin coverage badge to dev branch 2018-06-10 11:47:15 +12:00
Brenda Wallace
d7e71c8fc3 Use factory bot to make a harvest.plant_part 2018-06-07 11:46:29 +12:00
Brenda Wallace
47ddc915ef Generate random number in plant_part.name in factorybot 2018-06-07 11:44:29 +12:00
Brenda Wallace
0d303ee6df Don't allow duplicate plant parts names 
Make factort's plant_part.name unique
Setting plant_part.name in specs
Unique names for plant parts
 2018-06-04 17:42:41 +12:00
Brenda Wallace
5dc8bc5ec5 Order plantings and harvests in email 2018-06-04 17:35:06 +12:00
Brenda Wallace
0f8747f03d Turn on the CMS specs again 2018-06-04 17:13:00 +12:00
Brenda Wallace
3399a794b2 Ignore one non-ascii comment 2018-06-04 16:55:29 +12:00
Brenda Wallace
cf72bdc57d Reinstate json response config 2018-06-04 16:49:41 +12:00
Brenda Wallace
48589150a7 Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5 2018-06-04 16:49:27 +12:00
Brenda Wallace
1f6d76445e Added back CMS initialiser 2018-06-04 16:49:00 +12:00
Brenda Wallace
a816ec2bba Fix up footer 2018-06-04 16:44:51 +12:00
Brenda Wallace
f31ff5d508 Removed commented out gems 2018-06-04 16:42:37 +12:00
Brenda Wallace
7737f41b7f Code style fixup 2018-06-04 16:39:51 +12:00
Brenda Wallace
fd405ccad0 Added back link to CMS 2018-06-04 16:37:57 +12:00
Brenda Wallace
4be4e96a9f Fixed or => || 2018-06-04 16:30:38 +12:00
Brenda Wallace
4d937a1f91 Restoring Comfy mexican sofa 2018-06-04 16:29:38 +12:00
Brenda Wallace
326e972e9b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-06-04 16:21:51 +12:00
Brenda Wallace
f58c6c8f54 Regen rubocop todo 2018-06-04 16:20:39 +12:00
Brenda Wallace
05bfbda5f5 Rubocop style fix ups 2018-06-04 16:18:49 +12:00
Brenda Wallace
d7cc219569 Unique login_name in member factory 2018-06-04 16:16:55 +12:00
Brenda Wallace
bcaf245e64 photos#new doesn't redirect, needs item 2018-06-04 16:10:24 +12:00