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

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
0744c35fdd Merge pull request #2148 from Growstuff/dev 
Production release
 2019-08-28 16:53:05 +12:00
dependabot-preview[bot]
f3bd2e978d Bump rubocop-rails from 2.3.0 to 2.3.1 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 08:38:55 +00:00
dependabot-preview[bot]
5b762dac85 Bump rack-protection from 2.0.6 to 2.0.7 
Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.6...v2.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 18:04:11 +00:00
dependabot-preview[bot]
c5aba387fe Bump rack-protection from 2.0.5 to 2.0.6 
Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.5 to 2.0.6.
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.5...v2.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-22 13:00:05 +00:00
dependabot-preview[bot]
8dfa2cb777 Bump bullet from 6.0.1 to 6.0.2 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.1...6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 11:19:08 +00:00
Brenda Wallace
39fde4e7c9 Merge pull request #2139 from Growstuff/dev 
Production release
 2019-08-21 09:17:57 +12:00
Brenda Wallace
e3f32d8bb4 Updated specs 2019-08-20 15:09:39 +00:00
Brenda Wallace
c6d4563edc Updated spec 2019-08-20 15:09:39 +00:00
Brenda Wallace
99228d8850 Add css class, so can find in test 2019-08-20 15:09:39 +00:00
Brenda Wallace
ed4aaa1c9c Tidy up admin landing page 2019-08-20 15:09:39 +00:00
Brenda Wallace
4241a7c5f5 Tidy up crop wrangling page 2019-08-20 15:09:39 +00:00
Brenda Wallace
b3520a1b3f Search for members in admin/members#index 2019-08-20 15:09:39 +00:00
dependabot-preview[bot]
a792b5933f Bump devise from 4.6.2 to 4.7.0 
Bumps [devise](https://github.com/plataformatec/devise) from 4.6.2 to 4.7.0.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.2...v4.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 14:30:07 +00:00
pozorvlak
ee59a7a35c Merge pull request #2133 from Br3nda/fix/feature-spec-sessions 
Fix/feature spec sessions
 2019-08-20 15:10:42 +01:00
pozorvlak
61d0a6e635 Merge branch 'dev' into fix/feature-spec-sessions 2019-08-20 14:51:27 +01:00
dependabot-preview[bot]
5ecc010cf5 Bump sass-rails from 5.0.7 to 5.1.0 
Bumps [sass-rails](https://github.com/rails/sass-rails) from 5.0.7 to 5.1.0.
- [Release notes](https://github.com/rails/sass-rails/releases)
- [Commits](https://github.com/rails/sass-rails/compare/v5.0.7...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 10:44:54 +00:00
dependabot-preview[bot]
715f111182 Bump will_paginate from 3.1.7 to 3.1.8 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.1.7 to 3.1.8.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.7...v3.1.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 10:17:24 +00:00
dependabot-preview[bot]
ba224bacbd Bump oj from 3.8.1 to 3.9.0 
Bumps [oj](https://github.com/ohler55/oj) from 3.8.1 to 3.9.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.8.1...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 19:42:08 +00:00
dependabot-preview[bot]
a7735e77d1 Bump haml_lint from 0.32.0 to 0.33.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.32.0 to 0.33.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.32.0...v0.33.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 18:55:09 +00:00
Brenda Wallace
6782765581 Merge branch 'fix/feature-spec-sessions' of github.com:br3nda/growstuff into fix/feature-spec-sessions 2019-08-19 09:21:34 +12:00
Brenda Wallace
fa5b2eea32 DRY spec 2019-08-19 09:21:28 +12:00
Brenda Wallace
e48dae006b Delete notifications_spec.rb 2019-08-18 20:15:55 +12:00
Brenda Wallace
38477c9bfd Wrap admin in context 2019-08-18 16:15:47 +12:00
Brenda Wallace
34b399cd8e Use more signed in contexts in browse crops spec 
More member role contexts on alt name spec

More member role contexts in crop feature specs

Don't wrap the shared_context
 2019-08-18 16:10:03 +12:00
Brenda Wallace
c6894e7917 Setting linters as require: false in gemfile 2019-08-18 14:51:46 +12:00
Brenda Wallace
756cf1fe3a Removing unused code in specs 2019-08-18 14:51:24 +12:00
Brenda Wallace
f3346fcadf Add rspectre gem 2019-08-18 14:31:51 +12:00
Brenda Wallace
626ad68bba Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions 2019-08-17 19:21:31 +12:00
Brenda Wallace
a334ea03bf fix spec 2019-08-17 19:20:43 +12:00
Brenda Wallace
8595dbe7aa Merge pull request #2134 from Br3nda/debug-migration 
[HOTFIX] Send message to everyone in migration (no email tho)
 2019-08-17 16:14:23 +12:00
Brenda Wallace
586bc21e93 Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions 
Conflicts:
	spec/features/members/profile_spec.rb
	spec/features/notifications_spec.rb
	spec/features/percy/percy_spec.rb
 2019-08-17 16:09:32 +12:00
Brenda Wallace
cbe5871369 Send message to everyone in migration (no email tho) 2019-08-17 16:00:18 +12:00
Brenda Wallace
23c6c3059f Merge pull request #2103 from Br3nda/mailbox 
Rewriting messages functionality to use mail boxer
 2019-08-17 15:33:30 +12:00
Brenda Wallace
a74891f97f Fix spec 2019-08-17 15:30:45 +12:00
Brenda Wallace
7a21ec31d9 wrap context in spec 2019-08-17 15:12:29 +12:00
Brenda Wallace
27d4ebda51 make sure there's a member to find in specs 2019-08-17 15:01:34 +12:00
Brenda Wallace
a993eadea9 fix spec 2019-08-17 14:43:39 +12:00
Brenda Wallace
b2d8818ae1 don't notify wranglers if there are none 2019-08-17 14:43:32 +12:00
Brenda Wallace
1cb0096788 fixed specs 2019-08-17 14:38:43 +12:00
Brenda Wallace
a36d149125 sign in as member with location 2019-08-17 14:35:39 +12:00
Brenda Wallace
c1deed70ad Keep username consistent in specs 2019-08-17 14:32:18 +12:00
Brenda Wallace
b6f61a9af3 Merge branch 'dev' into mailbox 2019-08-17 14:27:38 +12:00
Brenda Wallace
34d9d33ed6 Merge pull request #2124 from Growstuff/dev 
production release
 2019-08-17 14:27:02 +12:00
Brenda Wallace
aa17f8e332 Removed unused let() 2019-08-17 14:17:05 +12:00
Brenda Wallace
b49b7b563c Added logout after like spec 2019-08-17 14:14:58 +12:00
Brenda Wallace
8936933251 Shared context for signing in (and then out) in feature specs 2019-08-17 14:10:56 +12:00
Brenda Wallace
e27cf02d96 Shared context for signing in/out on feature specs 2019-08-16 13:49:31 +12:00
dependabot-preview[bot]
f90a29a7a5 Bump scout_apm from 2.5.1 to 2.5.2 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.5.1 to 2.5.2.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.5.1...v2.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 20:00:09 +00:00
dependabot-preview[bot]
8489109a87 Bump faker from 2.1.0 to 2.1.2 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.0...v2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 20:12:04 +00:00
dependabot-preview[bot]
b7b260d8f8 Bump rubocop-rails from 2.2.1 to 2.3.0 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.1...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 19:53:23 +00:00