mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 05:32:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 108 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace f28958be18 Merge branch 'dev' into fix/2106-followers 2019-09-05 12:02:13 +12:00
Brenda Wallace 2d6c022d43 Merge branch 'dev' into display 2019-09-05 10:13:54 +12:00
Brenda Wallace f3ac6c9a37 Merge pull request #2151 from Br3nda/fix/2105-padding 
Section padding
 2019-09-05 10:13:28 +12:00
Brenda Wallace cbbf84b305 Merge branch 'dev' into fix/2106-followers 2019-09-05 10:13:15 +12:00
Brenda Wallace dcc9e3edf3 Merge branch 'dev' into fix/2105-padding 2019-09-04 17:16:37 +12:00
dependabot-preview[bot] fedfd4fd08 Bump capybara from 3.28.0 to 3.29.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.28.0 to 3.29.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.28.0...3.29.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-03 09:55:52 +00:00
dependabot-preview[bot] 95c7fa2d93 Bump sidekiq from 5.2.7 to 6.0.0 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.7 to 6.0.0.
- [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.7...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 13:27:11 +00:00
dependabot-preview[bot] 64f2d208d4 Bump selenium-webdriver from 3.142.3 to 3.142.4 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.3 to 3.142.4.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 13:06:32 +00:00
dependabot-preview[bot] 6af25d2d63 Bump rubocop-rails from 2.3.1 to 2.3.2 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.1 to 2.3.2.
- [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.1...v2.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 12:38:25 +00:00
dependabot-preview[bot] 1ad256efa2 Bump csv_shaper from 1.3.0 to 1.3.1 
Bumps [csv_shaper](https://github.com/paulspringett/csv_shaper) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/paulspringett/csv_shaper/releases)
- [Commits](https://github.com/paulspringett/csv_shaper/compare/v1.3.0...v1.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 11:59:28 +00:00
dependabot-preview[bot] a866c1f991 Bump oj from 3.9.0 to 3.9.1 
Bumps [oj](https://github.com/ohler55/oj) from 3.9.0 to 3.9.1.
- [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.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 11:15:22 +00:00
dependabot-preview[bot] 82e2b56b0d Bump faker from 2.2.0 to 2.2.1 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.2.0 to 2.2.1.
- [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.2.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 10:09:06 +00:00
Brenda Wallace f16921d994 Remove extra whitespace 2019-09-01 21:22:59 +12:00
Brenda Wallace 4e9ba4f438 Merge css class 2019-09-01 20:50:57 +12:00
Brenda Wallace a50b0485ac find button by class 2019-09-01 20:46:46 +12:00
Brenda Wallace f121f7f3fe Place map on a high zindex, but below the menu 2019-09-01 20:41:12 +12:00
Brenda Wallace c53015b922 Scss lint 2019-09-01 20:34:34 +12:00
Brenda Wallace c122aa41d3 Scss lint 2019-09-01 20:30:19 +12:00
Brenda Wallace 2c75f62caf Avoid using id selectors 2019-09-01 20:23:59 +12:00
Brenda Wallace 017a942a41 Rename classes to name codeclimate happy 2019-09-01 19:58:47 +12:00
Brenda Wallace e4908fe299 Removing unused styles 2019-09-01 19:15:34 +12:00
Brenda Wallace 2a55f61a4c Section padding 
fixes #2105
 2019-09-01 16:29:54 +12:00
Brenda Wallace 5ded29ef7c Allow anyone to view followers - and tidy up display 
fixes #2106
 2019-08-31 14:25:31 +12:00
Brenda Wallace 777408a6dc Merge branch 'dev' into UTFGardenNames 2019-08-29 13:53:04 +12:00
dependabot-preview[bot] 22549c5b12 Bump faker from 2.1.2 to 2.2.0 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.1.2 to 2.2.0.
- [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.2...v2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 01:52:28 +00:00
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