mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-05 20:44:33 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,311 Commits 70 Branches 92 Tags
abdfbdd3b1a2387deb006c340e6aae55893fc2ee
Commit Graph
7311 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace abdfbdd3b1 Merge branch 'dev' into harvest-show 2019-07-29 10:25:33 +12:00
Brenda Wallace 4859116577 Tidy up display of harvests#show 2019-07-29 10:15:06 +12:00
dependabot-preview[bot] c198b7f446 Bump rubocop-rspec from 1.33.0 to 1.34.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.33.0 to 1.34.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.33.0...v1.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-24 09:31:14 +00:00
dependabot-preview[bot] 724cac959b Bump rake from 12.3.2 to 12.3.3 
Bumps [rake](https://github.com/ruby/rake) from 12.3.2 to 12.3.3.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/v12.3.2...v12.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-23 02:07:54 +00:00
Brenda Wallace 93a171b1b2 Create stale.yml 2019-07-21 10:13:30 +12:00
Brenda Wallace e25e03a2e9 Merge pull request #2097 from Br3nda/fix/notifications 
Fix display of messages from deleted members
 2019-07-20 13:22:54 +12:00
Brenda Wallace b3cc365941 Merge pull request #2095 from Br3nda/ban-hammer 
Ban hammer
 2019-07-20 13:22:36 +12:00
Brenda Wallace 49b6261f87 Merge branch 'dev' into fix/notifications 2019-07-20 13:22:21 +12:00
dependabot-preview[bot] f0ec158053 Bump webdrivers from 4.1.0 to 4.1.1 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 20:25:54 +00:00
dependabot-preview[bot] e4512beb03 Bump oj from 3.7.12 to 3.8.0 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.12 to 3.8.0.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.12...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 00:37:34 +00:00
Brenda Wallace 314d95869a Merge branch 'dev' into fix/notifications 2019-07-18 12:57:36 +12:00
dependabot-preview[bot] 64fa4584b9 Bump rubocop from 0.72.0 to 0.73.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.72.0 to 0.73.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.72.0...v0.73.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 21:23:37 +00:00
dependabot-preview[bot] b7175a2e32 [Security] Bump mini_magick from 4.9.3 to 4.9.4 
Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.9.3 to 4.9.4. **This update includes security fixes.**
- [Release notes](https://github.com/minimagick/minimagick/releases)
- [Commits](https://github.com/minimagick/minimagick/compare/v4.9.3...v4.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 20:28:03 +00:00
Brenda Wallace 40b6ba6b1a Merge branch 'dev' into ban-hammer 2019-07-17 16:47:05 +12:00
Brenda Wallace 7f45b194e9 Update app/views/notifications/show.html.haml 2019-07-17 11:47:24 +12:00
Brenda Wallace a3b287fa3b Merge branch 'fix/notifications' of github.com:br3nda/growstuff into fix/notifications 2019-07-17 10:38:23 +12:00
Brenda Wallace 608cad2615 Fix variable name 2019-07-17 10:22:35 +12:00
Brenda Wallace fb7d8aa9c2 Merge branch 'dev' into fix/notifications 2019-07-17 09:30:28 +12:00
dependabot-preview[bot] f46cc31515 Bump capybara from 3.25.0 to 3.26.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.25.0 to 3.26.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.25.0...3.26.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 21:25:13 +00:00
Brenda Wallace ac6ef384e0 Merge branch 'master' into fix/notifications 
Conflicts:
	app/views/notifications/index.html.haml
 2019-07-17 09:24:04 +12:00
Brenda Wallace c8a721c304 Fixes error displaying messages from deleted members 2019-07-17 09:22:25 +12:00
Brenda Wallace e0dcd0226e Handle messages from deleted members 2019-07-17 09:09:16 +12:00
Brenda Wallace 42269e3261 Comment out member avatar until we work out why it's breaking 2019-07-17 08:56:29 +12:00
Brenda Wallace 4ce2eca670 Comment out member avatar until we work out why it's breaking 2019-07-17 08:37:54 +12:00
Brenda Wallace 6ffc61aace Merge branch 'ban-hammer' of github.com:br3nda/growstuff into ban-hammer 2019-07-16 23:11:44 +12:00
Brenda Wallace 312cd0d770 Read posts from member.posts 2019-07-16 23:10:01 +12:00
Brenda Wallace 560936eb13 Merge branch 'dev' into ban-hammer 2019-07-16 23:05:28 +12:00
dependabot-preview[bot] 2dfef909bd Bump chartkick from 3.2.0 to 3.2.1 
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.2.0 to 3.2.1.
- [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.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 10:53:06 +00:00
Brenda Wallace 91897273be Merge branch 'dev' into ban-hammer 2019-07-16 20:56:59 +12:00
Brenda Wallace fb77beeb7d rubocop lint 2019-07-16 20:56:33 +12:00
Brenda Wallace bf77d4b913 removed test for @posts variables on members controller 
because that variable isn't used so it doesn't exist anymore
 2019-07-16 20:55:09 +12:00
Brenda Wallace c8e47e800e Moved admin ban code to admin controler 2019-07-16 20:54:32 +12:00
Brenda Wallace b2537638ed Move member banning to admin/members controller 2019-07-16 18:56:49 +12:00
Brenda Wallace 006c7f02f5 feature specs for banning a member 2019-07-16 18:31:53 +12:00
Brenda Wallace 8827fb1291 go to admin_members_path after banning a member 2019-07-16 18:31:43 +12:00
Brenda Wallace 29823fd953 Make the follow button stand out 2019-07-16 18:18:14 +12:00
Brenda Wallace 72d5d2e81a Match role names to names in the seeds 2019-07-16 18:18:03 +12:00
Brenda Wallace 0622823816 Remove unused db lookup 2019-07-16 18:17:37 +12:00
Brenda Wallace 075b9b3327 Add a ban button to members 2019-07-16 18:15:54 +12:00
Brenda Wallace c3ee80f24b Merge pull request #2085 from Br3nda/renamed-photographings-associations 
Renamed photographings to photo associations
 2019-07-16 17:55:33 +12:00
Daniel O'Connor b82c0ab9f1 Merge branch 'dev' into renamed-photographings-associations 2019-07-16 12:45:25 +09:30
Brenda Wallace 2162c11280 Couple breadcrumbs tidied 2019-07-16 03:15:04 +00:00
Brenda Wallace 548bbf5e57 Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations 
Conflicts:
	db/schema.rb
 2019-07-16 12:12:16 +12:00
Brenda Wallace 3cd67bcc9f Fix liked photo spec 2019-07-15 11:58:46 +00:00
Brenda Wallace efe14d43cb read photo from a harvest's planting 2019-07-15 11:58:46 +00:00
Brenda Wallace 99c119c07f fixed looking up photo counts in spec 2019-07-15 11:58:46 +00:00
Brenda Wallace 60a510e73f tests the default photo changes when someone likes a photo 2019-07-15 11:58:46 +00:00
Brenda Wallace b1ebf67960 added more possible photo associations in photo model spec 2019-07-15 11:58:46 +00:00
Brenda Wallace 32695e3241 photos behave like likeable 2019-07-15 11:58:46 +00:00
Brenda Wallace 2879979db4 tests that likes are deleted when their photo is deleted 2019-07-15 11:58:46 +00:00