Brenda Wallace
f5377662cf
Merge remote-tracking branch 'upstream/dev' into feature/dotenv
2020-08-01 20:17:33 +12:00
Brenda Wallace
efc2e70bf8
Remove figaro gem and use rails-dotenv
2020-08-01 20:16:33 +12:00
Brenda Wallace
4f14825caf
Merge remote-tracking branch 'upstream/mainline' into dev
2020-07-30 07:57:56 +12:00
dependabot-preview[bot]
39aa8bfb0f
Bump factory_bot_rails from 6.0.0 to 6.1.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.0.0...v6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-30 07:53:59 +12:00
dependabot-preview[bot]
aac0448f03
Bump rubocop-rails from 2.6.0 to 2.7.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.6.0 to 2.7.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.6.0...v2.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-29 17:08:52 +12:00
dependabot-preview[bot]
323e6ccd55
Bump unicorn from 5.5.5 to 5.6.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.5 to 5.6.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-29 17:08:38 +12:00
dependabot-preview[bot]
cc685a6c4d
Bump chartkick from 3.3.1 to 3.3.2
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.3.1 to 3.3.2.
- [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.3.1...v3.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-29 17:08:26 +12:00
dependabot-preview[bot]
61e0a76c08
Bump oj from 3.10.7 to 3.10.8
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.7 to 3.10.8.
- [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.10.7...v3.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-29 17:08:11 +12:00
dependabot-preview[bot]
047238c5f7
Merge pull request #2589 from Growstuff/dependabot/bundler/oj-3.10.7
2020-07-21 23:33:13 +00:00
dependabot-preview[bot]
e50de451bb
Bump oj from 3.10.6 to 3.10.7
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.6 to 3.10.7.
- [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.10.6...v3.10.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-21 22:18:52 +00:00
dependabot-preview[bot]
925e69fac5
Bump rubocop-rspec from 1.40.0 to 1.41.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.40.0 to 1.41.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.40.0...v1.41.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-22 10:16:43 +12:00
dependabot-preview[bot]
bcd7e144c4
Bump sidekiq from 6.0.7 to 6.1.0
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.7 to 6.1.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/v6.0.7...v6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-22 10:16:25 +12:00
Brenda Wallace
e146d7db4f
Update .codeclimate.yml
2020-07-22 10:14:40 +12:00
dependabot-preview[bot]
fdec444227
Bump rubocop from 0.86.0 to 0.88.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.86.0 to 0.88.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.86.0...v0.88.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-22 10:14:40 +12:00
dependabot-preview[bot]
62aea864e8
Bump searchkick from 4.4.0 to 4.4.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.4.0...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-29 11:30:55 +12:00
dependabot-preview[bot]
8ae8006348
Merge pull request #2581 from Growstuff/dependabot/bundler/scout_apm-2.6.8
2020-06-26 10:08:25 +00:00
dependabot-preview[bot]
977ade335b
Bump scout_apm from 2.6.7 to 2.6.8
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.7 to 2.6.8.
- [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.6.7...v2.6.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 09:30:19 +00:00
dependabot-preview[bot]
4b0fc5130e
Merge pull request #2578 from Growstuff/dependabot/bundler/faker-2.13.0
2020-06-26 09:28:17 +00:00
dependabot-preview[bot]
c760ef2766
Bump faker from 2.12.0 to 2.13.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.12.0 to 2.13.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.12.0...v2.13.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 09:00:17 +00:00
dependabot-preview[bot]
6c7da68716
Bump rails-controller-testing from 1.0.4 to 1.0.5
...
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing ) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/rails/rails-controller-testing/releases )
- [Commits](https://github.com/rails/rails-controller-testing/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 20:58:23 +12:00
dependabot-preview[bot]
241fdbce83
Bump rubocop from 0.85.1 to 0.86.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.85.1 to 0.86.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.85.1...v0.86.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-23 15:11:22 +12:00
dependabot-preview[bot]
dd12f638bc
Bump geocoder from 1.6.1 to 1.6.3
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.6.1 to 1.6.3.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.6.1...v1.6.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-23 14:29:19 +12:00
dependabot-preview[bot]
334dd0fffa
Bump capybara from 3.32.2 to 3.33.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.2 to 3.33.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.32.2...3.33.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-23 14:28:51 +12:00
Brenda Wallace
4213b05af4
Removed TODO about geocoder in gemfile
2020-06-20 11:26:57 +12:00
Brenda
61ea4da089
Updated test stubs to support geocoder 1.6
...
https://github.com/alexreisner/geocoder/issues/1258
2020-06-20 11:26:57 +12:00
dependabot[bot]
1d5ab7aa9b
Bump geocoder from 1.4.9 to 1.6.1
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.4.9 to 1.6.1.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.4.9...v1.6.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2020-06-20 11:26:57 +12:00
dependabot-preview[bot]
16122e3313
Bump factory_bot_rails from 5.2.0 to 6.0.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.2.0 to 6.0.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.2.0...v6.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-20 11:26:57 +12:00
Brenda Wallace
d2f4f666f2
Remove unused apps from deploy
2020-06-20 11:26:57 +12:00
Brenda Wallace
d344fd86b5
Migrate to mainline
2020-06-20 11:26:57 +12:00
dependabot-preview[bot]
1e31fe62ca
Bump searchkick from 4.3.1 to 4.4.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.3.1...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-20 11:26:57 +12:00
dependabot-preview[bot]
acd529abae
Bump loofah from 2.5.0 to 2.6.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.5.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-20 11:26:57 +12:00
Brenda Wallace
e315f78ac9
Removed TODO about geocoder in gemfile
2020-06-20 10:57:03 +12:00
Brenda
a4afeea025
Updated test stubs to support geocoder 1.6
...
https://github.com/alexreisner/geocoder/issues/1258
2020-06-20 10:57:03 +12:00
dependabot[bot]
4ba4abf6e9
Bump geocoder from 1.4.9 to 1.6.1
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.4.9 to 1.6.1.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.4.9...v1.6.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2020-06-20 10:57:03 +12:00
dependabot-preview[bot]
27c2cec1a1
Merge pull request #2574 from Growstuff/dependabot/bundler/factory_bot_rails-6.0.0
2020-06-19 20:04:50 +00:00
dependabot-preview[bot]
918f709cac
Bump factory_bot_rails from 5.2.0 to 6.0.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.2.0 to 6.0.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.2.0...v6.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-19 19:39:45 +00:00
Brenda Wallace
dbe332d6e5
Remove unused apps from deploy
2020-06-20 07:35:59 +12:00
Brenda Wallace
b43916f1eb
Migrate to mainline
2020-06-20 07:35:59 +12:00
dependabot-preview[bot]
edf6f4b646
Bump searchkick from 4.3.1 to 4.4.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.3.1...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-18 22:33:00 +12:00
Brenda Wallace
f952f83b9b
Merge branch 'mainline' into dev
2020-06-18 10:47:17 +12:00
Brenda Wallace
b523d359fc
Merge pull request #2570 from Growstuff/dependabot/bundler/loofah-2.6.0
...
Bump loofah from 2.5.0 to 2.6.0
2020-06-18 10:42:17 +12:00
dependabot-preview[bot]
c14abbea52
Bump loofah from 2.5.0 to 2.6.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.5.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-17 08:43:37 +00:00
Brenda Wallace
be014766d6
Merge pull request #2568 from Growstuff/dev
...
Production release
2020-06-17 16:03:00 +12:00
Daniel O'Connor
6247bb59b0
Merge pull request #2567 from Growstuff/dependabot/bundler/rack-2.2.3
...
[Security] Bump rack from 2.2.2 to 2.2.3
2020-06-16 13:34:33 +09:30
dependabot-preview[bot]
0ff701c9d5
[Security] Bump rack from 2.2.2 to 2.2.3
...
Bumps [rack](https://github.com/rack/rack ) from 2.2.2 to 2.2.3. **This update includes a security fix.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/v2.2.2...2.2.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-15 23:01:42 +00:00
Brenda Wallace
f08649bd00
Merge pull request #2555 from Br3nda/gem-upgrades
...
Gem upgrades, including Rails 5.2.4.3
2020-06-15 15:11:27 +12:00
Brenda Wallace
a6c378c517
Removed the space from file name
2020-06-15 15:11:03 +12:00
Brenda Wallace
3604acdb67
Added crop.parent back into api
2020-06-15 10:34:35 +12:00
Brenda Wallace
264e81249c
Merge remote-tracking branch 'upstream/dev' into gem-upgrades
...
Conflicts:
Gemfile.lock
2020-06-15 10:34:25 +12:00
dependabot-preview[bot]
dc4d82aea4
Bump rubocop-rspec from 1.39.0 to 1.40.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.39.0 to 1.40.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.39.0...v1.40.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-13 17:02:54 +12:00
dependabot-preview[bot]
c6c1fc5aa0
Bump devise from 4.7.1 to 4.7.2
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.1...v4.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-12 20:44:13 +12:00
Brenda Wallace
15a82d46bf
Merge pull request #2560 from Growstuff/dependabot/bundler/rubocop-0.85.1
...
Bump rubocop from 0.85.0 to 0.85.1
2020-06-09 17:03:01 +12:00
Brenda Wallace
b96701b304
Merge pull request #2561 from Growstuff/dependabot/bundler/capybara-email-3.0.2
...
Bump capybara-email from 3.0.1 to 3.0.2
2020-06-09 17:02:38 +12:00
dependabot-preview[bot]
9df23d0af8
Bump rubocop from 0.85.0 to 0.85.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.85.0 to 0.85.1.
- [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.85.0...v0.85.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-08 23:11:03 +00:00
dependabot-preview[bot]
8ff16ec4c8
Bump capybara-email from 3.0.1 to 3.0.2
...
Bumps [capybara-email](https://github.com/dockyard/capybara-email ) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/dockyard/capybara-email/releases )
- [Changelog](https://github.com/DavyJonesLocker/capybara-email/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dockyard/capybara-email/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-08 23:11:02 +00:00
dependabot-preview[bot]
b51de07b7e
Merge pull request #2557 from Growstuff/dependabot/bundler/platform-api-3.0.0
2020-06-08 23:09:04 +00:00
dependabot-preview[bot]
56592185d4
Bump platform-api from 2.2.0 to 3.0.0
...
Bumps [platform-api](https://github.com/heroku/platform-api ) from 2.2.0 to 3.0.0.
- [Release notes](https://github.com/heroku/platform-api/releases )
- [Changelog](https://github.com/heroku/platform-api/blob/master/CHANGELOG.md )
- [Commits](https://github.com/heroku/platform-api/compare/v2.2.0...v3.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-08 22:24:22 +00:00
Brenda Wallace
612017c818
Merge pull request #2559 from Growstuff/dependabot/bundler/rubocop-rails-2.6.0
...
Bump rubocop-rails from 2.5.2 to 2.6.0
2020-06-09 10:22:22 +12:00
dependabot-preview[bot]
1ec68f52fd
Bump rubocop-rails from 2.5.2 to 2.6.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.5.2 to 2.6.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.5.2...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-08 09:59:46 +00:00
Brenda Wallace
c223f1a937
Upgraded gems
2020-06-03 16:11:15 +12:00
Brenda Wallace
78677deaeb
Merge branch 'gem-upgrades' of github.com:Br3nda/growstuff into gem-upgrades
2020-06-03 15:50:32 +12:00
Brenda Wallace
0da31a3823
Adding precompile before search index in travis script
2020-06-03 15:50:03 +12:00
Brenda Wallace
06f64a91e9
Merge pull request #2549 from Growstuff/dev
...
Production release
2020-06-03 15:43:29 +12:00
codefactor-io
311004af50
[CodeFactor] Apply fixes
2020-06-03 03:31:15 +00:00
Brenda Wallace
e10e4285ce
Comment our crop parent on api resource until we can specify the model
2020-06-03 15:30:13 +12:00
Brenda Wallace
52258d6773
downgrade sprockets
2020-06-03 15:29:14 +12:00
Brenda Wallace
877e79ec68
Merge branch 'gem-upgrades' of github.com:Br3nda/growstuff into gem-upgrades
2020-06-03 15:27:22 +12:00
Brenda Wallace
b2cc346e92
Don't need to explitcyl add active support
2020-06-03 15:27:14 +12:00
Brenda Wallace
38e6e2cfab
Added manifest.js, because rails-sprockets need it now
2020-06-03 15:26:38 +12:00
Brenda Wallace
981bf367e7
Merge branch 'dev' into gem-upgrades
2020-06-03 10:44:42 +12:00
Brenda Wallace
08bde354b2
Gem upgrades, including Rails 5.2.4.3
2020-06-03 10:43:32 +12:00
dependabot-preview[bot]
672170b4d0
Merge pull request #2553 from Growstuff/dependabot/bundler/webdrivers-4.4.1
2020-06-02 12:51:22 +00:00
dependabot-preview[bot]
9d2302d4be
Bump webdrivers from 4.4.0 to 4.4.1
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.4.0 to 4.4.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.4.0...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-02 12:26:46 +00:00
dependabot-preview[bot]
de962ab281
Bump rubocop from 0.84.0 to 0.85.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.84.0 to 0.85.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.84.0...v0.85.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-03 00:24:21 +12:00
Daniel O'Connor
d7b591e876
Merge pull request #2551 from Growstuff/dependabot/bundler/faker-2.12.0
...
Bump faker from 2.11.0 to 2.12.0
2020-06-02 15:21:15 +09:30
Daniel O'Connor
bdd1e2beb9
Merge pull request #2552 from Growstuff/dependabot/bundler/responders-3.0.1
...
Bump responders from 3.0.0 to 3.0.1
2020-06-02 15:19:32 +09:30
Daniel O'Connor
5ef3c5729c
Merge pull request #2550 from Growstuff/dependabot/bundler/webdrivers-4.4.0
...
Bump webdrivers from 4.3.0 to 4.4.0
2020-06-02 15:19:06 +09:30
dependabot-preview[bot]
f526af8d44
Bump responders from 3.0.0 to 3.0.1
...
Bumps [responders](https://github.com/heartcombo/responders ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/heartcombo/responders/releases )
- [Changelog](https://github.com/heartcombo/responders/blob/master/CHANGELOG.md )
- [Commits](https://github.com/heartcombo/responders/compare/v3.0.0...v3.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-01 10:37:26 +00:00
dependabot-preview[bot]
8c2cd4c953
Bump faker from 2.11.0 to 2.12.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.11.0 to 2.12.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.11.0...v2.12.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-01 10:36:21 +00:00
dependabot-preview[bot]
9d171c6c84
Bump webdrivers from 4.3.0 to 4.4.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.3.0 to 4.4.0.
- [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.3.0...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-01 10:35:32 +00:00
Brenda Wallace
68694aa3c4
Gem upgrades
2020-06-01 14:08:05 +12:00
Brenda Wallace
61853a2584
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
Gemfile.lock
2020-06-01 14:04:38 +12:00
codefactor-io
0577dce474
[CodeFactor] Apply fixes
2020-06-01 14:02:34 +12:00
Brenda Wallace
cdd00e7372
Only allow get
2020-06-01 14:02:34 +12:00
Brenda Wallace
5600670fef
Only allow open CORS on the api
2020-06-01 14:02:34 +12:00
Brenda Wallace
32972a90fd
Removed commented out code
2020-06-01 14:02:34 +12:00
Brenda Wallace
048ec7791f
Increase max records on jsonapi to 100
2020-06-01 14:02:34 +12:00
Brenda Wallace
7482095894
CORS headers for an open api
2020-06-01 14:02:34 +12:00
dependabot-preview[bot]
5abd0578fd
Bump font-awesome-sass from 5.12.0 to 5.13.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.12.0 to 5.13.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-31 11:17:52 +12:00
Daniel O'Connor
3a2ba7b152
Merge pull request #2541 from Growstuff/dependabot/bundler/capybara-3.32.2
...
Bump capybara from 3.32.1 to 3.32.2
2020-05-28 22:23:18 +09:30
Daniel O'Connor
7b589903fa
Merge pull request #2546 from Growstuff/dependabot/bundler/rspec-rails-4.0.1
...
Bump rspec-rails from 4.0.0 to 4.0.1
2020-05-28 22:22:12 +09:30
dependabot-preview[bot]
38c69853a9
Bump rspec-rails from 4.0.0 to 4.0.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.0...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-26 08:41:40 +00:00
dependabot-preview[bot]
7e5119b6f9
Bump database_cleaner from 1.8.4 to 1.8.5
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.4 to 1.8.5.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.5/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.4...v1.8.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-25 16:33:30 +12:00
dependabot-preview[bot]
d824002e8a
Bump capybara from 3.32.1 to 3.32.2
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.1 to 3.32.2.
- [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.32.1...3.32.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 03:42:16 +00:00
dependabot-preview[bot]
579a8c5250
Merge pull request #2538 from Growstuff/dependabot/bundler/searchkick-4.3.1
2020-05-23 03:40:22 +00:00
dependabot-preview[bot]
4b9c2c8b6c
Bump searchkick from 4.3.0 to 4.3.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.3.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 02:55:48 +00:00
dependabot-preview[bot]
0c0bd202cf
Merge pull request #2537 from Growstuff/dependabot/bundler/better_errors-2.7.1
2020-05-23 02:53:54 +00:00
dependabot-preview[bot]
93125138f2
Bump better_errors from 2.6.0 to 2.7.1
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.6.0 to 2.7.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.6.0...v2.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 01:56:01 +00:00
dependabot-preview[bot]
bd583ad788
Merge pull request #2534 from Growstuff/dependabot/bundler/jquery-rails-4.4.0
2020-05-23 01:54:08 +00:00
dependabot-preview[bot]
8c59b6798e
Bump jquery-rails from 4.3.5 to 4.4.0
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 4.3.5 to 4.4.0.
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v4.3.5...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 01:26:47 +00:00
dependabot-preview[bot]
787fac21e6
Merge pull request #2539 from Growstuff/dependabot/bundler/rubocop-0.84.0
2020-05-23 01:25:01 +00:00
dependabot-preview[bot]
03254852e2
Bump rubocop from 0.81.0 to 0.84.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.81.0 to 0.84.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.81.0...v0.84.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 23:06:02 +00:00
dependabot-preview[bot]
6ca5ed3256
Merge pull request #2536 from Growstuff/dependabot/bundler/figaro-1.2.0
2020-05-22 23:03:21 +00:00
dependabot-preview[bot]
b0865dd9ad
Bump figaro from 1.1.1 to 1.2.0
...
Bumps [figaro](https://github.com/laserlemon/figaro ) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/laserlemon/figaro/releases )
- [Changelog](https://github.com/laserlemon/figaro/blob/master/CHANGELOG.md )
- [Commits](https://github.com/laserlemon/figaro/compare/v1.1.1...v1.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 21:37:09 +00:00
dependabot-preview[bot]
c924484149
Merge pull request #2542 from Growstuff/dependabot/bundler/validate_url-1.0.11
2020-05-22 21:35:07 +00:00
dependabot-preview[bot]
7ec4265d56
Bump validate_url from 1.0.8 to 1.0.11
...
Bumps [validate_url](https://github.com/perfectline/validates_url ) from 1.0.8 to 1.0.11.
- [Release notes](https://github.com/perfectline/validates_url/releases )
- [Commits](https://github.com/perfectline/validates_url/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 20:46:55 +00:00
dependabot-preview[bot]
d65984e91b
Merge pull request #2544 from Growstuff/dependabot/bundler/bootstrap-4.5.0
2020-05-22 20:44:44 +00:00
dependabot-preview[bot]
7642bb8554
Bump bootstrap from 4.4.1 to 4.5.0
...
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.4.1 to 4.5.0.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases )
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md )
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.4.1...v4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 19:49:46 +00:00
dependabot-preview[bot]
cadef2746e
Bump puma from 4.3.3 to 4.3.5
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
f67ba83d86
Bump unicorn from 5.5.4 to 5.5.5
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.4 to 5.5.5.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
6d4f4fa662
Bump rubocop-rspec from 1.38.1 to 1.39.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.38.1 to 1.39.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.38.1...v1.39.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
15e656700a
Bump byebug from 11.1.1 to 11.1.3
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.1.1 to 11.1.3.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.1...v11.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
84b587358b
Bump sidekiq from 6.0.6 to 6.0.7
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.6 to 6.0.7.
- [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/v6.0.6...v6.0.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
a338a27d4c
Bump bootstrap_form from 4.4.0 to 4.5.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases )
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.4.0...v4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
bc36f8b48b
Bump rswag-specs from 2.2.0 to 2.3.1
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Awesome Code
ad1d3738a8
Auto corrected by following Lint Ruby Layout/EmptyLineAfterMagicComment
2020-05-23 07:48:28 +12:00
Awesome Code
c2e66b9dac
Auto corrected by following Lint Ruby Lint/RedundantCopEnableDirective
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c6643fbf7c
Bump webdrivers from 4.2.0 to 4.3.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.2.0 to 4.3.0.
- [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.2.0...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Awesome Code
5816b13244
Auto corrected by following Lint Ruby Lint/RedundantCopDisableDirective
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
660b77cbc0
Bump rswag-api from 2.2.0 to 2.3.1
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
481c339f12
Bump rswag-ui from 2.2.0 to 2.3.1
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c3bdeb9c6a
Bump loofah from 2.4.0 to 2.5.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
61f164db0e
Bump capybara from 3.32.0 to 3.32.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.0 to 3.32.1.
- [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.32.0...3.32.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Brenda Wallace
bfc495c6f6
Updating codeclimate to look at scss filesl
2020-05-23 07:48:28 +12:00
Brenda Wallace
3d26b4b120
Removing ignores in codeclimate config
2020-05-23 07:48:28 +12:00
Brenda Wallace
4362b80d1e
Adding scss lint config
2020-05-23 07:48:28 +12:00
Brenda Wallace
12e08494d1
Bumping rubocop to 0.81
2020-05-23 07:48:28 +12:00
Awesome Code
923e2f07bc
Auto corrected by following Lint Ruby RSpec/ExampleWording
2020-05-23 07:48:28 +12:00
Awesome Code
83462275e7
Auto corrected by following Lint Ruby Rails/HttpStatus
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
b5c17f472f
Bump oj from 3.10.5 to 3.10.6
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.5 to 3.10.6.
- [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.10.5...v3.10.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Awesome Code
593059d4aa
Auto corrected by following Lint Ruby Capybara/CurrentPathExpectation
2020-05-23 07:48:28 +12:00
Awesome Code
4c0899790a
Auto corrected by following Lint Ruby RSpec/NotToNot
2020-05-23 07:48:28 +12:00
Awesome Code
b8c3a95e1a
Auto corrected by following Lint Ruby RSpec/SharedContext
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
dae8922ca1
Bump rubocop-rails from 2.5.1 to 2.5.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.5.1 to 2.5.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.5.1...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
a93a5f2c29
Bump database_cleaner from 1.8.3 to 1.8.4
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.3 to 1.8.4.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.3...v1.8.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
2a31f628e7
Bump rubocop-rails from 2.4.2 to 2.5.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.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.4.2...v2.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
aec1f0a543
Bump rubocop from 0.80.1 to 0.81.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.1 to 0.81.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.80.1...v0.81.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
24c4697ae5
Bump capybara from 3.31.0 to 3.32.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.31.0 to 3.32.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.31.0...3.32.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c479bb5ba3
Bump faker from 2.10.2 to 2.11.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.2 to 2.11.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.10.2...v2.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
57b71e3f89
Bump sidekiq from 6.0.5 to 6.0.6
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.5 to 6.0.6.
- [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/v6.0.5...v6.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
19ac81d929
Bump unicorn from 5.5.3 to 5.5.4
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.3 to 5.5.4.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
4d232379b2
Bump rspec-rails from 3.9.1 to 4.0.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
3121db42e3
[Security] Bump json from 2.2.0 to 2.3.0
...
Bumps [json](https://github.com/flori/json ) from 2.2.0 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/flori/json/releases )
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md )
- [Commits](https://github.com/flori/json/compare/v2.2.0...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
e5cda2b969
Bump scout_apm from 2.6.6 to 2.6.7
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.6 to 2.6.7.
- [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.6.6...v2.6.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
83bd9d7f01
Bump cancancan from 3.0.2 to 3.1.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
1bf244d7a7
Bump rspec-rails from 3.9.0 to 3.9.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
b2053d81d9
Bump bootstrap_form from 4.3.0 to 4.4.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases )
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.3.0...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c3cde1b2df
Bump i18n-tasks from 0.9.30 to 0.9.31
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
4f006aece6
Bump oj from 3.10.2 to 3.10.5
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.2 to 3.10.5.
- [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.10.2...v3.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
b0d01e96ca
Bump hashie from 3.6.0 to 4.1.0
...
Bumps [hashie](https://github.com/hashie/hashie ) from 3.6.0 to 4.1.0.
- [Release notes](https://github.com/hashie/hashie/releases )
- [Changelog](https://github.com/hashie/hashie/blob/master/CHANGELOG.md )
- [Commits](https://github.com/hashie/hashie/compare/v3.6.0...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
c27a70f72d
Bump leaflet-rails from 1.5.1 to 1.6.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.5.1...v1.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:48:28 +12:00
Awesome Code
d9eb96b8f7
Auto corrected by following Lint Ruby RSpec/HookArgument
2020-05-23 07:48:28 +12:00
dependabot-preview[bot]
831b41bc23
Bump puma from 4.3.3 to 4.3.5
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-23 07:47:43 +12:00
dependabot-preview[bot]
d568e25299
Merge pull request #2528 from Growstuff/dependabot/bundler/unicorn-5.5.5
2020-05-22 06:13:13 +00:00
dependabot-preview[bot]
859a12dda6
Bump unicorn from 5.5.4 to 5.5.5
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.4 to 5.5.5.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 04:58:52 +00:00
dependabot-preview[bot]
183b700e4d
Merge pull request #2532 from Growstuff/dependabot/bundler/rubocop-rspec-1.39.0
2020-05-22 04:56:32 +00:00
dependabot-preview[bot]
da61c25ed5
Bump rubocop-rspec from 1.38.1 to 1.39.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.38.1 to 1.39.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.38.1...v1.39.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 03:49:56 +00:00
dependabot-preview[bot]
f42a496434
Merge pull request #2526 from Growstuff/dependabot/bundler/byebug-11.1.3
2020-05-22 03:47:38 +00:00
dependabot-preview[bot]
f4e05f96be
Bump byebug from 11.1.1 to 11.1.3
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.1.1 to 11.1.3.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.1...v11.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 03:19:33 +00:00
dependabot-preview[bot]
356f5fee84
Bump sidekiq from 6.0.6 to 6.0.7
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.6 to 6.0.7.
- [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/v6.0.6...v6.0.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-22 15:17:19 +12:00
dependabot-preview[bot]
df63a7a7d6
Bump bootstrap_form from 4.4.0 to 4.5.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases )
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.4.0...v4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-13 12:45:17 +12:00
dependabot-preview[bot]
f19fc1bb1b
Bump rswag-specs from 2.2.0 to 2.3.1
...
Bumps [rswag-specs](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-16 15:49:32 +12:00
Awesome Code
8cd0628ba6
Auto corrected by following Lint Ruby Layout/EmptyLineAfterMagicComment
2020-04-16 13:59:48 +12:00
Awesome Code
f570557ddb
Auto corrected by following Lint Ruby Lint/RedundantCopEnableDirective
2020-04-16 13:59:32 +12:00
dependabot-preview[bot]
5f3e15cc44
Bump webdrivers from 4.2.0 to 4.3.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.2.0 to 4.3.0.
- [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.2.0...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-16 13:59:11 +12:00
Awesome Code
c764b0a28f
Auto corrected by following Lint Ruby Lint/RedundantCopDisableDirective
2020-04-14 10:49:54 +12:00
dependabot-preview[bot]
e01d47863f
Bump rswag-api from 2.2.0 to 2.3.1
...
Bumps [rswag-api](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 10:47:40 +12:00
dependabot-preview[bot]
f544a2e03c
Bump rswag-ui from 2.2.0 to 2.3.1
...
Bumps [rswag-ui](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 10:47:24 +12:00
dependabot-preview[bot]
5a0684a60a
Bump loofah from 2.4.0 to 2.5.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 10:47:10 +12:00
dependabot-preview[bot]
8fd5fd1a03
Bump capybara from 3.32.0 to 3.32.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.32.0 to 3.32.1.
- [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.32.0...3.32.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 10:46:56 +12:00
Brenda Wallace
74738a340d
Updating codeclimate to look at scss filesl
2020-04-14 10:46:42 +12:00
Brenda Wallace
d90eb5d7c7
Removing ignores in codeclimate config
2020-04-14 10:46:42 +12:00
Brenda Wallace
a185d39eff
Adding scss lint config
2020-04-14 10:46:42 +12:00
Brenda Wallace
54e4c52dc0
Bumping rubocop to 0.81
2020-04-14 10:46:42 +12:00
Awesome Code
8b2fc2fb0b
Auto corrected by following Lint Ruby RSpec/ExampleWording
2020-04-14 09:07:08 +12:00
Awesome Code
74a8e1c54f
Auto corrected by following Lint Ruby Rails/HttpStatus
2020-04-14 09:06:46 +12:00
dependabot-preview[bot]
08caa2ed32
Bump oj from 3.10.5 to 3.10.6
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.5 to 3.10.6.
- [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.10.5...v3.10.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-14 09:06:24 +12:00
Awesome Code
59d2096df1
Auto corrected by following Lint Ruby Capybara/CurrentPathExpectation
2020-04-14 09:06:01 +12:00
Awesome Code
f6b16f5f65
Auto corrected by following Lint Ruby RSpec/NotToNot
2020-04-14 09:05:30 +12:00
Awesome Code
6d1137818d
Auto corrected by following Lint Ruby RSpec/SharedContext
2020-04-14 09:04:17 +12:00
dependabot-preview[bot]
f1cbe130bd
Bump rubocop-rails from 2.5.1 to 2.5.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.5.1 to 2.5.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.5.1...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-13 11:43:19 +12:00
dependabot-preview[bot]
0fd0e55eb2
Bump database_cleaner from 1.8.3 to 1.8.4
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.3 to 1.8.4.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.3...v1.8.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-09 15:10:56 +12:00
dependabot-preview[bot]
58eef2ee9c
Merge pull request #2480 from Growstuff/dependabot/bundler/rubocop-rails-2.5.1
2020-04-05 01:45:56 +00:00
dependabot-preview[bot]
313e611ded
Bump rubocop-rails from 2.4.2 to 2.5.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.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.4.2...v2.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-05 01:23:28 +00:00
dependabot-preview[bot]
55583947ca
Merge pull request #2479 from Growstuff/dependabot/bundler/rubocop-0.81.0
2020-04-05 01:21:38 +00:00
dependabot-preview[bot]
169c5e49f6
Bump rubocop from 0.80.1 to 0.81.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.1 to 0.81.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.80.1...v0.81.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-05 00:59:54 +00:00
dependabot-preview[bot]
6d19471a03
Bump capybara from 3.31.0 to 3.32.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.31.0 to 3.32.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.31.0...3.32.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-05 12:58:03 +12:00
dependabot-preview[bot]
8fffcf6357
Merge pull request #2476 from Growstuff/dependabot/bundler/faker-2.11.0
2020-03-26 23:30:12 +00:00
dependabot-preview[bot]
3d23ce571a
Bump faker from 2.10.2 to 2.11.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.2 to 2.11.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.10.2...v2.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-26 23:05:14 +00:00
dependabot-preview[bot]
ff0e4eef86
Merge pull request #2474 from Growstuff/dependabot/bundler/sidekiq-6.0.6
2020-03-26 23:03:16 +00:00
dependabot-preview[bot]
bc3cb466ca
Bump sidekiq from 6.0.5 to 6.0.6
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.5 to 6.0.6.
- [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/v6.0.5...v6.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-26 22:18:37 +00:00
dependabot-preview[bot]
2f798a9026
Merge pull request #2475 from Growstuff/dependabot/bundler/unicorn-5.5.4
2020-03-26 22:16:51 +00:00
dependabot-preview[bot]
e05be935e8
Bump unicorn from 5.5.3 to 5.5.4
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.3 to 5.5.4.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-26 21:49:47 +00:00
dependabot-preview[bot]
77ea202e2e
Bump rspec-rails from 3.9.1 to 4.0.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.1 to 4.0.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-27 10:47:59 +13:00
dependabot-preview[bot]
3d7b6f5a1f
[Security] Bump json from 2.2.0 to 2.3.0
...
Bumps [json](https://github.com/flori/json ) from 2.2.0 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/flori/json/releases )
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md )
- [Commits](https://github.com/flori/json/compare/v2.2.0...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-21 18:16:18 +13:00
dependabot-preview[bot]
44a66ba3f2
Bump scout_apm from 2.6.6 to 2.6.7
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.6 to 2.6.7.
- [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.6.6...v2.6.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-19 10:50:47 +13:00
dependabot-preview[bot]
a07235bea0
Bump cancancan from 3.0.2 to 3.1.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-17 07:16:39 +13:00
dependabot-preview[bot]
82146ea835
Bump rspec-rails from 3.9.0 to 3.9.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-12 00:07:19 +13:00
dependabot-preview[bot]
2990c31245
Merge pull request #2467 from Growstuff/dependabot/bundler/bootstrap_form-4.4.0
2020-03-10 09:58:27 +00:00
dependabot-preview[bot]
f81538b873
Bump bootstrap_form from 4.3.0 to 4.4.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases )
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.3.0...v4.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-10 09:37:35 +00:00
dependabot-preview[bot]
cbe75903fe
Bump i18n-tasks from 0.9.30 to 0.9.31
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.30 to 0.9.31.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.30...v0.9.31 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-10 22:35:30 +13:00
dependabot-preview[bot]
6a1a2d3094
Bump oj from 3.10.2 to 3.10.5
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.2 to 3.10.5.
- [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.10.2...v3.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-08 10:52:12 +13:00
dependabot-preview[bot]
d8aa9a8839
Merge pull request #2464 from Growstuff/dependabot/bundler/hashie-4.1.0
2020-03-06 08:13:29 +00:00
dependabot-preview[bot]
6cef7ef167
Bump hashie from 3.6.0 to 4.1.0
...
Bumps [hashie](https://github.com/hashie/hashie ) from 3.6.0 to 4.1.0.
- [Release notes](https://github.com/hashie/hashie/releases )
- [Changelog](https://github.com/hashie/hashie/blob/master/CHANGELOG.md )
- [Commits](https://github.com/hashie/hashie/compare/v3.6.0...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-06 07:50:23 +00:00
Brenda Wallace
e6d26d5d21
Merge pull request #2466 from Growstuff/dependabot/bundler/leaflet-rails-1.6.0
...
Bump leaflet-rails from 1.5.1 to 1.6.0
2020-03-06 20:48:28 +13:00
dependabot-preview[bot]
4fd0924194
Bump leaflet-rails from 1.5.1 to 1.6.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.5.1...v1.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-05 08:04:45 +00:00
Brenda Wallace
6e9babd1ca
Merge pull request #2463 from Growstuff/awesomecode-lint-ruby-rspec-hookargument-43686
...
Auto corrected by following Lint Ruby RSpec/HookArgument
2020-03-04 14:58:45 +13:00
Brenda Wallace
36e24c9b64
Merge pull request #2459 from Growstuff/dev
...
Production release
2020-03-04 14:57:28 +13:00
Awesome Code
132a961008
Auto corrected by following Lint Ruby RSpec/HookArgument
2020-03-04 00:37:36 +00:00
dependabot-preview[bot]
9dc7c289bd
Merge pull request #2455 from Growstuff/dependabot/bundler/haml_lint-0.35.0
2020-03-04 00:34:17 +00:00
dependabot-preview[bot]
0bc84f885c
Bump haml_lint from 0.34.2 to 0.35.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.34.2 to 0.35.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.34.2...v0.35.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-03 23:18:27 +00:00
Brenda Wallace
85a645822a
disable percy
2020-03-04 11:35:15 +13:00
Brenda Wallace
917ec11b80
Merge pull request #2461 from Growstuff/awesomecode-lint-ruby-rspec-describedclass-43668
...
Auto corrected by following Lint Ruby RSpec/DescribedClass
2020-03-04 11:33:47 +13:00
Brenda Wallace
d4fb4e79a1
Merge pull request #2454 from Growstuff/dependabot/bundler/rubocop-0.80.1
...
Bump rubocop from 0.80.0 to 0.80.1
2020-03-04 11:33:14 +13:00
Awesome Code
4cbe6ca244
Auto corrected by following Lint Ruby RSpec/DescribedClass
2020-03-03 22:33:13 +00:00
Brenda Wallace
c4732fbda4
bump codeclimate to 0.80
2020-03-04 11:32:48 +13:00
dependabot-preview[bot]
244b62f0d8
Bump rubocop from 0.80.0 to 0.80.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.0 to 0.80.1.
- [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.80.0...v0.80.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-03 22:31:56 +00:00
Brenda Wallace
a6bb63d1b3
Merge pull request #2458 from Growstuff/dependabot/bundler/omniauth-1.9.1
...
[Security] Bump omniauth from 1.9.0 to 1.9.1
2020-03-04 11:30:01 +13:00
dependabot-preview[bot]
4fd73589be
[Security] Bump omniauth from 1.9.0 to 1.9.1
...
Bumps [omniauth](https://github.com/omniauth/omniauth ) from 1.9.0 to 1.9.1. **This update includes a security fix.**
- [Release notes](https://github.com/omniauth/omniauth/releases )
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.0...v1.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-03 07:58:20 +00:00
Brenda Wallace
a1f130fb54
Merge pull request #2451 from Growstuff/dependabot/bundler/puma-4.3.3
...
[Security] Bump puma from 4.3.2 to 4.3.3
2020-03-03 15:24:17 +13:00
Brenda Wallace
88ae62fef4
Merge pull request #2453 from Br3nda/fix/member-link
...
BUGFIX: member slug needed on photos, to make link
2020-03-03 15:23:42 +13:00
Brenda Wallace
55147391f3
Merge pull request #2457 from Br3nda/fix/image-in-email
...
Fix/image in email
2020-03-03 15:23:23 +13:00
Brenda Wallace
89400e7677
Send reminder on mondays
2020-03-03 11:37:30 +13:00
Brenda Wallace
b61f6dd54d
Added link to profile page
2020-03-03 11:35:08 +13:00
Brenda Wallace
e8e5c936d5
Remove broken image from planting reminder
2020-03-03 11:33:59 +13:00
Brenda Wallace
0ae2aeb4a7
Apply suggestions from code review
...
Use delegated attributes
2020-03-02 15:51:29 +13:00
Brenda Wallace
9fa3f36436
BUGFUX: member slug needed on photos, to make link
2020-03-02 15:01:34 +13:00
Brenda Wallace
35f8289b06
Turn off caching on modal form
2020-03-02 12:53:29 +13:00
dependabot-preview[bot]
bc8447f3a4
[Security] Bump puma from 4.3.2 to 4.3.3
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.2 to 4.3.3. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.3.2...v4.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-01 23:30:49 +00:00
Brenda Wallace
a864a018d5
Fix icon images
2020-03-02 12:27:57 +13:00
Brenda Wallace
9594c2a63f
Always show photos on harvests
2020-03-02 12:22:48 +13:00
Brenda Wallace
bb7a9b17c6
Merge remote-tracking branch 'upstream/dev'
2020-03-02 12:22:15 +13:00
Brenda Wallace
3c14496936
BUGFIX - caching on harvest form
2020-03-02 12:22:00 +13:00
Brenda Wallace
f4a39b1fd4
Merge pull request #2450 from Growstuff/dev
...
Production release
2020-03-02 12:16:03 +13:00
Brenda Wallace
7a48b099aa
Merge pull request #2449 from Growstuff/imgbot
...
[ImgBot] Optimize images
2020-03-02 11:52:12 +13:00
ImgBotApp
d33db24f3c
[ImgBot] Optimize images
...
*Total -- 7.73kb -> 7.71kb (0.24%)
/app/assets/images/icons/plant_parts/other.svg -- 0.96kb -> 0.96kb (0.41%)
/app/assets/images/icons/plant_parts/seed.svg -- 1.86kb -> 1.86kb (0.26%)
/app/assets/images/icons/plant_parts/stem.svg -- 2.29kb -> 2.28kb (0.21%)
/app/assets/images/icons/plant_parts/root.svg -- 2.62kb -> 2.62kb (0.19%)
Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com >
2020-03-01 22:50:49 +00:00
Brenda Wallace
8e7ae445d7
Merge pull request #2442 from Growstuff/dependabot/bundler/active_utils-3.3.17
...
Bump active_utils from 3.3.16 to 3.3.17
2020-03-02 11:50:30 +13:00
Brenda Wallace
bf4d1afe99
Merge pull request #2443 from Br3nda/feature/crop-action-modals
...
Harvesting, planting and seed saving modal forms
2020-03-02 11:50:11 +13:00
Brenda Wallace
85d473d65c
Adding descriptions
2020-03-02 11:49:50 +13:00
Brenda Wallace
4a23bcefd1
Tests tradeable and not tradeable seed saving
2020-03-02 10:21:54 +13:00
Brenda Wallace
9955d26c1b
Added options from seed saving form to spec
2020-03-01 08:48:21 +13:00
Brenda
f13bc44e7e
update link labels in spec
2020-03-01 08:33:04 +13:00
Brenda
5c7b8254b0
plant_part is on harvest not planting
2020-03-01 08:32:53 +13:00
Brenda
7039240bdc
always show photos section on harvests
2020-03-01 07:57:19 +13:00
Brenda
cc83cb23bc
fix plant part selection bug on editing harvests
2020-03-01 07:57:04 +13:00
Brenda
88ac147dda
Restore old labels on buttons
2020-03-01 07:56:34 +13:00
Brenda
ef2820eb8c
fix deprecation warning from faker
2020-03-01 07:56:02 +13:00
Brenda
7e42d84a21
group crop actions in to button bar
2020-03-01 07:55:47 +13:00
Brenda Wallace
0fdbac5bc3
Update plant_parts.rb
2020-02-29 23:01:00 +13:00
Brenda Wallace
46220b8275
Update plant_parts.rb
2020-02-29 22:01:02 +13:00
Brenda Wallace
4e093716f2
Add number on the end
2020-02-29 21:30:08 +13:00
Brenda Wallace
52e28f4ae2
Link new harvest to planting
2020-02-29 20:07:30 +13:00
Brenda Wallace
f4acbaa89a
Use pokemon for plant parts
2020-02-29 19:53:39 +13:00
Brenda
c099580b70
Update link in spec
2020-02-29 19:49:57 +13:00
Brenda
3c392d43ee
Crop#show with seeds modal
2020-02-29 19:49:49 +13:00
Brenda
bb400dabda
Add new garden button on modal planting form
2020-02-29 13:37:27 +13:00
Brenda
43180bd6cb
unique plantpart names in factory bot
2020-02-29 13:26:51 +13:00
Brenda
f3cd341659
add an id to the harvest modal so the test can find it
2020-02-29 13:26:36 +13:00
Brenda
fd80fc98f1
use a default icon if no plant_part icon
2020-02-29 13:26:20 +13:00
Brenda Wallace
d0154a8b60
Fall back on planting icon when plant part icon does not exist
2020-02-29 12:34:28 +13:00
Brenda
cbec6b2743
Remove harvest button from crop info card until we can distinguish between it and the planting crop button
2020-02-29 12:20:53 +13:00
Brenda Wallace
b5f7156677
Makes sure factorybot plant names point to images that exist
2020-02-29 12:09:26 +13:00
Brenda
1503b39ad3
Seed saving modal
2020-02-29 11:19:19 +13:00
Brenda Wallace
97208b99c5
Plantings modal form on crops#show
2020-02-29 10:28:32 +13:00
Brenda Wallace
777877ab06
Added plantings modal button to crop info card
2020-02-29 10:25:45 +13:00
Brenda Wallace
6c94337047
Added Plantings modal form
2020-02-29 10:23:00 +13:00
Brenda Wallace
68d157b048
Removed extra harvest button on plantings#show
2020-02-29 10:22:46 +13:00
Brenda Wallace
8dd47e0639
Added harvest button to crop info card
2020-02-29 10:09:06 +13:00
dependabot-preview[bot]
952a97f5a5
Bump puma from 4.3.1 to 4.3.2
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
f58732bcab
Bump will_paginate from 3.2.1 to 3.3.0
...
Bumps [will_paginate](https://github.com/mislav/will_paginate ) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mislav/will_paginate/releases )
- [Commits](https://github.com/mislav/will_paginate/compare/v3.2.1...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
720a0fa645
Bump better_errors from 2.5.1 to 2.6.0
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
af1948f95c
[Security] Bump nokogiri from 1.10.7 to 1.10.8
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
dependabot-preview[bot]
f7013658a5
Bump database_cleaner from 1.8.2 to 1.8.3
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.3/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.2...v1.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 10:05:56 +13:00
Brenda Wallace
a6ce1e05cf
Lower case in form title
2020-02-29 10:02:47 +13:00
Brenda
8955aab2bb
caching plant parts
2020-02-29 09:59:44 +13:00
Brenda Wallace
5d43575eae
Merge branch 'feature/crop-action-modals' of github.com:Br3nda/growstuff into feature/crop-action-modals
...
Conflicts:
app/views/harvests/_modal.html.haml
2020-02-29 09:38:21 +13:00
Brenda Wallace
5444d15242
Merge branch 'dev' into feature/crop-action-modals
2020-02-29 09:36:36 +13:00
dependabot-preview[bot]
63c28b3b18
Bump active_utils from 3.3.16 to 3.3.17
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.16 to 3.3.17.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.16...v3.3.17 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-28 20:36:24 +00:00
Brenda Wallace
b2ff247a31
Apply suggestions from code review
...
Co-Authored-By: Martina <922964+simicic@users.noreply.github.com >
2020-02-29 09:36:05 +13:00
dependabot-preview[bot]
011ce39edb
Bump puma from 4.3.1 to 4.3.2
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-29 09:34:25 +13:00
Brenda
d2509afca2
Harvest button on plantings
2020-02-29 09:33:40 +13:00
dependabot-preview[bot]
236caa0d32
Bump will_paginate from 3.2.1 to 3.3.0
...
Bumps [will_paginate](https://github.com/mislav/will_paginate ) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mislav/will_paginate/releases )
- [Commits](https://github.com/mislav/will_paginate/compare/v3.2.1...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-28 10:21:28 +13:00
dependabot-preview[bot]
1c57e5266f
Bump better_errors from 2.5.1 to 2.6.0
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-28 07:16:42 +13:00
Brenda Wallace
a5c770c2b5
Update app/views/crops/_thumbnail.html.haml
...
Co-Authored-By: Martina <922964+simicic@users.noreply.github.com >
2020-02-27 09:42:09 +13:00
Brenda Wallace
33091fbadc
Merge branch 'dev' into feature/crop-action-modals
2020-02-26 11:38:38 +13:00
Brenda Wallace
94d92f8748
Merge pull request #2441 from Growstuff/dependabot/bundler/nokogiri-1.10.8
...
[Security] Bump nokogiri from 1.10.7 to 1.10.8
2020-02-25 11:40:26 +13:00
dependabot-preview[bot]
e54330a4d7
[Security] Bump nokogiri from 1.10.7 to 1.10.8
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 19:47:44 +00:00
Brenda
9abb84ccba
Harvesting modal form
2020-02-24 11:51:37 +13:00
Brenda Wallace
9eba58839d
Merge pull request #2431 from Growstuff/dependabot/bundler/database_cleaner-1.8.3
...
Bump database_cleaner from 1.8.2 to 1.8.3
2020-02-23 20:01:34 +13:00
Brenda Wallace
92aa827df9
Merge pull request #2440 from Growstuff/dev
...
Production release
2020-02-23 20:01:10 +13:00
Brenda Wallace
a4a3745d90
Merge branch 'master' into dev
2020-02-23 17:12:18 +13:00
dependabot-preview[bot]
5bd97902da
Bump database_cleaner from 1.8.2 to 1.8.3
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.3/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.2...v1.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-23 04:05:47 +00:00
Brenda Wallace
edb3529d2d
Merge pull request #2430 from Growstuff/dependabot/bundler/rubocop-0.80.0
...
Bump rubocop from 0.79.0 to 0.80.0
2020-02-23 17:04:23 +13:00
Brenda Wallace
676596191d
Merge pull request #2439 from Br3nda/tidy-members
...
Tidy members profile page
2020-02-23 17:03:58 +13:00
Brenda
435c164e15
Fixed typo error in view
2020-02-23 15:47:23 +13:00
codefactor-io
28ff058366
[CodeFactor] Apply fixes
2020-02-22 23:04:59 +00:00
Brenda Wallace
7e13431c27
Merge remote-tracking branch 'upstream/dev' into tidy-members
...
Conflicts:
app/views/members/_full_summary.html.haml
2020-02-23 12:04:20 +13:00
Brenda Wallace
71ccd52c59
Fix harvest thumbnails
2020-02-23 12:03:14 +13:00
Brenda
36bad1cda0
Fix mobile display of member profiles
2020-02-23 11:42:07 +13:00
dependabot-preview[bot]
bb13bbf27e
Bump rubocop from 0.79.0 to 0.80.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.79.0 to 0.80.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.79.0...v0.80.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-22 00:15:34 +00:00
dependabot-preview[bot]
cf440b444c
Bump searchkick from 4.2.1 to 4.3.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.2.1 to 4.3.0.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.2.1...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-22 13:13:29 +13:00
Brenda Wallace
c85abe0bd1
Member planting progress ( #2437 )
...
* Show member plantings summary on member page
* Remove reference to current member
* Tidy up member planting progress section
2020-02-22 13:13:07 +13:00
Brenda Wallace
0177b872db
Member planting progress ( #2437 )
...
* Show member plantings summary on member page
* Remove reference to current member
* Tidy up member planting progress section
2020-02-22 12:29:02 +13:00
Brenda Wallace
9df084a859
Merge branch 'dev' into member-planting-progress
2020-02-22 07:51:30 +13:00
Brenda Wallace
878ae9073c
Tidy up member planting progress section
2020-02-22 07:49:56 +13:00
Brenda Wallace
6c9f6b7520
Merge pull request #2436 from Growstuff/dev
...
Production release
2020-02-21 16:38:04 +13:00
Brenda Wallace
c71e9b01de
Remove reference to current member
2020-02-21 15:56:59 +13:00
Brenda
e3594eee02
Show member plantings summary on member page
2020-02-21 15:56:59 +13:00
Brenda Wallace
b72e866362
Remove reference to current member
2020-02-21 14:40:53 +13:00
Brenda
d3cdaea218
Show member plantings summary on member page
2020-02-20 23:01:04 +13:00
Brenda
3ab67786e0
Wrapping the whole layout, to center the page
2020-02-20 22:39:12 +13:00
Brenda Wallace
325729751a
Move search bar to middle, hide sitename on small screens
2020-02-20 19:29:35 +13:00
Brenda Wallace
07a9891ec4
Fix spec
2020-02-20 19:29:35 +13:00
Brenda Wallace
e8c7a9e1f5
Fixed menu link label in another spec
2020-02-20 19:29:35 +13:00
Brenda Wallace
155f2ed548
Fix menu link label in spec
2020-02-20 19:29:35 +13:00
Brenda Wallace
76a3dcfc93
Added breadcrumbs to members
2020-02-20 19:29:35 +13:00
Brenda Wallace
63af7eca9f
Fix wrapping of admin menu, and put profile link (with image) last
2020-02-20 19:29:35 +13:00
Brenda Wallace
e986eafc0b
Move search bar to middle, hide sitename on small screens
2020-02-20 16:04:09 +13:00
Brenda Wallace
d4517bf298
Fix spec
2020-02-20 15:03:35 +13:00
Brenda Wallace
fe1eda3f30
Fixed menu link label in another spec
2020-02-20 15:03:35 +13:00
Brenda Wallace
0ca529ea8f
Fix menu link label in spec
2020-02-20 15:03:35 +13:00
Brenda Wallace
aa2893f666
Added breadcrumbs to members
2020-02-20 15:03:35 +13:00
Brenda Wallace
2006210d4e
Fix wrapping of admin menu, and put profile link (with image) last
2020-02-20 15:03:35 +13:00
Brenda Wallace
b208850b7d
Full width on mobile
2020-02-19 20:25:06 +13:00
Brenda Wallace
724ba246a3
More crops
2020-02-19 17:00:06 +13:00
Brenda Wallace
00a984a3a5
Removed cute icon that was making sections not line up
2020-02-19 16:59:13 +13:00
Brenda Wallace
bc59827009
Col for recent crops
2020-02-19 16:45:45 +13:00
Brenda Wallace
2208a35b2f
More space on home
2020-02-19 16:43:33 +13:00
Brenda Wallace
3764544965
Ten crops on home page
2020-02-19 16:27:03 +13:00
Brenda Wallace
495b52c2ef
Merge remote-tracking branch 'upstream/dev'
2020-02-19 16:26:29 +13:00
Brenda Wallace
a60a1ded32
Nine seeds on home page
2020-02-19 16:25:36 +13:00
dependabot-preview[bot]
b56cc37991
Merge pull request #2427 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.1
2020-02-18 10:17:05 +00:00
dependabot-preview[bot]
899419a89f
Bump rubocop-rspec from 1.38.0 to 1.38.1
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.38.0 to 1.38.1.
- [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.38.0...v1.38.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 09:50:25 +00:00
dependabot-preview[bot]
ae581d5361
Merge pull request #2428 from Growstuff/dependabot/bundler/faker-2.10.2
2020-02-18 09:48:00 +00:00
dependabot-preview[bot]
44e684611b
Bump faker from 2.10.1 to 2.10.2
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.1 to 2.10.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/commits/v2.10.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 09:24:21 +00:00
dependabot-preview[bot]
b6ec583b0f
Bump discard from 1.1.0 to 1.2.0
...
Bumps [discard](https://github.com/jhawthorn/discard ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases )
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jhawthorn/discard/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 22:21:58 +13:00
dependabot-preview[bot]
94e06e4148
Bump sidekiq from 6.0.4 to 6.0.5
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.4 to 6.0.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/v6.0.4...v6.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-17 07:13:16 +13:00
Brenda Wallace
cf60a75480
Merge pull request #2426 from Growstuff/dev
...
Production release
2020-02-15 10:46:35 +13:00
Brenda
88615a55f4
CSS for seeds cards
2020-02-15 10:05:14 +13:00
Brenda Wallace
2eaf8ac215
Merge branch 'dev' of github.com:Growstuff/growstuff into dev
2020-02-15 10:05:03 +13:00
Brenda Wallace
7472bceeb3
install postgresql from addonns
2020-02-15 09:54:00 +13:00
Brenda Wallace
eb749c02fd
Turning off postgresql service on travis-ci
...
see if this fixes the build
2020-02-15 09:54:00 +13:00
Brenda Wallace
9853d931c6
Shrink seed card and fix links
2020-02-15 09:54:00 +13:00
Brenda Wallace
c12580ed8d
Shrink seed card and fix links
2020-02-14 10:07:26 +13:00
Brenda Wallace
4c603f0cc9
Merge pull request #2422 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.0
...
Bump rubocop-rspec from 1.37.1 to 1.38.0
2020-02-13 21:33:30 +13:00
dependabot-preview[bot]
6e930976cb
Bump rubocop-rspec from 1.37.1 to 1.38.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.37.1 to 1.38.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.37.1...v1.38.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-12 07:51:54 +00:00
Brenda Wallace
35094561ce
Merge remote-tracking branch 'upstream/dev'
2020-02-12 16:42:30 +13:00
Brenda Wallace
9a6c6e73f1
Bump posts and members count to 6
2020-02-12 14:02:14 +13:00
Brenda Wallace
d6e4ab5fab
Merge branch 'index-pages' into dev
2020-02-10 21:49:58 +13:00
Brenda
24ae63a339
add link to gardens for members#show
2020-02-10 21:49:38 +13:00
Brenda
20e878e9fe
style "inactive" checkbox on gardens#index
2020-02-10 21:49:27 +13:00
Brenda Wallace
cb0a545358
Merge pull request #2421 from Growstuff/dev
...
production release
2020-02-10 14:57:35 +13:00
dependabot-preview[bot]
b5946b5c81
Bump haml_lint from 0.34.1 to 0.34.2
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.34.1 to 0.34.2.
- [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.34.1...v0.34.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-10 14:21:19 +13:00
Brenda
821ddd90cb
fix specs
2020-02-10 14:21:03 +13:00
Brenda
dcb05c2e1e
tidy up posts on crops page
2020-02-10 14:21:03 +13:00
Brenda
9dfd6dbc73
Tidy up index pages
2020-02-10 14:21:03 +13:00
Brenda
3a1f6c9d0b
fix specs
2020-02-10 11:12:44 +13:00
Brenda
f7f62bb7dc
tidy up posts on crops page
2020-02-10 10:03:49 +13:00
Brenda
12db6b5fa0
Tidy up index pages
2020-02-10 09:47:37 +13:00
Brenda Wallace
4543a64e3b
Merge pull request #2418 from Growstuff/dev
...
Production release
2020-02-09 23:20:09 +13:00
Brenda Wallace
abecbab6c5
Tidy up mobile display on homepage, including member cards changes ( #2417 )
...
* Tidy up mobile display on homepage, including member cards changes
2020-02-09 22:38:12 +13:00
Brenda Wallace
b4a5c5d0ad
Merge pull request #2416 from Growstuff/dev
...
production deploy
2020-02-07 22:01:18 +13:00
Brenda Wallace
4f5245f7e7
Show all of a harvest's photos on harvest#show
2020-02-07 08:02:20 +13:00
Brenda Wallace
d515aba4b5
Merge pull request #2414 from Growstuff/dev
...
Production deploy
2020-02-05 11:40:01 +13:00
Brenda Wallace
1d0a1baa2d
Merge pull request #2413 from Growstuff/dependabot/bundler/unicorn-5.5.3
...
Bump unicorn from 5.5.2 to 5.5.3
2020-02-05 10:37:10 +13:00
Brenda Wallace
cde46ed14a
Merge pull request #2411 from Growstuff/feature/photo-for-socmed
...
Feature/photo for socmed
2020-02-05 10:36:57 +13:00
dependabot-preview[bot]
697631dcce
Bump unicorn from 5.5.2 to 5.5.3
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.2 to 5.5.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 07:50:58 +00:00
Brenda Wallace
30f2d2c590
Merge branch 'dev' into feature/photo-for-socmed
2020-02-04 16:21:22 +13:00
Brenda Wallace
906f44ac66
Merge pull request #2412 from Growstuff/dev
...
production release
2020-02-04 16:21:11 +13:00
Brenda Wallace
5a3c06f490
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
Gemfile.lock
2020-02-04 12:44:28 +13:00
Brenda Wallace
019d94f1cb
Show the default photo for social media
2020-02-04 11:52:13 +13:00
dependabot-preview[bot]
8dd70486c7
Bump unicorn from 5.5.2 to 5.5.3
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.2 to 5.5.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 10:51:12 +13:00
dependabot-preview[bot]
425f801033
Bump database_cleaner from 1.8.1 to 1.8.2
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.1...v1.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 10:50:52 +13:00
dependabot-preview[bot]
cce29dabbb
Bump oj from 3.10.1 to 3.10.2
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.1 to 3.10.2.
- [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.10.1...v3.10.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 10:50:17 +13:00
Martina Simicic
b0a5223d97
Account for finished planting when counting days of life
2020-02-04 10:50:00 +13:00
Martina Simicic
10008ca30d
Removing method since it is defined in predict planting
2020-02-04 10:50:00 +13:00
Brenda Wallace
d15df948ff
Added perennial to plantings
2020-02-03 16:28:57 +13:00
Brenda Wallace
5fbdd577d6
One per person on home page
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
42cce210c0
Bump database_cleaner from 1.7.0 to 1.8.1
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.7.0 to 1.8.1.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
42aeba9eeb
Bump searchkick from 4.2.0 to 4.2.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.2.0...v4.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
a0e1184cda
Bump bootstrap-datepicker-rails from 1.8.0.1 to 1.9.0.1
...
Bumps [bootstrap-datepicker-rails](https://github.com/Nerian/bootstrap-datepicker-rails ) from 1.8.0.1 to 1.9.0.1.
- [Release notes](https://github.com/Nerian/bootstrap-datepicker-rails/releases )
- [Commits](https://github.com/Nerian/bootstrap-datepicker-rails/compare/1.8.0.1...1.9.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
530217552e
Bump capybara from 3.30.0 to 3.31.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.30.0 to 3.31.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.30.0...3.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
1d710abb77
Bump rubocop-rails from 2.4.1 to 2.4.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.1 to 2.4.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.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-03 16:28:57 +13:00
Brenda Wallace
929049abad
Note about tech used
2020-02-03 16:28:57 +13:00
Brenda Wallace
fc1bd1893c
Added perennial to plantings
2020-02-03 15:06:45 +13:00
Brenda Wallace
7bf5ab2df3
One per person on home page
2020-02-03 11:54:26 +13:00
dependabot-preview[bot]
2c40027cb5
Bump database_cleaner from 1.7.0 to 1.8.1
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.7.0 to 1.8.1.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-02 11:29:30 +13:00
dependabot-preview[bot]
e1b57b8619
Merge pull request #2402 from Growstuff/dependabot/bundler/searchkick-4.2.1
2020-01-29 19:04:32 +00:00
dependabot-preview[bot]
c3190866b9
Bump searchkick from 4.2.0 to 4.2.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.2.0...v4.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-29 18:33:46 +00:00
dependabot-preview[bot]
c546c0ad81
Bump bootstrap-datepicker-rails from 1.8.0.1 to 1.9.0.1
...
Bumps [bootstrap-datepicker-rails](https://github.com/Nerian/bootstrap-datepicker-rails ) from 1.8.0.1 to 1.9.0.1.
- [Release notes](https://github.com/Nerian/bootstrap-datepicker-rails/releases )
- [Commits](https://github.com/Nerian/bootstrap-datepicker-rails/compare/1.8.0.1...1.9.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-30 07:31:38 +13:00
Brenda Wallace
a19a2a6925
Merge pull request #2400 from Growstuff/dependabot/bundler/capybara-3.31.0
...
Bump capybara from 3.30.0 to 3.31.0
2020-01-29 10:48:33 +13:00
dependabot-preview[bot]
1975087611
Bump capybara from 3.30.0 to 3.31.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.30.0 to 3.31.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.30.0...3.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-28 07:20:12 +00:00
Brenda Wallace
1be2f342ba
Merge pull request #2399 from Growstuff/dependabot/bundler/rubocop-rails-2.4.2
...
Bump rubocop-rails from 2.4.1 to 2.4.2
2020-01-28 20:18:21 +13:00
dependabot-preview[bot]
827dda79d7
Bump rubocop-rails from 2.4.1 to 2.4.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.1 to 2.4.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.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-27 08:12:30 +00:00
Brenda Wallace
dfdbfbc118
Note about tech used
2020-01-25 18:57:32 +13:00
Brenda Wallace
253f7a66b1
Merge pull request #2398 from Growstuff/dev
...
Production release
2020-01-25 10:33:10 +13:00
Brenda Wallace
10c7f7eccb
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
Gemfile.lock
2020-01-25 10:09:03 +13:00
Brenda Wallace
793bc17692
Fix owner name in harvests on homepage
2020-01-25 08:12:21 +13:00
Brenda Wallace
d2d2c5f685
Fixed planting owner name on homepage
2020-01-25 08:11:41 +13:00
dependabot-preview[bot]
9f3d59e0e4
Merge pull request #2397 from Growstuff/dependabot/bundler/byebug-11.1.1
2020-01-24 08:01:09 +00:00
dependabot-preview[bot]
944ff39d95
Bump byebug from 11.1.0 to 11.1.1
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.1.0 to 11.1.1.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.1.0...v11.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-24 07:41:00 +00:00
dependabot-preview[bot]
1e9914dd0b
Merge pull request #2396 from Growstuff/dependabot/bundler/elasticsearch-6.8.1
2020-01-23 07:58:26 +00:00
dependabot-preview[bot]
5ffcb93807
Bump elasticsearch from 6.8.0 to 6.8.1
...
Bumps [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby ) from 6.8.0 to 6.8.1.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases )
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/v6.8.1/CHANGELOG.md )
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v6.8.0...v6.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-23 07:38:11 +00:00
dependabot-preview[bot]
8601b8d269
Bump faraday_middleware from 0.13.1 to 0.14.0
...
Bumps [faraday_middleware](https://github.com/lostisland/faraday_middleware ) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/lostisland/faraday_middleware/releases )
- [Commits](https://github.com/lostisland/faraday_middleware/compare/v0.13.1...v0.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
777262097a
Bump cancancan from 3.0.1 to 3.0.2
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.0.1...3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 22:26:08 +13:00
codefactor-io
4ff95fbac9
[CodeFactor] Apply fixes
2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
46b612c15f
Bump byebug from 11.0.1 to 11.1.0
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.0.1 to 11.1.0.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.1...v11.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 22:26:08 +13:00
dependabot-preview[bot]
a6c4ae32da
Merge pull request #2390 from Growstuff/dependabot/bundler/faraday_middleware-0.14.0
2020-01-21 04:10:15 +00:00
dependabot-preview[bot]
bad93ed40d
Bump faraday_middleware from 0.13.1 to 0.14.0
...
Bumps [faraday_middleware](https://github.com/lostisland/faraday_middleware ) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/lostisland/faraday_middleware/releases )
- [Commits](https://github.com/lostisland/faraday_middleware/compare/v0.13.1...v0.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 03:49:30 +00:00
dependabot-preview[bot]
61a96420ea
Merge pull request #2391 from Growstuff/dependabot/bundler/cancancan-3.0.2
2020-01-21 03:47:33 +00:00
dependabot-preview[bot]
3316e68eb6
Bump cancancan from 3.0.1 to 3.0.2
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.0.1...3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 03:28:18 +00:00
codefactor-io
34ddf8e98f
[CodeFactor] Apply fixes
2020-01-21 13:12:28 +13:00
dependabot-preview[bot]
c4f30736db
Bump byebug from 11.0.1 to 11.1.0
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.0.1 to 11.1.0.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.1...v11.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-21 13:08:42 +13:00
Brenda Wallace
8bf990f729
Merge pull request #2389 from Growstuff/dev
...
Production release
2020-01-20 14:30:36 +13:00
Brenda Wallace
a5fa21269f
Remove Elasticsearch 6 config from travis
2020-01-20 13:34:55 +13:00
Brenda Wallace
029a703c2a
Remove Elasticsearch 6 config from travis
2020-01-20 13:34:43 +13:00
Brenda Wallace
f1b5eb1fdd
Turn off Replicas ( #2388 )
...
* Control number of ES replicas
* So, let's have zero replicas on ES
2020-01-20 13:29:19 +13:00
Brenda Wallace
51e69d79b2
Turn on elastic search 7 tests ( #2386 )
...
* Turn on elastic search 7 tests, and Install ES first, check later
this give ES time to start in the background instead of slowing us down
2020-01-19 20:22:07 +13:00
dependabot-preview[bot]
17e0aa8580
Merge pull request #2380 from Growstuff/dependabot/bundler/faker-2.10.1
2020-01-18 06:25:17 +00:00
Brenda Wallace
e64e78646c
Merge pull request #2382 from Growstuff/dev
...
Production release
2020-01-18 19:25:07 +13:00
dependabot-preview[bot]
6cb0f275d0
Bump faker from 2.10.0 to 2.10.1
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.10.0 to 2.10.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/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-18 05:34:40 +00:00
dependabot-preview[bot]
f508139c36
Merge pull request #2381 from Growstuff/dependabot/bundler/oj-3.10.1
2020-01-18 05:32:55 +00:00
dependabot-preview[bot]
a866032fdf
Bump oj from 3.10.0 to 3.10.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.0 to 3.10.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.10.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-18 05:13:37 +00:00
Brenda Wallace
6279e169de
approved crops only, and only 1 shard ( #2385 )
...
reducing our elastic search usage
2020-01-18 18:11:24 +13:00
Brenda Wallace
08be5a7de6
Fix/travis ci ( #2384 )
...
* Upgrade to xenial on travis-ci
* Wait for ES to start
* Retry elastic search 25 times
2020-01-18 17:41:48 +13:00
Brenda Wallace
5b764b27e1
Merge remote-tracking branch 'upstream/master' into dev
2020-01-17 18:02:56 +13:00
Brenda Wallace
cd344c2605
Fix error when no latitude or longitude
2020-01-17 18:00:45 +13:00
Brenda Wallace
904b06698e
Merge pull request #2379 from Growstuff/dependabot/bundler/i18n-tasks-0.9.30
...
Bump i18n-tasks from 0.9.29 to 0.9.30
2020-01-15 16:09:46 +13:00
dependabot-preview[bot]
d464124522
Bump i18n-tasks from 0.9.29 to 0.9.30
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.29 to 0.9.30.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.29...v0.9.30 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-14 07:43:44 +00:00
Brenda Wallace
dd8311d347
Merge pull request #2377 from Growstuff/dev
...
Production release
2020-01-14 12:47:24 +13:00
Brenda Wallace
9ff43a0659
Merge pull request #2378 from Br3nda/dev
...
Resolve dev conflicts
2020-01-14 12:27:22 +13:00
Brenda Wallace
ae26965144
Merge remote-tracking branch 'upstream/master' into dev
2020-01-14 10:37:13 +13:00
Brenda Wallace
88fd0fb91e
Merge pull request #2320 from Br3nda/cache/harvests
...
Reading #index lookup from ElasticSearch instead of the database
2020-01-13 19:59:25 +13:00
codefactor-io
6c9a15f95e
[CodeFactor] Apply fixes
2020-01-11 21:29:37 +00:00
Brenda Wallace
cdb60d9301
Use planting, not @planting, in plantings/harvests view
2020-01-12 10:23:26 +13:00
Brenda Wallace
c3f75a77ac
Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-12 10:20:29 +13:00
Brenda Wallace
5d8d159cc9
Update app/models/garden.rb
2020-01-12 10:20:21 +13:00
Brenda Wallace
9596d1bac7
style fix ups
2020-01-12 10:18:32 +13:00
Brenda Wallace
32c8698a44
style fix ups
2020-01-12 10:17:07 +13:00
Brenda Wallace
4ca949a703
Added another reindex to specs
2020-01-12 10:14:20 +13:00
Brenda Wallace
6cce74cf4d
tests we find home page records for plantings
2020-01-12 09:52:47 +13:00
Brenda Wallace
eb08584546
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-11 23:11:00 +13:00
Brenda Wallace
709ca5a04f
Fix seeds ES query
2020-01-11 23:10:33 +13:00
Brenda Wallace
cdff37b2eb
style fix ups
2020-01-11 22:57:09 +13:00
Brenda Wallace
27f22e4971
Merge branch 'dev' into cache/harvests
2020-01-11 21:23:46 +13:00
Brenda Wallace
a5a493bbf7
Use rubocop-0-79 on codeclimate
2020-01-11 21:23:31 +13:00
dependabot-preview[bot]
c5b30618c0
Bump rubocop from 0.78.0 to 0.79.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.78.0 to 0.79.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.78.0...v0.79.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-11 21:23:31 +13:00
Martina Simicic
2a61711c96
Name variable to somthing more descriptive
2020-01-10 16:50:52 +13:00
Martina Simicic
4893980ff0
Jump to is only shown when viewing own gardens
2020-01-10 16:50:52 +13:00
Martina Simicic
5e300f9dcf
Unify design for gardens index page
...
Design of the page is now similar to index pages
for plantings and crops
2020-01-10 16:50:52 +13:00
Martina Simicic
298a20e8cc
Add eager loading for garden owner
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
7645bd938d
Bump jsonapi-swagger from 0.7.1 to 0.8.0
...
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger ) from 0.7.1 to 0.8.0.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases )
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.7.1...v0.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
Brenda Wallace
0c7ca50880
small file fixes
2020-01-10 16:50:52 +13:00
Martina Simicic
fb71a46de7
Use positive statements
2020-01-10 16:50:52 +13:00
Martina Simicic
42c8e6434c
Add spec for showing garden type for a garden
2020-01-10 16:50:52 +13:00
Martina Simicic
5895b79860
Show garden type for a garden
2020-01-10 16:50:52 +13:00
Martina Simicic
0f005a3c39
Make garden type optional when editing garden
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
bdce7ec64d
Bump rack-protection from 2.0.7 to 2.0.8.1
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.7 to 2.0.8.1.
- [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.7...v2.0.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
8acd9550f4
Bump bullet from 6.0.2 to 6.1.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.2 to 6.1.0.
- [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.2...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
088e9a9a46
Bump faraday from 0.17.1 to 0.17.3
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 0.17.1 to 0.17.3.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v0.17.1...v0.17.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
103f45dd9d
Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19
...
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa ) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases )
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.18...v2.0.19 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
Martina Simicic
f8287a918a
Add myself to CONTRIBUTORS.md
2020-01-10 16:50:52 +13:00
Martina Simicic
9dae574de9
Use specific error for raise_error expectation
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
5297cd17cb
Bump faker from 2.9.0 to 2.10.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.9.0 to 2.10.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.9.0...v2.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
4864cd8c56
Bump selenium-webdriver from 3.142.6 to 3.142.7
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.6 to 3.142.7.
- [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 >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
307291975d
Bump webdrivers from 4.1.3 to 4.2.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.3 to 4.2.0.
- [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.3...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
4870dd0214
Bump chartkick from 3.3.0 to 3.3.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.3.0 to 3.3.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.3.0...v3.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
codefactor-io
a595a2cd8e
[CodeFactor] Apply fixes to commit 17fa995
2020-01-10 16:50:52 +13:00
Brenda
aab345cf09
Adding more counter caches
2020-01-10 16:50:52 +13:00
Brenda
17f5b1c562
Routes using slugs (instead of ids)
...
this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
f597dd0947
Bump capybara from 3.29.0 to 3.30.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.29.0 to 3.30.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.29.0...3.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
Brenda
7257b2ada1
Update with frozen literals
2020-01-10 16:50:52 +13:00
Brenda
c9808fdad6
Rubocop renamed cops, and fixed cops in todo file
2020-01-10 16:50:52 +13:00
Brenda
f86a47b8a5
Update rubocop target to 5.2
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
2cf15ddfcb
Bump rubocop-rails from 2.4.0 to 2.4.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.0 to 2.4.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.4.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
dependabot-preview[bot]
c09c9bdee4
Bump sidekiq from 6.0.3 to 6.0.4
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.3 to 6.0.4.
- [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/v6.0.3...v6.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 16:50:52 +13:00
Brenda Wallace
d95cacc404
style fix ups
2020-01-10 13:39:57 +13:00
Brenda Wallace
acbc49812d
more indexing in home spec
2020-01-10 13:36:30 +13:00
Brenda Wallace
976b8c2058
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-10 13:32:12 +13:00
Brenda Wallace
7a0458e7e0
reindex plantings before crop planting spec
2020-01-10 13:31:45 +13:00
Brenda Wallace
af7de3bc87
Merge branch 'dev' into cache/harvests
2020-01-10 13:30:00 +13:00
Martina Simicic
3143f0c5ee
Name variable to somthing more descriptive
2020-01-09 20:00:03 +13:00
Martina Simicic
58c7576360
Jump to is only shown when viewing own gardens
2020-01-09 20:00:03 +13:00
Martina Simicic
c546088e56
Unify design for gardens index page
...
Design of the page is now similar to index pages
for plantings and crops
2020-01-09 20:00:03 +13:00
Martina Simicic
e07bb1bdb4
Add eager loading for garden owner
2020-01-09 20:00:03 +13:00
Brenda Wallace
346e67b8f3
yet more reindexing in tests
2020-01-08 15:42:25 +13:00
Brenda Wallace
8dfb8ff954
Update params in seeds controller spec
2020-01-08 08:10:16 +13:00
Brenda Wallace
0acb054004
reindex photos before likes spec
2020-01-08 07:28:53 +13:00
Brenda Wallace
2ad7f5932e
Merge branch 'dev' into cache/harvests
2020-01-07 22:21:37 +13:00
dependabot-preview[bot]
a814598bed
Bump jsonapi-swagger from 0.7.1 to 0.8.0
...
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger ) from 0.7.1 to 0.8.0.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases )
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.7.1...v0.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-07 22:21:18 +13:00
Brenda Wallace
f26aad95a2
small file fixes
2020-01-07 22:20:58 +13:00
Martina Simicic
905087ab8e
Use positive statements
2020-01-07 21:31:48 +13:00
Martina Simicic
ca3b0a8c0b
Add spec for showing garden type for a garden
2020-01-07 21:31:48 +13:00
Martina Simicic
9aaa18c0d3
Show garden type for a garden
2020-01-07 21:31:48 +13:00
Brenda Wallace
8a6c4a774a
reindexs photo in photo controller spec
2020-01-06 21:53:02 +13:00
Brenda Wallace
bccdd6333e
find the crop name from es result
2020-01-06 21:49:53 +13:00
Brenda Wallace
96f0866f39
rubocop fix up
2020-01-06 21:49:00 +13:00
Brenda Wallace
feab98e962
removing dead code
2020-01-05 21:41:16 +13:00
Brenda Wallace
c6988e2189
Re-instate the plantings quick actions
2020-01-05 21:31:51 +13:00
Brenda Wallace
e6e020dbc9
oops
2020-01-05 20:55:51 +13:00
Brenda Wallace
b7e53daeba
fixes to crop photos
2020-01-05 16:57:14 +13:00
Brenda Wallace
ebb8460e44
Merge branch 'dev' into cache/harvests
2020-01-05 16:56:47 +13:00
Daniel O'Connor
88f7f09a18
Merge pull request #2360 from Growstuff/dependabot/bundler/rack-protection-2.0.8.1
...
Bump rack-protection from 2.0.7 to 2.0.8.1
2020-01-05 03:12:09 +10:30
Daniel O'Connor
fbb3eff090
Merge pull request #2364 from simicic/GH-2361_optional_garden_type
...
GH-2361 Optional garden type when editing garden
2020-01-05 03:11:18 +10:30
codefactor-io
7e30b6b6e0
[CodeFactor] Apply fixes
2020-01-03 11:28:51 +00:00
Martina Simicic
ba04c44742
Make garden type optional when editing garden
2020-01-03 09:50:33 +01:00
Brenda Wallace
2e8625d6ff
Reindex harvests before harvest feature spec
2020-01-02 21:10:35 +13:00
Brenda Wallace
6acfa2827b
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-02 21:06:33 +13:00
Brenda Wallace
d757ec4fae
Reindex crops, in crop browse feature spec
2020-01-02 21:06:27 +13:00
dependabot-preview[bot]
752b90ca55
Bump rack-protection from 2.0.7 to 2.0.8.1
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.7 to 2.0.8.1.
- [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.7...v2.0.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-02 07:35:27 +00:00
Brenda Wallace
55411ec535
Merge branch 'dev' into cache/harvests
2020-01-02 20:33:36 +13:00
dependabot-preview[bot]
8360e4ac0f
Bump bullet from 6.0.2 to 6.1.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.2 to 6.1.0.
- [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.2...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-02 20:33:10 +13:00
Brenda Wallace
f27ac12563
don't pass photos to crops/_photos
2020-01-02 20:29:41 +13:00
Brenda Wallace
fb0d57c98f
Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2020-01-02 20:23:37 +13:00
Brenda Wallace
ff883db279
Revert "displays photos without hitting the database"
...
This reverts commit 139574c9c0 .
2020-01-02 20:23:13 +13:00
dependabot-preview[bot]
e7cf50b2ca
Merge pull request #2358 from Growstuff/dependabot/bundler/faraday-0.17.3
2020-01-02 03:17:38 +00:00
dependabot-preview[bot]
7c0d184d65
Bump faraday from 0.17.1 to 0.17.3
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 0.17.1 to 0.17.3.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v0.17.1...v0.17.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-02 02:56:42 +00:00
dependabot-preview[bot]
f666b6d100
Merge pull request #2357 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-2.0.19
2020-01-02 02:54:42 +00:00
dependabot-preview[bot]
b44b0a7a5f
Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19
...
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa ) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases )
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.18...v2.0.19 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-02 02:43:35 +00:00
Brenda Wallace
b556c4b8f4
Merge branch 'dev' into cache/harvests
2020-01-02 15:42:17 +13:00
Martina Simicic
1964b7ce2e
Add myself to CONTRIBUTORS.md
2020-01-02 14:18:51 +13:00
Martina Simicic
9eb5fe7947
Use specific error for raise_error expectation
2020-01-02 14:18:51 +13:00
Brenda Wallace
e1b9381a03
Merge branch 'dev' into cache/harvests
2020-01-01 20:18:33 +13:00
Brenda Wallace
6017c04b5f
don't check if post is liked by member, unless the member is signed in
2020-01-01 15:54:52 +13:00
Brenda Wallace
139574c9c0
displays photos without hitting the database
2020-01-01 14:15:04 +13:00
Brenda Wallace
8a1b8be0ef
Load crops from search, without hitting the database
2020-01-01 13:47:25 +13:00
Brenda Wallace
d46883f39b
don't query for photos that we never read
2020-01-01 12:32:23 +13:00
Brenda Wallace
41c90acbbc
added missing liked flag to photos/card
2020-01-01 11:43:59 +13:00
Brenda Wallace
76e649a0a8
update likes controller spec for new params
2020-01-01 09:26:54 +13:00
Brenda Wallace
d541a4ea0a
another frozen literal
2020-01-01 09:24:59 +13:00
Brenda Wallace
6e81f2966d
fixed colouring of likes button
2020-01-01 09:24:47 +13:00
Brenda Wallace
c4d02edbd1
force reindex after a like
2020-01-01 09:24:24 +13:00
Brenda Wallace
b2738afdc2
fake reindexer on posts, so it doesn't throw errors
2020-01-01 08:42:18 +13:00
Brenda Wallace
e24ef32fe6
like spec, don't make so many photso
2020-01-01 08:41:34 +13:00
Brenda Wallace
36875b620c
harvest search, fixed error when some data not set on model
2020-01-01 08:41:00 +13:00
Brenda Wallace
80038c7f42
set which parts of crop are searchable
2020-01-01 08:40:43 +13:00
Brenda Wallace
63ea6752fa
likes reading from hash from elastic
2020-01-01 08:40:04 +13:00
Brenda Wallace
de3c4d0f62
likes found in controller by id and type of likeable
2020-01-01 08:39:27 +13:00
Brenda Wallace
e9ff6a4388
likes in the elastic search index during spec run
2020-01-01 08:39:08 +13:00
Brenda Wallace
54778d9884
Likes popuplating from elastic, no more extra look ups
2020-01-01 08:38:27 +13:00
Brenda Wallace
f76266a716
photos controller working with ES
2019-12-31 21:46:42 +13:00
Brenda Wallace
6bc0aa7194
Adding missing frozen literals
2019-12-31 21:03:34 +13:00
Brenda Wallace
676345815c
tests for photos searching
2019-12-31 21:02:38 +13:00
Brenda Wallace
95654017d1
added frozen literals
2019-12-31 14:50:31 +13:00
Brenda Wallace
a3215d2555
Rubocop fixes
2019-12-31 14:47:15 +13:00
dependabot-preview[bot]
f348d7e6c5
Bump faker from 2.9.0 to 2.10.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.9.0 to 2.10.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.9.0...v2.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-30 23:36:34 +00:00
dependabot-preview[bot]
1c0cb8e1e8
Bump selenium-webdriver from 3.142.6 to 3.142.7
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.6 to 3.142.7.
- [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-12-30 22:08:10 +00:00
dependabot-preview[bot]
e1a48dc793
Bump webdrivers from 4.1.3 to 4.2.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.3 to 4.2.0.
- [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.3...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-30 21:54:33 +00:00
Brenda Wallace
38c7bdd7c2
likes count and sorted es search data config
2019-12-30 09:51:10 +13:00
Brenda Wallace
4940b79043
more tidy, crops controller
2019-12-28 10:08:50 +13:00
Brenda Wallace
a89534da53
harvest tidy up
2019-12-28 10:06:10 +13:00
Brenda Wallace
97cacdae0e
2019-12-28 09:50:08 +13:00
Brenda Wallace
c2b4c67077
crop compantion tests
2019-12-28 09:34:04 +13:00
Brenda Wallace
233c5666ad
treat harvests as object(not hash) in harvsets rss feed
2019-12-28 09:33:53 +13:00
Brenda Wallace
b9e9ce1439
index seed.active into ES
2019-12-28 09:33:36 +13:00
Brenda Wallace
8ee332edd8
update harvests controller
2019-12-28 09:20:18 +13:00
Brenda Wallace
ce909332b7
plantings controller update
2019-12-28 09:15:52 +13:00
Brenda Wallace
979d172bd7
rubocop tidy on harvests rss feed
2019-12-28 09:06:23 +13:00
Brenda Wallace
0624184270
tidying up matching attributes for seeds rss feed
2019-12-28 09:06:13 +13:00
Brenda Wallace
59130d5603
display rss feed from harvests objects (instead of hashes)
2019-12-28 08:41:47 +13:00
codefactor-io
5eea6d65d0
[CodeFactor] Apply fixes
2019-12-27 19:34:42 +00:00
Brenda Wallace
6f6edeb14a
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-28 08:34:11 +13:00
Brenda Wallace
9e6d659093
Merge branch 'dev' into cache/harvests
2019-12-28 00:29:34 +13:00
dependabot-preview[bot]
df4ae3a7f3
Bump chartkick from 3.3.0 to 3.3.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.3.0 to 3.3.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.3.0...v3.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-27 08:36:24 +00:00
Brenda Wallace
2185892cf5
Trying a different way to ES reindex in spec helper
2019-12-27 19:52:43 +13:00
codefactor-io
1bb8770a6e
[CodeFactor] Apply fixes
2019-12-27 06:51:32 +00:00
Brenda Wallace
75ed36d16c
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-27 19:50:52 +13:00
Brenda Wallace
a015110b05
Reindex before running plantings controller specs
2019-12-27 19:50:46 +13:00
codefactor-io
2685cc70a7
[CodeFactor] Apply fixes to commit 1c7816c
2019-12-27 04:21:06 +00:00
Brenda Wallace
1c7816c951
fixing photos by crop query in photos controller
2019-12-27 17:20:28 +13:00
codefactor-io
9e55d07705
[CodeFactor] Apply fixes to commit 17fa995
2019-12-26 23:42:11 +00:00
Brenda
460ff43a4e
Adding more counter caches
2019-12-26 23:42:11 +00:00
Brenda
42e225469a
Routes using slugs (instead of ids)
...
this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them
2019-12-26 23:30:23 +00:00
Brenda Wallace
0d08f48b71
turn on ES indexing in some controllers
2019-12-27 09:15:53 +13:00
Brenda Wallace
23886de24b
revert plantings#index spec
2019-12-27 09:07:47 +13:00
Brenda Wallace
ebdaaf0738
Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-27 09:04:56 +13:00
Brenda Wallace
c6d6c3cb5c
fixed link in seed card
2019-12-27 09:04:51 +13:00
Brenda Wallace
2d7951d85f
Update buttons_helper.rb
2019-12-27 00:15:05 +13:00
Brenda Wallace
6c7bd77764
Update photo_capable.rb
2019-12-27 00:14:05 +13:00
Brenda Wallace
f4b87672b1
Update _actions.html.haml
2019-12-27 00:11:46 +13:00
Brenda Wallace
fc152feebb
Update _quick_actions.haml
2019-12-26 23:53:26 +13:00
Brenda Wallace
9e0f35b22b
fixing plantings rss feed
2019-12-26 23:22:12 +13:00
Brenda Wallace
e3a789c15e
indexed items matching database attributes
2019-12-26 23:15:38 +13:00
Brenda Wallace
5783bb683a
Merge branch 'dev' into cache/harvests
2019-12-26 18:15:38 +13:00
Brenda Wallace
4d17109cd6
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-26 18:14:45 +13:00
Brenda Wallace
bef7f5b26d
Merge branch 'counter-caches' into cache/harvests
...
Conflicts:
db/schema.rb
2019-12-26 18:14:33 +13:00
Brenda Wallace
18daad541f
Merge branch 'use-slugs' into cache/harvests
2019-12-26 18:13:23 +13:00
codefactor-io
2c2d787521
[CodeFactor] Apply fixes
2019-12-26 05:13:22 +00:00
Brenda
9a704bacfc
no counter cache on many to many association harvest->photos
2019-12-26 18:12:37 +13:00
Brenda
a7e915621e
Index into elastic during db migration
2019-12-26 18:12:15 +13:00
dependabot-preview[bot]
28bda90329
Bump capybara from 3.29.0 to 3.30.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.29.0 to 3.30.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.29.0...3.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-26 05:09:31 +00:00
Brenda Wallace
fca21f85c0
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-26 18:06:27 +13:00
Brenda Wallace
6739545bff
Merge remote-tracking branch 'upstream/dev' into cache/harvests
2019-12-26 18:05:58 +13:00
Brenda
17fa995a17
Adding more counter caches
2019-12-26 16:05:30 +13:00
Brenda
d418f142e7
Routes using slugs (instead of ids)
...
this seems to be intended by the models having slugs (added about 7 years ago) but the routes weren't using them
2019-12-26 15:02:30 +13:00
Brenda Wallace
75f8a4a88a
Merge branch 'dev' into cache/harvests
2019-12-26 13:54:03 +13:00
Brenda Wallace
8bacfa74ad
Merge pull request #2349 from Br3nda/rails-target
...
Update rubocop to represent to rails 5.2
2019-12-26 13:53:33 +13:00
Brenda
bdee705b55
Update with frozen literals
2019-12-26 13:38:17 +13:00
Brenda
703962c0f7
Rubocop renamed cops, and fixed cops in todo file
2019-12-26 13:22:36 +13:00
Brenda
78004732d0
Update rubocop target to 5.2
2019-12-26 13:22:36 +13:00
Brenda Wallace
daf415e6cb
Merge branch 'dev' into cache/harvests
2019-12-26 12:55:11 +13:00
Brenda Wallace
eab10eaf7c
many to many counter caches weren't working
...
and causing errors.
2019-12-26 12:54:36 +13:00
codefactor-io
877baf22db
[CodeFactor] Apply fixes to commit 2313812
2019-12-25 22:00:43 +00:00
Brenda Wallace
2313812272
Removed set_garden
2019-12-26 11:00:21 +13:00
dependabot-preview[bot]
8b97d36267
Bump rubocop-rails from 2.4.0 to 2.4.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.0 to 2.4.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.4.0...v2.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-25 21:56:19 +00:00
Brenda Wallace
e84ab6d2a2
seeds using object instead of hash
2019-12-25 16:37:19 +13:00
Brenda Wallace
aea0d5877d
use object instead of hash for displaying crops
2019-12-25 16:28:27 +13:00
Brenda Wallace
ace0977c75
plantings view using object instead of hash
2019-12-25 16:18:34 +13:00
Brenda Wallace
3835a4f936
photos from ES
2019-12-25 15:52:06 +13:00
Brenda Wallace
453d0cc795
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-25 14:52:21 +13:00
Brenda Wallace
f42328f85e
harvests#index using model-like varaibles
2019-12-25 14:52:15 +13:00
codefactor-io
950dd7f810
[CodeFactor] Apply fixes
2019-12-25 01:27:49 +00:00
Brenda Wallace
9f46009fd1
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-25 14:27:19 +13:00
Brenda Wallace
673f977efc
Photos controller using elastic search
2019-12-25 14:27:13 +13:00
Brenda Wallace
39d208dec1
Rename the search concens
2019-12-25 14:26:50 +13:00
codefactor-io
99d436a91f
[CodeFactor] Apply fixes to commit 5962081
2019-12-24 22:45:59 +00:00
Brenda Wallace
5962081c9e
fix specs fpr seeds rss feed
2019-12-25 11:42:29 +13:00
Brenda Wallace
2c5d5e0983
fix ruby syntax in spec
2019-12-24 22:18:14 +13:00
Brenda Wallace
b8c94c13cc
refactor to use search:true instead of reindex
2019-12-24 22:15:01 +13:00
Brenda Wallace
f3ffd6c086
remove extra index runs, use search:true from spec helper
2019-12-24 22:11:14 +13:00
Brenda Wallace
ee4aa4dec3
refresh in dex at start of spec run
2019-12-24 22:10:49 +13:00
Brenda Wallace
c708d4d22b
Mark spec as needing elastic search
2019-12-24 22:01:55 +13:00
Brenda Wallace
b25a13df89
fix rss feeds
2019-12-24 21:53:00 +13:00
Brenda Wallace
56c3fdd4fe
index records before vie spec
2019-12-24 20:23:27 +13:00
Brenda Wallace
e6d9a3c1cf
reindex into ES on homepage
2019-12-24 13:36:15 +13:00
Brenda Wallace
68b22d71d0
fixed indexing of seeds when they have no plant_before
2019-12-24 12:25:16 +13:00
Brenda Wallace
fafe611315
reinstate planting harvest and planting seeds
2019-12-24 11:54:29 +13:00
codefactor-io
df97d51940
[CodeFactor] Apply fixes
2019-12-23 22:39:08 +00:00
Brenda Wallace
4a2bb2342c
Sorting out cancancan, copied to common parent controller
2019-12-24 11:38:30 +13:00
Brenda Wallace
de84214719
fixed trailing whitesapce
2019-12-24 10:45:18 +13:00
Brenda Wallace
6f950e685b
hand loading back to cancancan
2019-12-24 10:45:02 +13:00
Brenda Wallace
241de360f3
Merge branch 'dev' into cache/harvests
2019-12-24 09:46:22 +13:00
dependabot-preview[bot]
2d6f1a6284
Bump sidekiq from 6.0.3 to 6.0.4
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.3 to 6.0.4.
- [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/v6.0.3...v6.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-23 20:45:58 +00:00
Brenda Wallace
44a59a30e1
seeds#index rss format specs updated to use ES
2019-12-24 09:44:12 +13:00
Brenda Wallace
99a2dfd464
index all models in the spec helper
2019-12-24 09:25:58 +13:00
Brenda Wallace
6622aaf886
used expect syntax
2019-12-24 09:25:15 +13:00
Brenda Wallace
d71d8aa603
seeds view spec refresehs the ES index
2019-12-24 09:24:43 +13:00
Brenda Wallace
1f17ea1e03
fixes (most of) seed rss specs
2019-12-23 16:52:56 +13:00
Brenda Wallace
f8abcd4d1c
gardens controller spec using slug
2019-12-23 15:08:10 +13:00
Brenda Wallace
8f25ef5258
index seeds in spec
2019-12-23 15:07:24 +13:00
codefactor-io
8fe5e4435b
[CodeFactor] Apply fixes
2019-12-22 20:46:53 +00:00
Brenda Wallace
7f52d31b85
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-23 09:46:16 +13:00
Brenda Wallace
bbaa0436cb
ES query doesn't need to be public on the controller
2019-12-23 09:46:11 +13:00
codefactor-io
75c7d63956
[CodeFactor] Apply fixes to commit b730378
2019-12-22 20:46:08 +00:00
Brenda Wallace
b730378e14
tidy up and fix specs for harvest controller
2019-12-23 09:45:35 +13:00
Brenda Wallace
4cf5daf3b8
gardens charts controller using slug
2019-12-23 09:44:06 +13:00
Brenda Wallace
96f6fd3708
update to expect syntax
2019-12-22 17:16:13 +13:00
Brenda Wallace
85dd46a1b5
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-22 17:00:36 +13:00
Brenda Wallace
929374f77a
rubocop renamed : Metrics/LineLength to : Layout/LineLength
2019-12-22 17:00:30 +13:00
codefactor-io
81051c6865
[CodeFactor] Apply fixes to commit 5a6ee38
2019-12-22 03:58:03 +00:00
Brenda Wallace
5a6ee38722
update plantings controller spec to look for a hash of searchkick results
2019-12-22 16:57:28 +13:00
Brenda Wallace
29b98a5bcc
adding photos (and liking photos) cause touch do the cache in invalidated
2019-12-22 16:41:26 +13:00
Brenda Wallace
12e91a7441
Specify rails 5.2 in rubocop config
2019-12-22 16:04:33 +13:00
Brenda Wallace
c54c417b61
no frozen comment on this spec
2019-12-22 16:04:21 +13:00
codefactor-io
78fed0e8de
[CodeFactor] Apply fixes
2019-12-22 02:47:35 +00:00
Brenda Wallace
4b9863a3e6
index harvests into ES during harvests#index spec
2019-12-22 15:46:29 +13:00
Brenda Wallace
c79e83c26a
fixed last garden routing spec
2019-12-22 15:43:57 +13:00
Brenda Wallace
2c8a035683
Update garden routing spec
2019-12-21 19:36:59 +13:00
Brenda Wallace
80b5b93d76
Merge branch 'dev' into cache/harvests
2019-12-21 18:52:34 +13:00
Brenda Wallace
74bbfb9313
Merge remote-tracking branch 'upstream/dev'
2019-12-21 18:52:06 +13:00
Brenda Wallace
f1270ecdb8
fix deploy
2019-12-21 18:51:30 +13:00
codefactor-io
d7fc61e0ec
[CodeFactor] Apply fixes to commit 86a8f95
2019-12-21 04:56:25 +00:00
Brenda Wallace
86a8f95e60
get photo from crop (saved into ES)
2019-12-21 17:55:34 +13:00
Brenda Wallace
ce18dc0610
Display seeds from elastic search
2019-12-21 17:55:14 +13:00
Brenda Wallace
bed64af567
Merge pull request #2345 from Growstuff/dev
...
production release
2019-12-21 17:34:39 +13:00
Brenda Wallace
786963eb8f
Update seeds rss to expect a hash
2019-12-21 17:33:59 +13:00
Brenda Wallace
6b1f85fe72
Merge branch 'dev' into cache/harvests
2019-12-21 17:27:23 +13:00
Brenda Wallace
97c4bd3919
Remove newrelic ( #2339 )
...
* Remove newrelic
* Update forum view spec
* only test for the first 20 chars of post subject
2019-12-21 17:07:20 +13:00
Brenda Wallace
8bec2a277d
Merge branch 'dev' into cache/harvests
2019-12-21 16:59:47 +13:00
Brenda Wallace
9c2beb304f
show days of progress ( #2344 )
...
* show days of progress
* Update planting model spec to use age_in_days
2019-12-21 16:49:43 +13:00
dependabot-preview[bot]
343e633bf6
Bump scout_apm from 2.6.5 to 2.6.6
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.5 to 2.6.6.
- [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.6.5...v2.6.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-21 03:43:30 +00:00
codefactor-io
cb75e4ff0c
[CodeFactor] Apply fixes to commit 44d635e
2019-12-21 03:25:07 +00:00
dependabot-preview[bot]
deb5d820b5
Bump unicorn from 5.5.1 to 5.5.2 ( #2342 )
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.1 to 5.5.2.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-21 16:24:52 +13:00
Brenda Wallace
44d635e9b3
Update plantings#index view spec to use hashes like an ES search result
2019-12-21 16:24:21 +13:00
Brenda Wallace
bbaf508da9
harvest routing spec now using slugs
2019-12-21 09:42:21 +13:00
Brenda Wallace
306732d27c
seed routing spec now using slugs
2019-12-21 09:41:21 +13:00
Brenda Wallace
2792382792
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-21 09:40:23 +13:00
Brenda Wallace
3decc69bca
planting routing specs to use slug
2019-12-21 09:40:11 +13:00
codefactor-io
1882c75941
[CodeFactor] Apply fixes
2019-12-20 20:37:33 +00:00
Brenda Wallace
cae9fffea6
Index crop as well on photo changes
2019-12-21 09:36:52 +13:00
Brenda Wallace
b4afefcb85
Reindex after a photo association save or delete
2019-12-21 09:32:19 +13:00
Brenda Wallace
c711d7f763
photos don't have a slug
2019-12-21 09:31:52 +13:00
Brenda Wallace
77b82f66d7
Update .codeclimate.yml
2019-12-21 09:13:17 +13:00
dependabot-preview[bot]
90689c6808
Bump rubocop from 0.77.0 to 0.78.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.77.0 to 0.78.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.77.0...v0.78.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-20 20:12:53 +00:00
dependabot-preview[bot]
fb17be6278
Bump searchkick from 4.1.1 to 4.2.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.1.1...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-20 06:55:40 +00:00
Brenda Wallace
07819fa1c2
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-20 17:34:53 +13:00
Brenda Wallace
bb0a5e0dd0
Restore app.json
2019-12-20 17:34:40 +13:00
codefactor-io
9a0f22a4b9
[CodeFactor] Apply fixes to commit fc1c507
2019-12-20 04:33:33 +00:00
Brenda Wallace
fc1c507a96
Load planting rss from elastic too
2019-12-20 17:32:48 +13:00
codefactor-io
f8916dfecb
[CodeFactor] Apply fixes
2019-12-20 04:16:33 +00:00
Brenda Wallace
9234ca0a6d
Index plantings, seeds, and harvests before home page tests
2019-12-20 17:15:41 +13:00
Brenda Wallace
d15802c0e7
Merge remote-tracking branch 'origin/cache/harvests' into cache/harvests
2019-12-20 17:14:30 +13:00
Brenda Wallace
9d68ab0228
Rubocop fix of controller
2019-12-20 17:13:54 +13:00
codefactor-io
e8760f9c38
[CodeFactor] Apply fixes
2019-12-20 03:33:23 +00:00
Brenda Wallace
42f1e61496
controller tidy up
2019-12-20 16:30:58 +13:00
Brenda Wallace
9f021e76a6
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-20 16:30:09 +13:00
Brenda Wallace
be7846d9a2
Moved rubocop yaml around, hoping to fix codefactor
2019-12-20 16:29:56 +13:00
codefactor-io
d95bc774a2
[CodeFactor] Apply fixes
2019-12-20 03:22:04 +00:00
Brenda Wallace
85f99d3916
Display seeds from elastic search
2019-12-20 16:21:32 +13:00
Brenda Wallace
ef8ec3c603
Reindex plantings in spec
2019-12-20 16:21:23 +13:00
Brenda Wallace
e31f6a7c36
Index into ES after migration
2019-12-20 16:21:11 +13:00
Brenda Wallace
8789fee365
Seeds into elastic search
2019-12-20 16:20:52 +13:00
Brenda Wallace
d59f8f4419
add ES field mappings
2019-12-20 16:20:31 +13:00
Brenda Wallace
b0b732a5b9
Reindex in tests
2019-12-20 09:50:21 +13:00
codefactor-io
bdbcca19f0
[CodeFactor] Apply fixes to commit 4c91da8
2019-12-19 20:45:06 +00:00
Brenda Wallace
4c91da855c
Add ES mappings for plantings
2019-12-20 09:44:40 +13:00
codefactor-io
0c338e771c
[CodeFactor] Apply fixes to commit 18cb218
2019-12-19 20:33:55 +00:00
Brenda Wallace
18cb218807
Add mappings on crop search
2019-12-20 09:33:23 +13:00
Brenda Wallace
c0103a3f42
find seeds by slug
2019-12-20 09:21:47 +13:00
Brenda Wallace
8c1761d40e
index crops before testing crops#index
2019-12-20 09:18:16 +13:00
Brenda Wallace
97e9773c7e
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-19 21:57:00 +13:00
Brenda Wallace
95c1ee7a81
Fixed loading gardens
2019-12-19 21:56:16 +13:00
codefactor-io
424132d32e
[CodeFactor] Apply fixes to commit c9fddc4
2019-12-19 08:55:10 +00:00
Brenda Wallace
c9fddc4b7a
Use slugs as params
2019-12-19 21:54:47 +13:00
Brenda Wallace
32178e2c3e
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-19 21:49:37 +13:00
Brenda Wallace
5e5cdf6246
Fixing up lookup by slug
2019-12-19 21:49:18 +13:00
codefactor-io
700d2b4f30
[CodeFactor] Apply fixes to commit 3deafc0
2019-12-19 08:27:22 +00:00
Brenda Wallace
3deafc039d
Loading a harvest
2019-12-19 21:26:53 +13:00
Brenda Wallace
ee05093ce5
Merge remote-tracking branch 'origin/cache/harvests' into cache/harvests
2019-12-19 16:55:15 +13:00
Brenda Wallace
78e111af80
fixing paths to member harvests (with more tests too)
2019-12-19 16:54:05 +13:00
Brenda Wallace
2f3b6b3d22
member routing specs
2019-12-19 15:33:46 +13:00
codefactor-io
2558cb14f8
[CodeFactor] Apply fixes
2019-12-19 02:00:25 +00:00
Brenda Wallace
38e36c4a2c
Merge remote-tracking branch 'upstream/dev' into cache/harvests
...
Conflicts:
.rubocop_todo.yml
app/controllers/likes_controller.rb
app/models/concerns/crop_search.rb
app/services/crop_search_service.rb
2019-12-19 10:28:17 +13:00
dependabot[bot]
a32df8b6c3
Bump rack from 2.0.7 to 2.0.8 ( #2338 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.0.7 to 2.0.8.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8 )
Signed-off-by: dependabot[bot] <support@github.com >
2019-12-19 08:51:01 +13:00
dependabot-preview[bot]
7575f5df68
Bump faker from 2.8.1 to 2.9.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.8.1 to 2.9.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.8.1...v2.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-17 07:49:31 +00:00
dependabot-preview[bot]
8b8b885846
Bump rubocop-rspec from 1.37.0 to 1.37.1
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.37.0 to 1.37.1.
- [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.37.0...v1.37.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-17 07:36:56 +00:00
dependabot[bot]
f549cd7785
Bump excon from 0.64.0 to 0.71.0 ( #2335 )
...
Bumps [excon](https://github.com/excon/excon ) from 0.64.0 to 0.71.0.
- [Release notes](https://github.com/excon/excon/releases )
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt )
- [Commits](https://github.com/excon/excon/compare/v0.64.0...v0.71.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2019-12-17 10:08:41 +13:00
Brenda Wallace
04fd1a343a
Rubocop update ( #2334 )
...
* Update rubocop config
* Rubocop update - for rubocop 0.77
* [CodeFactor] Apply fixes
* rubocop fixes
* [CodeFactor] Apply fixes to commit 2826c2e
2019-12-16 22:35:33 +13:00
dependabot-preview[bot]
127011f533
Bump font-awesome-sass from 5.11.2 to 5.12.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.11.2 to 5.12.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.11.2...5.12.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-16 09:35:06 +00:00
Daniel O'Connor
b55f3ca385
Merge pull request #2323 from Growstuff/dependabot/bundler/haml_lint-0.34.1
...
Bump haml_lint from 0.34.0 to 0.34.1
2019-12-16 15:41:48 +10:00
Daniel O'Connor
ab3bba0358
Merge pull request #2325 from Growstuff/dependabot/bundler/scout_apm-2.6.5
...
Bump scout_apm from 2.6.4 to 2.6.5
2019-12-16 15:40:21 +10:00
dependabot-preview[bot]
b0701b837e
Bump faker from 2.8.0 to 2.8.1
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.8.0 to 2.8.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.8.0...v2.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-16 04:40:49 +00:00
Daniel O'Connor
940f2eeb8a
Merge branch 'dev' into dependabot/bundler/scout_apm-2.6.5
2019-12-16 14:33:50 +10:00
Daniel O'Connor
c04590c28c
Merge branch 'dev' into dependabot/bundler/haml_lint-0.34.1
2019-12-16 14:33:32 +10:00
Brenda Wallace
32904fede3
Merge pull request #2330 from Br3nda/search-errors
...
Fix intermittent search errors
2019-12-15 16:28:39 +13:00
codefactor-io
22d7bd6a4e
[CodeFactor] Apply fixes
2019-12-15 02:58:12 +00:00
Brenda
2ec23d6a08
Remove unnecesary mapping
2019-12-15 15:56:41 +13:00
Brenda
a91a2c6ea5
Add ElasticSearch mappings, to fix intermittent errors
2019-12-15 15:56:22 +13:00
Brenda Wallace
8ebf5670a1
Merge pull request #2328 from Growstuff/dev
...
Release caching
2019-12-14 15:08:53 +13:00
Brenda Wallace
fc69507f37
Merge pull request #2327 from Br3nda/caching
...
Cache some heavy queries on models
2019-12-14 14:18:24 +13:00
Brenda Wallace
91b399196a
Cache some heavy queries on models
2019-12-14 14:03:01 +13:00
Brenda Wallace
0b9b94f1d5
Plantings#index using Elastic Search
2019-12-14 13:52:02 +13:00
Brenda Wallace
42e69fc199
Don't need to say we need ES.
2019-12-14 13:51:49 +13:00
dependabot-preview[bot]
8c08e4f143
Bump scout_apm from 2.6.4 to 2.6.5
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.4 to 2.6.5.
- [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.6.4...v2.6.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-13 07:21:05 +00:00
dependabot-preview[bot]
fcdd74b66c
Bump haml_lint from 0.34.0 to 0.34.1
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.34.0 to 0.34.1.
- [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.34.0...v0.34.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 07:25:01 +00:00
Brenda Wallace
b343f89997
Photos indexed in elastic search
2019-12-11 11:42:34 +13:00
Brenda Wallace
c772a2984d
More scaling impromvements
2019-12-11 11:40:04 +13:00
Brenda Wallace
87f0e44080
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-11 11:39:24 +13:00
Brenda Wallace
b44877a63e
Using elastic for plantings look ups
2019-12-11 11:38:34 +13:00
Brenda Wallace
b0d55ad064
Counter cache for posts
2019-12-10 20:30:57 +13:00
codefactor-io
c7e8efb1f1
[CodeFactor] Apply fixes to commit 5afe3e1
2019-12-10 00:37:06 +00:00
Brenda Wallace
5afe3e1c1e
Pulling plantings from elastic search too
2019-12-10 13:36:23 +13:00
Brenda Wallace
43b7dc7d7c
Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests
2019-12-10 09:28:37 +13:00
Brenda Wallace
be1ee2098d
Use the counter for harvests
2019-12-10 09:28:20 +13:00
Brenda Wallace
e4b1a2f221
Add counter caches
2019-12-10 09:27:44 +13:00
codefactor-io
18f016766a
[CodeFactor] Apply fixes to commit 282791d
2019-12-09 09:20:19 +00:00
Brenda Wallace
282791d91b
Pull crops and harvests from elasticsearch
2019-12-09 22:19:20 +13:00
Brenda Wallace
bfe1b072db
Memcache caching of harvests
2019-12-09 21:08:09 +13:00
Brenda Wallace
1c1fa043e3
Merge pull request #2319 from Growstuff/dev
...
Production release
2019-12-09 12:59:46 +13:00
Brenda Wallace
49941d3c1b
Merge branch 'master' into dev
2019-12-09 12:59:25 +13:00
Brenda Wallace
7c38f7eca6
Pull homepage data directly from elasticsearch ( #2316 )
...
* Pull homepage data directly from elasticsearch
* Removing non-elasticsearch options
* [CodeFactor] Apply fixes to commit c46b2e7
2019-12-09 10:03:48 +13:00
Brenda Wallace
6c8ff10d7e
Production release ( #2318 )
...
* Reduce the number of queries to find if member has seed of this crop
* Don't read crop photos from db again
* Cache the footer
* Reduce queries per thumbnail.
* Reducing the number of db queries on crops#show
* Cache photos
* Add query_diet, to count queries on the page
* Fix model spec
* Put query count on the page
* Little bit less queries to look up sci name
* Turn on bullet in dev
* Tell default photo to expire in 1 hour
* Small improvements to crops controller to reduce query count
* Don't cache photo do agressively
* Fix specs
* Bump bootstrap from 4.3.1 to 4.4.1
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.3.1 to 4.4.1.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases )
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md )
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.3.1...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* [Security] Bump puma from 4.3.0 to 4.3.1
Bumps [puma](https://github.com/puma/puma ) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.3.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Move signout link into user menu
* fixed logo display on small screens
* Update specs to find logout link
* [CodeFactor] Apply fixes to commit b999d89
* Bump listen from 3.2.0 to 3.2.1
Bumps [listen](https://github.com/guard/listen ) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.2.0...v3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Update .travis.yml
* Removed site name from homepage (#2313 )
2019-12-08 21:35:43 +13:00
Brenda Wallace
81eefcbfc3
Merge remote-tracking branch 'upstream/master' into dev
2019-12-07 08:22:24 +13:00
Brenda Wallace
242d5a6641
Removed site name from homepage ( #2313 )
2019-12-06 22:22:21 +13:00
Brenda Wallace
8863f3289d
Update .travis.yml
2019-12-06 20:54:53 +13:00
dependabot-preview[bot]
6be1f791c7
Bump listen from 3.2.0 to 3.2.1
...
Bumps [listen](https://github.com/guard/listen ) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.2.0...v3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-06 07:47:15 +00:00
Brenda Wallace
c6fc519e7d
Production release ( #2311 )
...
* Reduce the number of queries to find if member has seed of this crop
* Don't read crop photos from db again
* Cache the footer
* Reduce queries per thumbnail.
* Reducing the number of db queries on crops#show
* Cache photos
* Add query_diet, to count queries on the page
* Fix model spec
* Put query count on the page
* Little bit less queries to look up sci name
* Turn on bullet in dev
* Tell default photo to expire in 1 hour
* Small improvements to crops controller to reduce query count
* Don't cache photo do agressively
* Fix specs
* Bump bootstrap from 4.3.1 to 4.4.1
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.3.1 to 4.4.1.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases )
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md )
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.3.1...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* [Security] Bump puma from 4.3.0 to 4.3.1
Bumps [puma](https://github.com/puma/puma ) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.3.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
* Move signout link into user menu
* fixed logo display on small screens
* Update specs to find logout link
* [CodeFactor] Apply fixes to commit b999d89
2019-12-06 20:46:24 +13:00
codefactor-io
021b510d35
[CodeFactor] Apply fixes to commit b999d89
2019-12-06 19:55:42 +13:00
Brenda Wallace
0dcf0d2a40
Update specs to find logout link
2019-12-06 19:55:42 +13:00
Brenda Wallace
7d4d257097
fixed logo display on small screens
2019-12-06 19:55:42 +13:00
Brenda
dbb50263aa
Move signout link into user menu
2019-12-06 19:55:42 +13:00
dependabot-preview[bot]
5aaa1b7242
[Security] Bump puma from 4.3.0 to 4.3.1
...
Bumps [puma](https://github.com/puma/puma ) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.3.0...v4.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-05 23:09:48 +00:00
dependabot-preview[bot]
e9f830cb00
Bump bootstrap from 4.3.1 to 4.4.1
...
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem ) from 4.3.1 to 4.4.1.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases )
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md )
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.3.1...v4.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-05 08:11:12 +00:00
Brenda Wallace
63d429846b
Fix specs
2019-12-04 21:48:00 +13:00
Brenda
87d11c5bb1
Small improvements to crops controller to reduce query count
2019-12-04 21:48:00 +13:00
Brenda Wallace
3111e8a177
Don't cache photo do agressively
2019-12-04 21:48:00 +13:00
Brenda
8a28c93b3d
Tell default photo to expire in 1 hour
2019-12-04 21:48:00 +13:00
Brenda
e6031fbc14
Turn on bullet in dev
2019-12-04 21:48:00 +13:00
Brenda
cd2c692f34
Little bit less queries to look up sci name
2019-12-04 21:48:00 +13:00
Brenda Wallace
59fffbfa7b
Put query count on the page
2019-12-04 21:48:00 +13:00
Brenda Wallace
44855cb8b2
Add query_diet, to count queries on the page
2019-12-04 21:48:00 +13:00
Brenda Wallace
8a0d551f90
Cache photos
2019-12-04 21:48:00 +13:00
Brenda
c25f448d97
Reducing the number of db queries on crops#show
2019-12-04 21:48:00 +13:00
Brenda
12b1ed9bcd
Reduce queries per thumbnail.
2019-12-04 21:48:00 +13:00
Brenda Wallace
2623b0d01c
Cache the footer
2019-12-04 21:48:00 +13:00
Brenda
40627c5873
Don't read crop photos from db again
2019-12-04 21:48:00 +13:00
Brenda Wallace
092dc59588
Reduce the number of queries to find if member has seed of this crop
2019-12-04 21:48:00 +13:00
Brenda Wallace
4cf98153ba
Fix model spec
2019-12-04 21:48:00 +13:00
Brenda Wallace
8f7f056c81
Merge pull request #2303 from Br3nda/reduce-queries
...
Reduce number of db queries
2019-12-04 21:33:16 +13:00
Brenda Wallace
34fcbffd24
Fix specs
2019-12-04 21:15:50 +13:00
Brenda
607eae2a43
Small improvements to crops controller to reduce query count
2019-12-04 21:02:33 +13:00
Brenda Wallace
f4484cf376
Don't cache photo do agressively
2019-12-04 21:02:33 +13:00
Brenda
c42fb5df51
Tell default photo to expire in 1 hour
2019-12-04 21:02:33 +13:00
Brenda
9159df81c9
Turn on bullet in dev
2019-12-04 21:02:33 +13:00
Brenda
56cb291508
Little bit less queries to look up sci name
2019-12-04 21:02:33 +13:00
Brenda Wallace
3ba807b610
Put query count on the page
2019-12-04 21:02:29 +13:00
Brenda Wallace
cc7aceb990
Add query_diet, to count queries on the page
2019-12-04 20:59:56 +13:00
Brenda Wallace
d22fb68eee
Cache photos
2019-12-04 20:59:56 +13:00
Brenda
4065b1b248
Reducing the number of db queries on crops#show
2019-12-04 20:59:56 +13:00
Brenda
500dd5e57b
Reduce queries per thumbnail.
2019-12-04 20:59:56 +13:00
Brenda Wallace
b3ecfa36cd
Cache the footer
2019-12-04 20:59:56 +13:00
Brenda
b443435627
Don't read crop photos from db again
2019-12-04 20:59:56 +13:00
Brenda Wallace
fdf5a59ffd
Reduce the number of queries to find if member has seed of this crop
2019-12-04 20:59:56 +13:00
Brenda Wallace
8678a6dd8a
Fix model spec
2019-12-04 20:59:56 +13:00
Brenda Wallace
2e30d2cac1
Merge pull request #2306 from Growstuff/dev
...
Hotfix, buttons on small screens
2019-12-03 22:36:09 +13:00
Brenda Wallace
9e87787977
Fix color of crop action links
2019-12-03 21:48:15 +13:00
dependabot-preview[bot]
6c0462eed6
Bump faker from 2.7.0 to 2.8.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.7.0 to 2.8.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.7.0...v2.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-02 08:49:43 +00:00
Brenda Wallace
623ecc4410
Merge pull request #2302 from Growstuff/dev
...
Production release
2019-12-01 12:58:21 +13:00
Brenda Wallace
58d2510613
Fix signin/signout on mobile
2019-12-01 12:46:44 +13:00
Brenda Wallace
245ea3f10a
Removed caching that causes facts to appear twice
2019-12-01 08:21:50 +13:00
Brenda Wallace
723fd8aa79
Remove Calistoga font from headers
2019-12-01 08:08:40 +13:00
Brenda Wallace
dc540bbd74
Merge pull request #2301 from Br3nda/fonts
...
Logo update
2019-12-01 07:20:35 +13:00
Brenda
dde9e69b66
consistent cards on crops#show
2019-11-30 23:17:29 +13:00
Brenda
c963533a15
add padding around logo text
2019-11-30 23:17:04 +13:00
Brenda
b1b98fd856
Trimmed edges of logo
2019-11-30 23:01:13 +13:00
Brenda
89072bdb74
Marked icons to be ignored by screen readers
2019-11-30 21:56:53 +13:00
Brenda Wallace
0a327cba67
Tidier sign-in/sign-up links
2019-11-30 21:53:23 +13:00
Brenda Wallace
9eb08bbf29
Merge css rules
2019-11-30 21:41:55 +13:00
Brenda
b40e7221e2
Enlarge the headers in jumbotrons
2019-11-30 21:14:59 +13:00
Brenda
bdefa9dad9
consistent headers
2019-11-30 20:49:54 +13:00
Brenda
bb4ea1ed0d
Renamed spec so it find the renamed view
2019-11-30 20:09:54 +13:00
Brenda
fed6a7df97
Change a h3 into just a <strong>
2019-11-30 20:09:39 +13:00
Brenda
ee42fd9e87
Added calistoga font
2019-11-30 19:55:16 +13:00
Brenda Wallace
9af275225e
Fixed translations on navbar
2019-11-30 19:54:51 +13:00
Brenda Wallace
285cd6b4f5
Set all headers to Calistoga font
2019-11-30 19:54:19 +13:00
Brenda Wallace
c514a57f47
Apply suggestions from code review
2019-11-30 16:34:12 +13:00
Brenda Wallace
cdc87b5511
Tidy up mobile view of logo/nav
2019-11-30 16:22:45 +13:00
Brenda Wallace
057e6f3069
Change fonts, tidy up navbar, and use text for site name
2019-11-30 16:22:45 +13:00
dependabot-preview[bot]
1570717152
Bump oj from 3.9.2 to 3.10.0
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.2 to 3.10.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.9.2...v3.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-29 19:31:27 +00:00
dependabot-preview[bot]
d06f511536
Bump rubocop-rails from 2.3.2 to 2.4.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.2 to 2.4.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.3.2...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-28 11:06:47 +00:00
dependabot-preview[bot]
fd0e91c8d5
Bump faraday from 0.17.0 to 0.17.1
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-28 10:44:44 +00:00
Brenda Wallace
4b2f9d4d8f
Update rubocop on codeclimate to match gem bundle
2019-11-28 22:28:03 +13:00
dependabot-preview[bot]
9ee416ddd4
Bump rubocop from 0.76.0 to 0.77.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.76.0 to 0.77.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.76.0...v0.77.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-28 09:27:04 +00:00
dependabot-preview[bot]
7a6d54c088
Bump rubocop-rspec from 1.36.0 to 1.37.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.36.0 to 1.37.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.36.0...v1.37.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-26 08:27:23 +00:00
dependabot-preview[bot]
887c2498a2
Bump loofah from 2.3.1 to 2.4.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.3.1...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-26 08:07:37 +00:00
dependabot-preview[bot]
0fb5e06ac4
Bump capybara-screenshot from 1.0.23 to 1.0.24
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.23 to 1.0.24.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases )
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.23...v1.0.24 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-25 08:20:47 +00:00
Brenda Wallace
d26af32c32
Merge pull request #2290 from Growstuff/dev
...
Production
2019-11-25 15:40:19 +13:00
Brenda Wallace
e2dcd72472
Merge pull request #2286 from Br3nda/predict-perenial-harvest
...
Predict month of harvest on perennials [EDIT: show nearby harvesting months for all crops]
2019-11-25 14:56:13 +13:00
Brenda Wallace
82e2734caa
USe the codeclimate gem
2019-11-25 14:03:59 +13:00
Brenda Wallace
5ae4dbaa73
Fix coverage reporter
2019-11-25 13:33:47 +13:00
Brenda Wallace
faf375c932
Feature spec for month by month harvest
2019-11-25 13:25:05 +13:00
Brenda Wallace
ace0f0ac16
stub the neighbours variable on planting views spec
2019-11-24 12:46:03 +13:00
Brenda Wallace
cf2c42a7e0
Only display location if we have a location
2019-11-24 12:21:37 +13:00
Brenda Wallace
e7c30ef448
Wrapped long lines
2019-11-24 12:18:04 +13:00
Brenda Wallace
1e663fc3df
Layout tidy to cope with neighbours on page
2019-11-24 12:13:48 +13:00
Brenda Wallace
bcbee5831f
Everyone gets harvest months, not just perennials
2019-11-24 11:42:10 +13:00
Brenda Wallace
2538b71225
Planting model spec for perenial harvests
2019-11-24 11:37:33 +13:00
Brenda Wallace
fd1a608e4c
Elaborated comment
2019-11-24 11:37:18 +13:00
Brenda Wallace
9aae07b8df
Screen reader niceness
2019-11-24 11:37:07 +13:00
Brenda Wallace
6325df25b8
Make the month an int
2019-11-24 11:36:55 +13:00
Brenda Wallace
b8c1f10907
Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest
2019-11-24 10:46:07 +13:00
Brenda Wallace
83f0182551
rubocop lint
2019-11-24 10:41:20 +13:00
Brenda Wallace
0f73c13622
Merge branch 'dev' into predict-perenial-harvest
2019-11-24 10:40:22 +13:00
Brenda Wallace
8a81daf7cf
Merge pull request #2288 from Growstuff/dev
...
Production release
2019-11-24 10:39:57 +13:00
Brenda Wallace
5b7de1ae7a
Added location
2019-11-24 10:39:06 +13:00
Brenda Wallace
554adf234e
Allow chaining on Harvest predictions method returns
2019-11-24 10:30:56 +13:00
Brenda Wallace
e3b01cdca0
Merge pull request #2287 from Br3nda/homepage-caching
...
Added lots of caching
2019-11-24 10:19:17 +13:00
Brenda Wallace
a8a522d09e
rubocop style fix
2019-11-24 10:17:55 +13:00
Brenda Wallace
bd2b5c6448
Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest
2019-11-24 10:15:53 +13:00
Brenda Wallace
0bb4dbec10
Display of planting neighbours
2019-11-24 10:15:11 +13:00
Brenda Wallace
e40cca806c
World neighbours
2019-11-24 09:44:35 +13:00
codefactor-io
fd744cf67a
[CodeFactor] Apply fixes
2019-11-23 20:44:19 +00:00
Brenda Wallace
70565c7202
show neighbouring plantings same crop
...
also helps see where the prediction came from
2019-11-24 09:43:25 +13:00
codefactor-io
a23963ba96
[CodeFactor] Apply fixes
2019-11-23 19:58:22 +00:00
Brenda Wallace
c0fabc7002
Reducing unnecesary and extra queries
2019-11-24 08:57:34 +13:00
Brenda Wallace
c3d626636b
Added icons so sections line up
2019-11-24 08:49:00 +13:00
Brenda Wallace
1c2a88da55
Added lots of caching
2019-11-24 08:45:23 +13:00
Brenda Wallace
5793f26b6f
stub tests
2019-11-24 08:41:12 +13:00
Brenda Wallace
09a70c4742
Predict month of harvest on perennials
2019-11-23 22:21:36 +13:00
Brenda Wallace
bc31151105
Merge pull request #2283 from Growstuff/dev
...
Production Release
2019-11-23 08:39:51 +13:00
Brenda Wallace
ab1b77ede8
Updated gemlock for ruby version
2019-11-23 08:19:21 +13:00
Brenda Wallace
a645c696f3
Bump ruby version to 2.6.5
2019-11-23 07:59:59 +13:00
Brenda Wallace
9246176ecf
Merge remote-tracking branch 'upstream/dev' into dev
2019-11-23 07:56:17 +13:00
Brenda Wallace
712184fb6e
Bump ruby version to 2.6.5
2019-11-23 07:54:22 +13:00
Brenda Wallace
ab9cf4f3fa
Fix gemfile, so rspec isn't expected in production
2019-11-23 07:52:22 +13:00
Brenda Wallace
7130679744
Added node buildback to heroku config
2019-11-23 07:46:34 +13:00
Brenda Wallace
8449308f41
Set node and yarn versions, so heroku picks good ones
2019-11-23 07:44:06 +13:00
dependabot-preview[bot]
95e2ca9ce0
Bump searchkick from 4.1.0 to 4.1.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.1.0...v4.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-21 05:35:16 +00:00
Brenda Wallace
a92710eab7
Update schema
2019-11-19 21:08:47 +13:00
Brenda Wallace
93be74af08
Merge pull request #2278 from Br3nda/api-docs
...
Api docs using swagger
2019-11-19 17:42:45 +13:00
Brenda Wallace
43440657b6
Merge pull request #2281 from Growstuff/dev
...
Production Release
2019-11-19 17:04:33 +13:00
Brenda Wallace
e986b1c60c
Merge branch 'dev' into api-docs
2019-11-19 16:18:24 +13:00
Brenda Wallace
6c35c44786
Merge remote-tracking branch 'upstream/dev' into dev
2019-11-19 16:09:51 +13:00
Brenda Wallace
363d39705a
migration goes up only
2019-11-19 16:09:01 +13:00
Brenda Wallace
5b6bd4e198
Merge pull request #2282 from Br3nda/cms-upgrade
...
Migrate CMS tags
2019-11-19 16:08:37 +13:00
Brenda Wallace
327014ba73
Migrate CMS tags
...
copied from https://github.com/comfy/comfortable-mexican-sofa/wiki/HowTo:-Upgrade-CMS-From-1.12-to-2.0
2019-11-19 16:05:13 +13:00
Brenda Wallace
1eca0de6d9
Merge branch 'dev' into api-docs
2019-11-19 15:36:39 +13:00
Brenda Wallace
1023409f5e
Merge pull request #2280 from Br3nda/cms-upgrade
...
Finish the CMS upgrade and fix #2098
2019-11-19 15:34:55 +13:00
codefactor-io
0ece05ca6b
[CodeFactor] Apply fixes to commit 0958a13
2019-11-19 02:15:15 +00:00
Brenda Wallace
0958a134ed
Finish the CMS upgrade and fix #2098
2019-11-19 15:14:08 +13:00
Brenda Wallace
cf0485c448
fix mobile display
2019-11-19 14:25:14 +13:00
Brenda Wallace
72e348cdf6
Fix up specs
2019-11-19 14:16:50 +13:00
Brenda Wallace
b1bb1a4b95
Corrected path in swagger config
2019-11-19 14:02:03 +13:00
Brenda Wallace
76ee0c1cd8
rubocop lint
2019-11-19 13:58:16 +13:00
Brenda Wallace
6bb7cec35b
Merge remote-tracking branch 'upstream/dev' into api-docs
2019-11-19 13:53:38 +13:00
Brenda Wallace
5db98b5d5b
Merge remote-tracking branch 'origin/api-docs' into api-docs
2019-11-19 13:53:25 +13:00
Brenda Wallace
0c3149205b
Put resources back into namespaces
2019-11-19 13:53:12 +13:00
dependabot-preview[bot]
35c2073bd8
[Security] Bump https-proxy-agent from 2.2.1 to 2.2.4
...
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent ) from 2.2.1 to 2.2.4. **This update includes security fixes.**
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases )
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-18 21:26:04 +00:00
Brenda Wallace
bcc4b51713
Merge branch 'dev' into api-docs
2019-11-18 19:09:22 +13:00
Brenda Wallace
fa1e70036a
Fix name of spec
2019-11-18 16:06:57 +13:00
dependabot-preview[bot]
46f6cd4fd9
[Security] Bump nokogiri from 1.10.4 to 1.10.5
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.4 to 1.10.5. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-17 23:37:08 +00:00
Brenda Wallace
be4a250c63
renamed files to please rubocop
2019-11-18 11:08:23 +13:00
Brenda Wallace
c6fffebb28
Update specs for new index layout with api docs
2019-11-18 10:50:13 +13:00
Brenda Wallace
8fb4725f46
Merge remote-tracking branch 'upstream/dev' into api-docs
...
Conflicts:
app/resources/api/v1/planting_resource.rb
2019-11-18 10:26:05 +13:00
Brenda Wallace
0823e971ed
Tidy up indexes and add links to data/api
2019-11-18 10:23:07 +13:00
Brenda Wallace
4f8830676e
Swagger docs
2019-11-18 10:15:06 +13:00
Brenda Wallace
818a980f6d
Move jsonapi resources files
2019-11-18 10:11:53 +13:00
dependabot-preview[bot]
0e8a085cce
Bump scout_apm from 2.6.3 to 2.6.4
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.3 to 2.6.4.
- [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.6.3...v2.6.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-17 07:45:34 +00:00
Brenda Wallace
e096d2be93
Merge pull request #2276 from Growstuff/dev
...
production release
2019-11-17 17:11:43 +13:00
Brenda Wallace
0bc128b01d
Merge pull request #2275 from Br3nda/fix-map-markers
...
Add marker for leaflet maps, and use asset pipeline to serve file
2019-11-17 14:00:09 +13:00
Brenda Wallace
140f625c48
Add new planting api attributes to test
2019-11-16 22:40:06 +13:00
Brenda Wallace
7ea14bccfe
Fix alt on img tag
2019-11-16 22:32:45 +13:00
Brenda Wallace
8d87f3c982
Remove console debug statement
2019-11-16 20:38:43 +13:00
Brenda Wallace
4c82adc612
Added new api items to controller spec
2019-11-16 20:38:15 +13:00
Brenda Wallace
24f970f4f4
Added alt tag
2019-11-16 13:21:42 +13:00
Brenda Wallace
c87ae7be29
add photo to the map, if we have one
2019-11-16 13:20:38 +13:00
Brenda Wallace
1697f3e758
Update model spec for location
2019-11-16 13:07:38 +13:00
Brenda Wallace
df5b0499e4
Update spec for api resource
2019-11-16 13:05:40 +13:00
Brenda Wallace
535ddcdcff
Added plantings to places map
2019-11-16 12:16:18 +13:00
Brenda Wallace
a437338961
Fix markers on crops#show map
2019-11-16 11:35:45 +13:00
Brenda Wallace
66fae333a9
Rename crops js file so it gets included correctly
...
this crops.js.erb file was being ignored because a crops.coffee exists
2019-11-16 11:21:40 +13:00
Brenda Wallace
2b7c21bf2e
Fix marker on member map too
2019-11-16 11:16:53 +13:00
Brenda Wallace
f27cf0caf6
Added link to icon documentation
2019-11-16 11:11:41 +13:00
Brenda Wallace
df55a5b0a8
Add marker for leaflet maps, and use asset pipeline to serve file
2019-11-16 10:42:22 +13:00
Brenda Wallace
1dec690951
Merge pull request #2273 from Growstuff/dev
...
production release
2019-11-15 12:55:19 +13:00
Brenda Wallace
69d9e1e76e
Merge pull request #2271 from Br3nda/jump-to-garden
...
Link to jump to garden
2019-11-15 12:16:39 +13:00
Brenda Wallace
e127832d37
Merge pull request #2272 from Br3nda/ordering
...
Order the garden names
2019-11-15 12:16:23 +13:00
Brenda Wallace
cfef6f5eb2
Link to jump to garden
2019-11-15 11:47:32 +13:00
Brenda Wallace
75037c7e21
Order the garden names
2019-11-15 11:32:13 +13:00
Brenda Wallace
856d975551
Merge pull request #2269 from Growstuff/dev
...
Production release
2019-11-13 11:44:01 +13:00
dependabot-preview[bot]
a4659f141a
Bump rake from 13.0.0 to 13.0.1
...
Bumps [rake](https://github.com/ruby/rake ) from 13.0.0 to 13.0.1.
- [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/v13.0.0...v13.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-12 08:13:20 +00:00
dependabot-preview[bot]
476f068807
Bump omniauth-flickr from 0.0.19 to 0.0.20
...
Bumps [omniauth-flickr](https://github.com/timbreitkreutz/omniauth-flickr ) from 0.0.19 to 0.0.20.
- [Release notes](https://github.com/timbreitkreutz/omniauth-flickr/releases )
- [Commits](https://github.com/timbreitkreutz/omniauth-flickr/compare/v0.0.19...v0.0.20 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-12 01:10:16 +00:00
Brenda Wallace
6bd53094ba
Merge pull request #2267 from Growstuff/imgbot
...
[ImgBot] Optimize images
2019-11-11 19:00:15 +13:00
ImgBotApp
be884ad1fb
[ImgBot] Optimize images
...
*Total -- 24.17kb -> 22.54kb (6.78%)
/app/assets/images/icons/timeline.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/finished.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/planting-add.svg -- 2.81kb -> 2.52kb (10.45%)
/app/assets/images/icons/seed-add.svg -- 4.21kb -> 3.91kb (7.07%)
/app/assets/images/icons/sprout-add.svg -- 3.81kb -> 3.58kb (6%)
/app/assets/images/icons/seeds.svg -- 3.45kb -> 3.29kb (4.69%)
/app/assets/images/icons/harvest-add.svg -- 4.98kb -> 4.78kb (3.9%)
/app/assets/images/icons/trade.svg -- 0.91kb -> 0.89kb (2.14%)
Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com >
2019-11-11 05:00:09 +00:00
Brenda Wallace
130febb735
Change regex not letting utf-8 garden names save ( #1641 )
...
* Remove regex not letting utf-8 garden names save
closes #1634
2019-11-11 17:59:41 +13:00
Brenda Wallace
b8b579a5ba
rubycop fix up
2019-11-11 17:45:37 +13:00
codefactor-io
e0ea039347
[CodeFactor] Apply fixes to commit a651f07
2019-11-11 04:42:30 +00:00
Brenda Wallace
a651f079d8
Simplify garden.name validation regexp
2019-11-11 17:41:46 +13:00
Brenda Wallace
cfaa18daaf
Merge remote-tracking branch 'upstream/dev' into UTFGardenNames
2019-11-11 14:14:34 +13:00
dependabot-preview[bot]
9b15b42cbd
[Security] Bump chartkick from 3.2.2 to 3.3.0
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.2.2 to 3.3.0. **This update includes a security fix.**
- [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.2...v3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-10 09:44:33 +00:00
dependabot-preview[bot]
5cb00f4423
Bump puma from 4.2.1 to 4.3.0
...
Bumps [puma](https://github.com/puma/puma ) from 4.2.1 to 4.3.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.2.1...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-08 23:32:20 +00:00
dependabot-preview[bot]
e617d2aac9
Bump faker from 2.6.0 to 2.7.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.6.0 to 2.7.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.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-06 09:18:10 +00:00
dependabot-preview[bot]
bdfce436b4
Bump scout_apm from 2.6.2 to 2.6.3
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.2 to 2.6.3.
- [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.6.2...v2.6.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-06 08:48:02 +00:00
Brenda Wallace
74d4f19203
Merge pull request #2261 from Growstuff/dev
...
Production Release
2019-11-05 13:16:29 +13:00
Brenda Wallace
a4b7ded8a3
Merge pull request #2260 from Br3nda/all-varieties
...
show all varieties (including grandchildren)
2019-11-05 11:12:42 +13:00
Brenda Wallace
405de0fb18
Merge branch 'dev' into all-varieties
2019-11-02 13:21:30 +13:00
Brenda Wallace
1f8ef86053
Merge pull request #2258 from Growstuff/dev
...
Production release
2019-11-01 22:13:39 +13:00
Brenda Wallace
01d974f9ee
Merge pull request #2259 from Br3nda/parent-seed
...
Specs for linking plantings to seeds
2019-11-01 22:13:20 +13:00
Brenda Wallace
d0bee45c0c
show all varieties (including grandchildren)
2019-11-01 21:33:43 +13:00
Brenda Wallace
c27622803d
Specs for linking plantings to seeds
2019-11-01 17:18:51 +13:00
Brenda Wallace
b214f7ad8d
linking existing plantings to their parent seeds
2019-11-01 02:23:14 +00:00
dependabot-preview[bot]
2cb438f15d
Bump rubocop from 0.75.1 to 0.76.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.75.1 to 0.76.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.75.1...v0.76.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-01 00:25:00 +00:00
Brenda Wallace
6b023de063
Merge pull request #2255 from Growstuff/dev
...
Production release
2019-10-29 13:26:43 +13:00
Brenda Wallace
91fa8e6a62
Merge pull request #2254 from Br3nda/seeds
...
tidy up display of seeds
2019-10-29 11:25:57 +13:00
Brenda Wallace
585406ad11
Merge branch 'dev' into seeds
2019-10-28 22:19:50 +13:00
Brenda Wallace
2f2169f89a
tidy up display of seeds
2019-10-28 22:12:08 +13:00
dependabot-preview[bot]
b24beae9af
Bump chartkick from 3.2.1 to 3.2.2
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.2.1 to 3.2.2.
- [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.1...v3.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-28 08:53:06 +00:00
dependabot-preview[bot]
42e4d24004
Bump sidekiq from 6.0.2 to 6.0.3
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.2 to 6.0.3.
- [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/v6.0.2...v6.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-28 08:33:50 +00:00
Brenda Wallace
e472e1cd14
Merge pull request #2248 from Growstuff/dev
...
Production release
2019-10-27 14:09:44 +13:00
Brenda Wallace
a9f3125191
Merge pull request #2249 from Br3nda/weeks
...
planting time line week by week
2019-10-27 13:22:48 +13:00
Brenda Wallace
b2e90cddc6
Merge branch 'dev' into weeks
2019-10-25 13:41:30 +13:00
André Aubin
279d85456b
Switching gravatar urls to secure subdomain
2019-10-24 23:51:52 +00:00
André Aubin
a3fa774d84
Force ssl on gravatar-ultimate gem
2019-10-24 23:51:52 +00:00
André Aubin
15608fc86a
Update Contributors.md
2019-10-24 23:51:52 +00:00
André Aubin
66045866b3
Switch to HTTPS for Gravatar urls
2019-10-24 23:51:52 +00:00
Brenda Wallace
8cf5acc30a
Update spec to expect weeks to be rounded
2019-10-25 07:42:13 +13:00
Brenda Wallace
9d232e26cb
Update app/views/crops/_predictions.html.haml
2019-10-25 06:42:00 +13:00
Brenda Wallace
d96b30fff8
spec for in_weeks method
2019-10-24 21:06:28 +13:00
Brenda Wallace
2d6d02d0b3
added in_weeks helper
2019-10-24 21:03:30 +13:00
Brenda Wallace
358631d0f9
update spec to look for weeks
2019-10-24 20:58:27 +13:00
Brenda Wallace
95ae4d41ba
rounding on weeks
2019-10-24 20:58:13 +13:00
Brenda Wallace
627d97155f
Tidy up
2019-10-24 19:59:18 +13:00
Brenda Wallace
329262e2f5
show "finished" when planting is finished
2019-10-24 19:45:08 +13:00
Brenda Wallace
5d4f1abacd
show unknown date when unknown finish date
2019-10-24 19:44:58 +13:00
Brenda Wallace
f7f3ac695f
better name for css class progress-fade
2019-10-24 19:16:41 +13:00
Brenda Wallace
a1479c9126
fixed call to missing method
2019-10-24 19:13:41 +13:00
Brenda Wallace
dfe533dda1
DRY and tidy
2019-10-24 19:13:20 +13:00
Brenda Wallace
f4c4e1c93f
Collapse crop card content
2019-10-24 19:10:44 +13:00
Brenda Wallace
1a0e30491f
Removed unused methods
2019-10-24 19:04:37 +13:00
Brenda Wallace
053a33cd72
Removed commented out code
2019-10-24 18:58:50 +13:00
Brenda Wallace
0cc62c2b98
show planted_at, even when we can't predict finish
2019-10-24 18:57:16 +13:00
Brenda Wallace
c094b5daf9
Update spec, to look for new emojii timeline
2019-10-24 18:55:47 +13:00
Brenda Wallace
38713af603
plantings timeline with icons
2019-10-24 16:36:16 +13:00
Brenda Wallace
dc3a730064
update spec to use expect syntax
2019-10-24 16:15:06 +13:00
dependabot-preview[bot]
85634fc43b
Bump factory_bot_rails from 5.1.0 to 5.1.1
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.1.0...v5.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-23 08:58:12 +00:00
dependabot-preview[bot]
9de1d02cb1
Bump loofah from 2.3.0 to 2.3.1
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-23 08:27:33 +00:00
Brenda Wallace
d5d0c9e132
Merge pull request #2224 from Br3nda/search
...
Show more results in search
2019-10-23 21:06:10 +13:00
Brenda Wallace
ae48844d87
Merge branch 'dev' into search
2019-10-23 15:55:27 +13:00
Brenda Wallace
3ef85ac2f6
Merge pull request #2221 from Br3nda/planting-reminders
...
📧 Polish planting reminders stylings and data
2019-10-23 15:55:10 +13:00
Brenda Wallace
19cb89be1e
Merge branch 'dev' into planting-reminders
2019-10-23 09:24:56 +13:00
dependabot-preview[bot]
603251de75
Bump selenium-webdriver from 3.142.4 to 3.142.6
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.4 to 3.142.6.
- [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-10-22 19:07:56 +00:00
Brenda Wallace
f4f9f8626c
Merge branch 'dev' into search
2019-10-23 07:46:05 +13:00
Brenda Wallace
8b7697c6d6
Merge branch 'dev' into planting-reminders
2019-10-23 07:45:24 +13:00
dependabot-preview[bot]
b69baa8b22
Bump rspec-rails from 3.8.2 to 3.9.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 18:43:28 +00:00
dependabot-preview[bot]
9b4ead388b
Bump rake from 12.3.3 to 13.0.0
...
Bumps [rake](https://github.com/ruby/rake ) from 12.3.3 to 13.0.0.
- [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.3...v13.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 14:56:52 +00:00
dependabot-preview[bot]
4fa803a40d
Bump listen from 3.1.5 to 3.2.0
...
Bumps [listen](https://github.com/guard/listen ) from 3.1.5 to 3.2.0.
- [Release notes](https://github.com/guard/listen/releases )
- [Commits](https://github.com/guard/listen/compare/v3.1.5...v3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 14:14:57 +00:00
dependabot-preview[bot]
ebe3c9c0e6
Bump faker from 2.4.0 to 2.6.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.4.0 to 2.6.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.4.0...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 13:04:42 +00:00
dependabot-preview[bot]
9eff481606
Bump rubocop-rspec from 1.35.0 to 1.36.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.35.0 to 1.36.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.35.0...v1.36.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 12:26:09 +00:00
dependabot-preview[bot]
9ae80fbf9d
Bump oj from 3.9.1 to 3.9.2
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.9.1 to 3.9.2.
- [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.1...v3.9.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 11:06:44 +00:00
dependabot-preview[bot]
f1cc01313f
Bump puma from 4.2.0 to 4.2.1
...
Bumps [puma](https://github.com/puma/puma ) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.2.0...v4.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 10:10:07 +00:00
dependabot-preview[bot]
09f0ec1dc0
Bump rubocop from 0.74.0 to 0.75.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.74.0 to 0.75.1.
- [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.74.0...v0.75.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 09:45:26 +00:00
Brenda Wallace
e1dfd122d4
Merge pull request #2235 from Growstuff/dev
...
Production release
2019-10-22 22:44:55 +13:00
dependabot-preview[bot]
d49a4c8db0
Bump scout_apm from 2.6.1 to 2.6.2
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.1 to 2.6.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.6.1...v2.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 01:14:15 +00:00
dependabot-preview[bot]
6d4e68f58d
Bump newrelic_rpm from 6.6.0.358 to 6.7.0.359
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.6.0.358 to 6.7.0.359.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/compare/6.6.0.358...6.7.0.359 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 00:53:44 +00:00
dependabot-preview[bot]
bb18d1dea3
Bump sidekiq from 6.0.0 to 6.0.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 6.0.0 to 6.0.2.
- [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/v6.0.0...v6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-22 00:19:12 +00:00
dependabot-preview[bot]
00b8f72152
Bump faraday from 0.15.4 to 0.17.0
...
Bumps [faraday](https://github.com/lostisland/faraday ) from 0.15.4 to 0.17.0.
- [Release notes](https://github.com/lostisland/faraday/releases )
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lostisland/faraday/compare/v0.15.4...v0.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-21 22:06:47 +00:00
dependabot-preview[bot]
55547d2916
Bump webdrivers from 4.1.2 to 4.1.3
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.2 to 4.1.3.
- [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.2...v4.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-21 21:41:22 +00:00
dependabot-preview[bot]
073cbeaab6
Bump loofah from 2.2.3 to 2.3.0
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-21 21:12:06 +00:00
dependabot-preview[bot]
bdbe73ada2
Bump haml_lint from 0.33.0 to 0.34.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.33.0 to 0.34.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.33.0...v0.34.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-21 20:34:39 +00:00
dependabot-preview[bot]
b9738c8c0f
Bump will_paginate from 3.1.8 to 3.2.1
...
Bumps [will_paginate](https://github.com/mislav/will_paginate ) from 3.1.8 to 3.2.1.
- [Release notes](https://github.com/mislav/will_paginate/releases )
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.8...v3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-21 19:50:51 +00:00
dependabot-preview[bot]
a4e8cc2234
Bump bootstrap_form from 4.2.0 to 4.3.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases )
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-21 18:21:16 +00:00
dependabot-preview[bot]
f471913b74
[Security] Bump rubyzip from 1.2.3 to 1.3.0
...
Bumps [rubyzip](https://github.com/rubyzip/rubyzip ) from 1.2.3 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases )
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md )
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.3...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-21 17:58:12 +00:00
Brenda Wallace
c6f4eef291
Show more results in searches
2019-10-21 16:24:31 +13:00
Brenda Wallace
440499530b
Merge pull request #2223 from Growstuff/dev
...
Production release
2019-10-21 16:23:13 +13:00
Brenda Wallace
6d6d1930d1
Merge branch 'dev' into planting-reminders
2019-10-21 15:53:25 +13:00
Brenda Wallace
71e6ee98b9
Merge pull request #2202 from Br3nda/role-admin
...
Administer member's roles
2019-10-21 15:52:31 +13:00
Brenda Wallace
d90a58218a
Remove roles#show
2019-10-21 15:38:46 +13:00
Brenda Wallace
13c024fac9
Fixed typo in spec
2019-10-21 15:13:47 +13:00
Brenda Wallace
798883be1c
Typo/spelling fix
2019-10-21 14:45:21 +13:00
Brenda Wallace
abd91fa37b
Use bang! to indicate method can explode
2019-10-21 14:43:46 +13:00
Brenda Wallace
498a754eea
update specs for admin roles
2019-10-21 14:32:23 +13:00
Brenda Wallace
6280115055
Merge branch 'role-admin' of github.com:br3nda/growstuff into role-admin
2019-10-21 14:27:02 +13:00
Brenda Wallace
47be6ad631
Merge branch 'dev' into role-admin
2019-10-21 14:24:31 +13:00
Brenda Wallace
7517abd1f3
Merge remote-tracking branch 'origin/planting-reminders' into planting-reminders
2019-10-21 14:23:03 +13:00
Brenda Wallace
8cdae6647d
Merge remote-tracking branch 'upstream/dev' into planting-reminders
2019-10-21 14:20:45 +13:00
Brenda Wallace
4a1e57e42a
Merge remote-tracking branch 'upstream/dev' into dev
2019-10-21 14:20:23 +13:00
Brenda Wallace
9efd9d0544
Merge remote-tracking branch 'upstream/dev' into dev
2019-10-21 14:19:57 +13:00
Brenda Wallace
8c694b3dca
Only show companions of active plantings
2019-10-21 14:19:47 +13:00
Brenda Wallace
edea87ab5d
Merge branch 'dev' into planting-reminders
2019-10-21 12:33:58 +13:00
Brenda Wallace
fb5b17741d
Merge pull request #2222 from Br3nda/puma
...
Switch from unicorn to puma
2019-10-21 12:30:16 +13:00
Brenda Wallace
e1faedfc78
Merge branch 'dev' into planting-reminders
2019-10-20 21:36:42 +13:00
Brenda Wallace
ca11792286
Only show companions of active plantings
2019-10-20 14:13:30 +13:00
Brenda Wallace
94452ee62e
polish up the plantings reminders
2019-10-20 14:12:34 +13:00
Brenda Wallace
e0dc38e7a3
add perennials
2019-10-20 09:49:03 +13:00
Brenda Wallace
4af89d2b2c
Change reminder email into monthly summary
2019-10-20 09:49:03 +13:00
Brenda Wallace
c19d09bb37
Switch from unicorn to puma
2019-10-19 18:47:28 +13:00
Brenda Wallace
7f0113a188
Merge remote-tracking branch 'upstream/master' into dev
2019-10-19 18:46:53 +13:00
Brenda Wallace
d81df50dc5
Suggest companions for a garden based on existing crops
2019-10-19 18:45:11 +13:00
Brenda Wallace
a75803d456
Merge branch 'dev'
2019-10-19 18:20:20 +13:00
Brenda Wallace
bb72d2b974
Fix bug showing plantings with no planted_at
2019-10-19 18:20:01 +13:00
Brenda Wallace
3c50705d5f
Merge pull request #2220 from Growstuff/dev
...
production release
2019-10-19 16:43:10 +13:00
Brenda Wallace
c26cec4868
Merge pull request #2219 from Br3nda/feature-2207
...
Group previous plantings by year
2019-10-19 16:42:55 +13:00
Brenda Wallace
6bd7e139a6
Move views specs to admin
2019-10-19 16:04:16 +13:00
Brenda Wallace
f2dc2aeaa0
Merge branch 'dev' into feature-2207
2019-10-19 16:01:11 +13:00
Brenda Wallace
95ec89f6a0
Merge branch 'dev' into role-admin
2019-10-19 13:23:25 +13:00
Brenda Wallace
1d97250726
Merge pull request #2216 from Br3nda/wider-gardens
...
Widen gardens on gardens#index
2019-10-19 13:23:00 +13:00
Brenda Wallace
ecb0c53c80
Merge branch 'dev' into feature-2207
2019-10-19 13:22:19 +13:00
Brenda Wallace
0965168750
Group previous plantings by year
2019-10-19 11:25:19 +13:00
Brenda Wallace
dc909132ef
Merge branch 'dev' into role-admin
2019-10-19 10:52:18 +13:00
Brenda Wallace
95affc8ca8
Merge branch 'dev' into wider-gardens
2019-10-19 10:50:16 +13:00
Brenda Wallace
f50417cc04
Merge pull request #2218 from Br3nda/gem-asset-fix
...
Add source for leaflet
2019-10-19 10:49:50 +13:00
Brenda Wallace
75897bad51
Update routing specs for admin roles
2019-10-19 10:28:24 +13:00
Brenda Wallace
fc07571ee1
Rename is_admin? to admin?.
2019-10-19 10:25:17 +13:00
Brenda Wallace
35c9b70bc9
Remove email from display in admin/members
2019-10-19 10:23:39 +13:00
Brenda Wallace
5a6d0f6342
Check admin before roles controller runs
2019-10-19 10:22:27 +13:00
Brenda Wallace
2ddddb1652
Updated specs for admin editing roles
2019-10-19 10:16:02 +13:00
Brenda Wallace
c940ba447e
Add source for leaflet, fixes #2217
2019-10-19 09:47:29 +13:00
Brenda Wallace
dc3bc85777
Remove comments
2019-10-19 09:44:05 +13:00
Brenda Wallace
1a34bfb9a2
Merge remote-tracking branch 'origin/role-admin' into role-admin
2019-10-19 09:43:12 +13:00
Brenda Wallace
21848bf5b4
Merge branch 'dev' into role-admin
2019-10-19 09:42:49 +13:00
Brenda Wallace
a6cb81f4d1
Widen gardens on gardens#index
2019-10-19 09:41:43 +13:00
Brenda Wallace
80b82a99fe
Fix broken spec on dev
2019-10-19 09:41:09 +13:00
Brenda Wallace
88a771459c
Merge branch 'dev' into role-admin
2019-10-18 09:43:44 +13:00
Brenda Wallace
fd39d6ef8c
More per page
2019-10-08 15:54:53 +13:00
codefactor-io
6d472c5d66
[CodeFactor] Apply fixes
2019-10-07 23:35:39 +00:00
Brenda Wallace
f77a0e37b9
Merge branch 'dev' into role-admin
2019-10-08 11:22:13 +13:00
Brenda Wallace
ca0915585c
Merge pull request #2193 from Growstuff/dev
...
Production release
2019-10-08 11:21:18 +13:00
Brenda Wallace
b0c8b11246
📝 Inline editing and display tidy ups ( #2200 )
...
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
bestest-mensch
d72ec5890a
address code climate issues
2019-10-07 21:38:19 +00:00
bestest-mensch
1e1b9f5ef5
scope conversations delete multiple to current user
2019-10-07 21:38:19 +00:00
bestest-mensch
9f8e2e65be
update/add specs
2019-10-07 21:38:19 +00:00
bestest-mensch
80fb4f5fe6
add ability to delete multiple conversations at once
2019-10-07 21:38:19 +00:00
bestest-mensch
01df35e5a6
update contributors
2019-10-06 04:08:09 +00:00
bestest-mensch
d39dc65c4e
small ui tweak
2019-10-06 04:08:09 +00:00
Brenda Wallace
3422a0d899
Administer member's roles
2019-10-06 14:19:39 +13:00
Brenda Wallace
f297fdc677
Inline editing and display tidy ups
2019-10-05 20:58:00 +13:00
Brenda Wallace
0a71807237
Stop using rails-assets.org ( #2194 )
2019-09-28 18:38:58 +12:00
Brenda Wallace
3eb30a5555
Removed duplicate crop info
2019-09-28 17:44:37 +12:00
Brenda Wallace
7b5698f977
👩🌾 Import openfarm data ( #2177 )
...
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
2019-09-28 17:23:25 +12:00
Brenda Wallace
6a4158ae04
👭 Crop companions ( #2176 )
...
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
2019-09-28 10:38:01 +12:00
dependabot-preview[bot]
e043199866
Bump uglifier from 4.1.20 to 4.2.0
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.20 to 4.2.0.
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-27 16:20:37 +00:00
Brenda Wallace
eaa6ecec98
Merge pull request #2179 from Br3nda/post-comments
...
🚝 Crop to post relationship made more rails standard
2019-09-27 08:14:47 +12:00
Brenda Wallace
9c0c0eeb18
Merge branch 'dev' into post-comments
2019-09-27 08:13:33 +12:00
Brenda Wallace
66a3b2c52b
If we delete a photo, delete the associations records
2019-09-27 08:13:07 +12:00
Brenda Wallace
99e2ca4920
If a crop is deleted, delete association (gerund) records too
2019-09-27 08:13:07 +12:00
Brenda Wallace
719fec24d0
if someone is destroy, delete all likes
2019-09-27 08:13:07 +12:00
Brenda Wallace
f7f7638540
Merge branch 'dev' into post-comments
2019-09-26 21:52:47 +12:00
dependabot-preview[bot]
8dc56c48e2
Bump scout_apm from 2.6.0 to 2.6.1
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.6.0 to 2.6.1.
- [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.6.0...v2.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-26 21:51:55 +12:00
Brenda Wallace
e08daa0b2b
Merge branch 'dev' into post-comments
2019-09-26 21:51:17 +12:00
Brenda Wallace
5072353293
Only save location (used for post-signin redirect) if this is a format html page
2019-09-26 21:50:42 +12:00
dependabot-preview[bot]
bcb2464b53
Bump friendly_id from 5.2.5 to 5.3.0
...
Bumps [friendly_id](https://github.com/norman/friendly_id ) from 5.2.5 to 5.3.0.
- [Release notes](https://github.com/norman/friendly_id/releases )
- [Changelog](https://github.com/norman/friendly_id/blob/master/Changelog.md )
- [Commits](https://github.com/norman/friendly_id/compare/5.2.5...5.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-26 09:48:38 +00:00
Brenda Wallace
685fddb2be
Merge remote-tracking branch 'origin/post-comments' into post-comments
2019-09-26 21:14:53 +12:00
Brenda Wallace
7acdc6c96f
Merge remote-tracking branch 'upstream/dev' into post-comments
...
Conflicts:
db/schema.rb
2019-09-26 21:14:12 +12:00
dependabot-preview[bot]
758db158cb
Bump font-awesome-sass from 5.10.2 to 5.11.2
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.10.2 to 5.11.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.10.2...5.11.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-26 09:08:48 +00:00
Brenda Wallace
5da0f1fda0
Merge pull request #2175 from Br3nda/photo-sources
...
📸 Add source to photos
2019-09-26 20:42:19 +12:00
Brenda Wallace
ee093db0e6
Merge branch 'dev' into photo-sources
2019-09-25 10:30:19 +12:00
dependabot-preview[bot]
17b468d440
Bump factory_bot_rails from 5.0.2 to 5.1.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.0.2...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-24 10:21:36 +00:00
Brenda Wallace
93921a9a23
Merge pull request #2166 from Growstuff/dev
...
Production release
2019-09-24 19:10:57 +12:00
dependabot-preview[bot]
61bede6031
Bump bootstrap_form from 4.2.0 to 4.3.0
...
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form ) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases )
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-23 11:03:58 +00:00
dependabot-preview[bot]
743d10e098
Bump puma from 4.1.1 to 4.2.0
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-23 10:36:37 +00:00
Brenda Wallace
fab9560c46
Apply suggestions from code review
2019-09-22 13:22:02 +12:00
Brenda Wallace
90035e79b8
Crop to post relationship made more rails standard
2019-09-22 10:07:50 +12:00
Brenda Wallace
5fab14dc8a
Fixed associations view
2019-09-21 10:28:52 +12:00
Brenda Wallace
87e1a7571b
Photo source in the schema
2019-09-21 09:45:34 +12:00
Brenda Wallace
60ceef4fce
Only show photo associations if we have any
2019-09-21 09:43:36 +12:00
Brenda Wallace
367377088b
Fix specs for photo sources
2019-09-21 09:37:55 +12:00
Brenda Wallace
c97e380187
Merge branch 'dev' into photo-sources
2019-09-20 22:37:02 +12:00
Brenda Wallace
b7321ed46f
Add source to photos
2019-09-20 22:26:39 +12:00
dependabot-preview[bot]
9e216e3ae9
Bump font-awesome-sass from 5.9.0 to 5.10.2
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.9.0 to 5.10.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.9.0...5.10.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-20 10:24:20 +00:00
dependabot-preview[bot]
2fc34bf612
Bump faker from 2.3.0 to 2.4.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.3.0 to 2.4.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.3.0...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-20 09:55:40 +00:00
dependabot-preview[bot]
c19bf8ea72
Bump faker from 2.2.2 to 2.3.0
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.2 to 2.3.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.2.2...v2.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-14 11:45:44 +00:00
dependabot-preview[bot]
835f831e26
Bump puma from 4.1.0 to 4.1.1
...
Bumps [puma](https://github.com/puma/puma ) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.1.0...v4.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-14 11:17:32 +00:00
Brenda Wallace
1c192bd51d
Fixing apt install errors on travis runs ( #2171 )
2019-09-14 22:43:19 +12:00
Brenda Wallace
8fae9a225b
Comment out chromium
2019-09-14 11:26:49 +12:00
dependabot-preview[bot]
64066e1556
Bump scout_apm from 2.5.2 to 2.6.0
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.5.2 to 2.6.0.
- [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.2...v2.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-12 11:30:25 +00:00
dependabot-preview[bot]
413d759ce5
Bump faker from 2.2.1 to 2.2.2
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.2.1 to 2.2.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.2.1...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-10 04:39:45 +00:00
Brenda Wallace
3cbb79981e
Merge pull request #2152 from Br3nda/display
...
🗑️ Removing unused styles
2019-09-10 00:25:07 +12:00
Brenda Wallace
1a0cd5f7a7
Merge pull request #2150 from Br3nda/fix/2106-followers
...
🤗 Allow anyone to view followers - and tidy up display
2019-09-10 00:24:31 +12:00
dependabot-preview[bot]
012b8a4ec0
Bump devise from 4.7.0 to 4.7.1
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.7.0 to 4.7.1.
- [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.7.0...v4.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-09 12:23:44 +00:00
dependabot-preview[bot]
43f35ac6df
Bump newrelic_rpm from 6.5.0.357 to 6.6.0.358
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.5.0.357 to 6.6.0.358.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/compare/6.5.0.357...6.6.0.358 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-06 23:13:26 +00:00
Brenda Wallace
29643810fe
Merge branch 'dev' into display
2019-09-05 12:07:17 +12:00
Brenda Wallace
c7e4883332
Update README.md
2019-09-05 12:04:32 +12:00
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
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
Brenda Wallace
c173d359d8
Split up giant member model
2019-08-12 10:00:21 +12:00
Brenda Wallace
c77742abab
Wrapped long line
2019-08-12 09:51:05 +12:00
Brenda Wallace
295eb57a86
Merge branch 'dev' into mailbox
2019-08-12 09:42:55 +12:00
Brenda Wallace
522bec7775
Merge pull request #2129 from Growstuff/awesomecode-lint-ruby-space-36545
...
Auto corrected by following Lint Ruby Space
2019-08-12 09:42:29 +12:00
Brenda Wallace
df87a79ab6
Only send email if user wants them
2019-08-12 09:40:53 +12:00
Awesome Code
924e96eda1
Auto corrected by following Lint Ruby Space
2019-08-11 21:39:46 +00:00
dependabot-preview[bot]
0dfe8abd51
[Security] Bump nokogiri from 1.10.3 to 1.10.4
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-11 21:38:33 +00:00
Brenda Wallace
222400d4e1
links to member from conversations#index
2019-08-11 20:55:20 +12:00
Brenda Wallace
109f9af0b9
Unread counts
2019-08-11 17:04:52 +12:00
Brenda Wallace
c189e4ed3d
Bigger envelope icons on conversations#index
2019-08-11 16:55:32 +12:00
Brenda Wallace
44d8cd0f63
Copy timestamps from Notifications to Conversations
2019-08-11 16:55:15 +12:00
Brenda Wallace
11ef0fb694
Removed test for unused method
2019-08-11 16:31:51 +12:00
Brenda Wallace
e01b53fd9b
Remove extra validators on notification
...
We are migrating away from here
2019-08-11 15:52:11 +12:00
Brenda Wallace
3c073a950a
Reducing size of member model
2019-08-11 15:50:48 +12:00
Brenda Wallace
c4b33db495
Mark read notifications as read after migrating to conversations
2019-08-11 15:50:36 +12:00
Brenda Wallace
031734bb7f
shorten method
2019-08-11 14:24:43 +12:00
Brenda Wallace
3976d1a982
Shorten method
2019-08-11 14:24:17 +12:00
Brenda Wallace
105c2639e4
Adding timestamps to tables
2019-08-11 14:23:27 +12:00
Brenda Wallace
4f74b20565
Migrate from notifications to conversations without sending emails
2019-08-11 14:17:30 +12:00
Brenda Wallace
0d370603b7
Rename spec from Notifications to Conversations
2019-08-11 13:39:00 +12:00
Brenda Wallace
2a3563f9fd
Migration from notifications to mailboxer
2019-08-11 13:37:56 +12:00
Brenda Wallace
5d7ef7e861
rubocop lint
2019-08-10 17:30:41 +12:00
Brenda Wallace
083d7c09e6
Migration of notifications to mailboxer, without sending new emails
2019-08-10 17:30:24 +12:00
Brenda Wallace
d76c77d176
Merge branch 'dev' into mailbox
2019-08-10 16:34:43 +12:00
Brenda Wallace
f676054cd6
switch to member.discard
2019-08-10 16:09:57 +12:00
Brenda Wallace
82a3cc35a4
Fix member discarding to match specs
2019-08-10 15:43:06 +12:00
Brenda Wallace
1872bff346
Restore notifier
...
not hooked up to mailboxer yet
2019-08-10 12:09:23 +12:00
Brenda Wallace
b3807100d1
fixes email sending
2019-08-10 11:47:45 +12:00
Brenda Wallace
d4644ccdf8
Added join to members to fix error caused by discard gem
2019-08-10 11:37:52 +12:00
Brenda Wallace
5226eadfd8
fix crop join to members
2019-08-10 11:07:12 +12:00
Brenda Wallace
843e15a107
Removed notification view spec
2019-08-10 10:53:20 +12:00
Brenda Wallace
86540c3352
Removed feature plantings code and spec
...
because it's not used
2019-08-10 10:52:49 +12:00
Brenda Wallace
0a919d8599
Remove notifications spec
2019-08-10 10:50:57 +12:00
Brenda Wallace
c137d5e285
update signin spec to use messages and converations
2019-08-10 10:48:48 +12:00
Brenda Wallace
9de51d8a9a
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-08-10 10:39:59 +12:00
Brenda Wallace
c29f0c15ee
don't join to owners when fetching gardens
...
discard isn't the same
2019-08-10 10:39:40 +12:00
dependabot-preview[bot]
b726d0c9bf
Bump puma from 4.0.1 to 4.1.0
...
Bumps [puma](https://github.com/puma/puma ) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.0.1...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-09 21:16:24 +00:00
Brenda Wallace
2764c3f0e0
Merge branch 'dev' into mailbox
2019-08-09 22:33:22 +12:00
Brenda Wallace
1dfbecfac0
Don't re-look up planting
2019-08-09 22:32:36 +12:00
dependabot-preview[bot]
b33ab3bd71
Bump js-routes from 1.4.7 to 1.4.9
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.7 to 1.4.9.
- [Release notes](https://github.com/railsware/js-routes/releases )
- [Changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md )
- [Commits](https://github.com/railsware/js-routes/compare/v1.4.7...v1.4.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-08 00:01:50 +00:00
Brenda Wallace
b04bdd111a
Merge remote-tracking branch 'upstream/dev' into mailbox
...
Conflicts:
app/views/harvests/show.html.haml
2019-08-08 11:23:41 +12:00
Brenda Wallace
e49878ff7f
Delete stale.yml
2019-08-08 11:15:36 +12:00
Brenda Wallace
523eda01a0
Merge branch 'master' into dev
2019-08-08 11:15:22 +12:00
Brenda Wallace
8641c13c06
Merge pull request #2112 from Br3nda/harvest-show
...
Tidy up display of harvests#show
2019-08-08 11:14:49 +12:00
Brenda Wallace
548bc1581a
Removing notification mailer spec
2019-08-08 10:21:39 +12:00
Brenda Wallace
4a81b18159
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-08-08 09:32:09 +12:00
Brenda Wallace
12c1002dc6
Removing unused notifications code
2019-08-08 09:31:53 +12:00
Brenda Wallace
0fa1966c68
Merge branch 'dev' into mailbox
2019-08-08 09:25:30 +12:00
dependabot-preview[bot]
6ebd22c8a3
Bump percy-capybara from 4.0.1 to 4.0.2
...
Bumps [percy-capybara](https://github.com/percy/percy-capybara ) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/percy/percy-capybara/releases )
- [Commits](https://github.com/percy/percy-capybara/compare/v4.0.1...v4.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 13:47:07 +00:00
dependabot-preview[bot]
4306ab12c7
Bump haml from 5.1.1 to 5.1.2
...
Bumps [haml](https://github.com/haml/haml ) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/v5.1.1...v5.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 13:20:56 +00:00
dependabot-preview[bot]
9a106d4ba6
Bump rubocop from 0.73.0 to 0.74.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.73.0 to 0.74.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.73.0...v0.74.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 12:48:52 +00:00
dependabot-preview[bot]
b6e5a88b32
Bump webdrivers from 4.1.1 to 4.1.2
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.1 to 4.1.2.
- [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.1...v4.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 11:49:25 +00:00
Brenda Wallace
69d3b89e87
Update install_elasticsearch.sh
2019-08-07 22:52:11 +12:00
Brenda Wallace
4d75c59301
back to elastic 6.2.3
2019-08-07 22:51:52 +12:00
Brenda Wallace
920123f58f
Merge branch 'dev' into harvest-show
2019-08-07 22:43:34 +12:00
Brenda Wallace
bccd83c706
Merge branch 'dev' into mailbox
2019-08-07 22:43:15 +12:00
dependabot-preview[bot]
329bf16872
Bump rubocop-rspec from 1.34.0 to 1.35.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.34.0 to 1.35.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.34.0...v1.35.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 10:41:54 +00:00
Brenda Wallace
21b63d9b62
lint
2019-08-07 22:36:43 +12:00
Brenda Wallace
3a87b73620
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-08-07 22:35:02 +12:00
Brenda Wallace
909d9b34ef
lint
2019-08-07 22:34:53 +12:00
Brenda Wallace
2f5f8985e7
lint
2019-08-07 22:34:41 +12:00
Brenda Wallace
2f0e387646
rubocop lint
2019-08-07 22:33:39 +12:00
Brenda Wallace
83322becb2
Use guard clause
2019-08-07 22:33:01 +12:00
codefactor-io
78852e14c9
[CodeFactor] Apply fixes
2019-08-07 10:32:24 +00:00
Brenda Wallace
d208cce57b
Merge branch 'dev' into mailbox
2019-08-07 22:32:00 +12:00
Brenda Wallace
dc59b487ca
tests for restoring conversations
2019-08-07 22:28:18 +12:00
Brenda Wallace
cafbfb349f
Delete and restore buttons
2019-08-07 22:18:24 +12:00
Brenda Wallace
8d12586aa2
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-08-07 21:49:40 +12:00
Brenda Wallace
60671af6ab
Conversations spec
2019-08-07 21:49:27 +12:00
Brenda Wallace
33c29e54be
Merge branch 'dev' into harvest-show
2019-08-07 20:00:48 +12:00
dependabot-preview[bot]
3e2d1c806b
Bump faker from 1.9.6 to 2.1.0
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.6 to 2.1.0.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/1.9.6...v2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 07:28:54 +00:00
Daniel O'Connor
72fd579045
Merge branch 'dev' into mailbox
2019-08-07 16:41:57 +09:30
Daniel O'Connor
cf03cf4ad9
Merge branch 'dev' into harvest-show
2019-08-07 16:33:40 +09:30
dependabot-preview[bot]
3345cd200c
Bump capybara from 3.26.0 to 3.28.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.26.0 to 3.28.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.26.0...3.28.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-07 06:57:08 +00:00
Brenda Wallace
9651bc6db5
Changed notifications spec to conversations spec
2019-08-07 16:51:46 +12:00
Brenda Wallace
ba1c3a7159
add the notifications helper back
2019-08-07 16:20:10 +12:00
Brenda Wallace
149f92536d
conversations view matching the index (avatar photos on the right)
2019-08-07 16:19:43 +12:00
Brenda Wallace
4c045374ff
tidy up plantings view
2019-08-07 16:19:37 +12:00
Brenda Wallace
6af95fa722
Help percy find the correct link
2019-08-07 16:19:11 +12:00
Brenda Wallace
0c8e993006
gardens show all as a button
2019-08-07 16:18:59 +12:00
dependabot-preview[bot]
d6d5e95050
Bump searchkick from 4.0.2 to 4.1.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.0.2...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-06 00:24:06 +00:00
dependabot-preview[bot]
e34883d32d
Bump oj from 3.8.0 to 3.8.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.8.0 to 3.8.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.8.0...v3.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-05 22:41:29 +00:00
Brenda Wallace
5d8a952441
Merge pull request #2119 from Br3nda/fix-travis
...
fixing travis build
2019-08-06 07:23:24 +10:00
Brenda Wallace
493a49bb3e
Nicer display when there are not gardens
2019-08-05 18:57:54 +12:00
Brenda Wallace
17da3bdd96
conversations view changes
2019-08-04 17:41:43 +12:00
Brenda Wallace
71c4154563
Merge remote-tracking branch 'origin/dev' into mailbox
2019-08-04 16:35:57 +12:00
Brenda Wallace
0dc1720711
Double quote to prevent globbing and word splitting.
2019-08-04 16:24:09 +12:00
Brenda Wallace
080e0dbc78
give the caller clues if they don't set a version
2019-08-04 16:21:31 +12:00
Brenda Wallace
00fbfc77e7
tidy up inbox view
2019-08-04 16:04:23 +12:00
Brenda Wallace
5157793202
wrap long line
2019-08-04 15:37:15 +12:00
Brenda Wallace
8d745ed322
Fix bundler cache
2019-08-04 13:44:52 +12:00
Brenda Wallace
9fbd4e4110
Tell travis to use trusty
2019-08-04 11:30:11 +12:00
Brenda Wallace
19ebb5941e
Added comment about postgresql version matchin
2019-08-03 11:49:22 +12:00
Brenda Wallace
086ba0610a
Install postgresql from APT
2019-08-03 11:45:38 +12:00
Brenda Wallace
32a9482d12
Remove sprockets cache
2019-08-03 11:39:08 +12:00
Brenda Wallace
953af21e3e
prefix namespace into ELASTIC_SEARCH_VERSION for travis-ci
2019-08-03 11:23:45 +12:00
Brenda Wallace
2c69b5a99c
Echo the elastic search version
2019-07-29 16:24:50 +12:00
Brenda Wallace
8975e52521
Merge remote-tracking branch 'origin/harvest-show' into harvest-show
2019-07-29 16:20:35 +12:00
Brenda Wallace
4605d6c107
Upgrade to an elastic search version that matches production
2019-07-29 16:19:03 +12:00
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
Brenda Wallace
bf77f31777
don't show progress bars on annuals
2019-07-28 14:28:08 +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
17e3998261
Move from tables to lists
2019-07-23 11:27:53 +12:00
Brenda Wallace
4a8f737bac
Revert "Removed chekcing subject in converation"
...
This reverts commit 6622319466 .
2019-07-23 09:50:37 +12:00
Brenda Wallace
6622319466
Removed chekcing subject in converation
2019-07-23 09:47:16 +12:00
Brenda Wallace
55e0a10dc8
Merge remote-tracking branch 'origin/mailbox' into mailbox
2019-07-23 09:45:22 +12:00
Brenda Wallace
8cb21ec79b
Removing notifications specs
2019-07-23 09:41:54 +12:00
Brenda Wallace
8ca0eef53c
Removing notifications controller specs
2019-07-23 09:41:18 +12:00
Brenda Wallace
fab222f581
Removing rubocop.yml
2019-07-23 09:38:59 +12:00
Brenda Wallace
01cb0ca975
Removed todo
2019-07-23 09:38:30 +12:00
Brenda Wallace
e24c0ee3e8
Removing commented out code
2019-07-23 09:38:22 +12:00
Brenda Wallace
01b53a0e69
continuing to replace notifications with conversations
2019-07-23 09:37:57 +12:00
Brenda Wallace
57ca80f0eb
line up display of posts
2019-07-21 20:26:04 +12:00
Brenda Wallace
50560b01eb
line up boxes
2019-07-21 20:24:56 +12:00
Brenda Wallace
783e4ae046
fixed up comments by deleted members
2019-07-21 20:24:39 +12:00
Brenda Wallace
e90d719436
fixed unread count on headers
2019-07-21 20:24:30 +12:00
Brenda Wallace
3db63aeabf
untrash a message
2019-07-21 20:05:06 +12:00
Brenda Wallace
bcbb020fde
newline at end of file
2019-07-21 19:27:53 +12:00
Brenda Wallace
a9b8003ff3
DRY
2019-07-21 19:23:33 +12:00
Brenda Wallace
6b501f13ee
Fixed double negative
2019-07-21 19:22:25 +12:00
Brenda Wallace
0ac243e129
Remove unused methods
2019-07-21 19:21:55 +12:00
Brenda Wallace
6f2e27952c
Remove unused methods
2019-07-21 19:21:34 +12:00
Brenda Wallace
2b9538c407
Use a guard clause
2019-07-21 19:21:13 +12:00
Brenda Wallace
733a8642dd
rubocop lint
2019-07-21 19:19:14 +12:00
Brenda Wallace
965c9af15a
Sort scss lines
2019-07-21 19:18:13 +12:00
Brenda Wallace
3f84f5abe1
harvest owner info
2019-07-21 19:16:22 +12:00
Brenda Wallace
e309548d20
mark required fields on a message
2019-07-21 19:16:07 +12:00
Brenda Wallace
6485bde8e7
show harvest owner
2019-07-21 19:15:45 +12:00
Brenda Wallace
36c4c1e971
use message path instead of notifications
2019-07-21 19:14:22 +12:00
Brenda Wallace
bcd95aab4a
removed unused partial
2019-07-21 19:14:02 +12:00
Brenda Wallace
754da0777a
preserve which box we're looking at while deleting messages
2019-07-21 19:13:51 +12:00
Brenda Wallace
d382f84f9b
Remove notifications code
2019-07-21 17:28:04 +12:00
Brenda Wallace
6144a7c065
tidy display of discard member on admin page
2019-07-21 17:26:45 +12:00
Brenda Wallace
eda3639708
Discard members on ban
2019-07-21 17:23:28 +12:00
Brenda Wallace
c4806fddf3
re-coloured the memberships to green
2019-07-21 17:21:36 +12:00
Brenda Wallace
39dc878ea7
Tidy up styling of conversations#index
2019-07-21 17:15:21 +12:00
Brenda Wallace
f9f1846bce
Using chip on plantings cards
...
(made room by shrinking the date)
2019-07-21 16:59:59 +12:00
Brenda Wallace
e77e806efc
turn members/tiny into a "chip"
2019-07-21 16:59:26 +12:00
Brenda Wallace
67ce5265b4
Migrate from paranoia to discard
...
closes #1995
2019-07-21 16:59:06 +12:00
Brenda Wallace
7f16fdfe53
working on display of messages in conversations
2019-07-21 15:29:54 +12:00
Brenda Wallace
1df84beb6d
introduce pretty chips for members
2019-07-21 15:29:39 +12:00
Brenda Wallace
dab9a96486
better handling of deleted members
2019-07-21 14:47:32 +12:00
Brenda Wallace
ecb8ad9dfd
removing unused code
2019-07-21 14:24:02 +12:00
Brenda Wallace
1e7eb7326f
rubocop linter
2019-07-21 14:23:02 +12:00
Brenda Wallace
48117eab43
Merge branch 'mailbox' of github.com:br3nda/growstuff into mailbox
2019-07-21 11:25:46 +12:00
Brenda Wallace
a4e0ed0d8d
Fixed deleted imports
2019-07-21 11:25:37 +12:00
Brenda Wallace
53358e9769
Merge branch 'dev' into mailbox
2019-07-21 10:14:36 +12:00
Brenda Wallace
7d9cbe9bf7
Merge branch 'dev' into UTFGardenNames
2019-07-21 10:14:03 +12:00
Brenda Wallace
93a171b1b2
Create stale.yml
2019-07-21 10:13:30 +12:00
Brenda Wallace
1199df6d9d
Merge branch 'dev' into mailbox
2019-07-20 19:44:12 +12:00
Brenda Wallace
d91a5bf55f
Rewriting messages functionality to use mail boxer
2019-07-20 19:43:29 +12:00
Brenda Wallace
66f1133e9b
Merge pull request #2090 from Growstuff/dev
...
Release 58
2019-07-20 14:02:51 +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
Brenda Wallace
26839acf01
Turn off message sending until errors are fixed
2019-07-20 13:21:26 +12:00
Brenda Wallace
339b3fd57e
Moving to conversations and messages instead of notifications
2019-07-20 13:21:05 +12:00
Brenda Wallace
097555ec06
View for messages
2019-07-20 13:20:24 +12:00
Brenda Wallace
629352ef4f
Merge remote-tracking branch 'upstream/dev' into mailbox
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/application.scss
db/schema.rb
2019-07-20 13:20:10 +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
Brenda Wallace
b654fd483b
counter cache was on the wrong side of the relationship
2019-07-15 11:58:46 +00:00
Brenda Wallace
d8df4338a7
DRY garden model - get default photo from photo_capable concern
2019-07-15 11:58:46 +00:00
Brenda Wallace
e5e54d651b
Remove duplicate and unused photo methods
2019-07-15 11:58:46 +00:00
Brenda Wallace
acf58fc5e2
Choose crop photos by most liked
2019-07-15 11:58:46 +00:00
Brenda Wallace
9413d86b05
fixes percy error, running same snapshot more than once
2019-07-15 11:58:46 +00:00
Brenda Wallace
d4cfcb37ba
more percy specs
2019-07-15 11:58:46 +00:00
Brenda Wallace
5348cb6fb5
Merge branch 'master' into dev
2019-07-15 23:56:25 +12:00
dependabot-preview[bot]
485b637e04
Bump rubocop-rails from 2.2.0 to 2.2.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.2.0 to 2.2.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.2.0...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-15 09:04:21 +00:00
Brenda Wallace
1947b01c40
Merge pull request #2076 from Growstuff/dev
...
Release 57
2019-07-14 17:53:42 +12:00
Brenda Wallace
e0e10c29dc
Renaming photographings to photo associations
...
now it matches the name of its controller, and it is clearer to understand
2019-07-13 16:13:37 +12:00
dependabot-preview[bot]
117d066917
Bump puma from 4.0.0 to 4.0.1
...
Bumps [puma](https://github.com/puma/puma ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.0.0...v4.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-12 14:52:22 +00:00
dependabot-preview[bot]
3a746e7755
Bump font-awesome-sass from 5.8.1 to 5.9.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.8.1...5.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-12 11:31:08 +00:00
Brenda Wallace
a4fd0bd011
Merge pull request #2075 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.10
...
Bump jsonapi-resources from 0.9.9 to 0.9.10
2019-07-12 12:27:19 +12:00
Brenda Wallace
004319b97c
Merge pull request #2049 from Br3nda/likeable-photos
...
likes for photos
2019-07-12 12:26:05 +12:00
Brenda Wallace
6816fb9072
Added missing semicolon in scss
2019-07-12 12:02:26 +12:00
Brenda Wallace
1b87026df4
Use camel case in js
2019-07-12 11:59:48 +12:00
Brenda Wallace
80ee3eb8f1
Newline at end of file
2019-07-12 11:59:24 +12:00
Brenda Wallace
013860ba5a
specs for liking photos from crops#show and photos#index
2019-07-12 11:57:21 +12:00
Brenda Wallace
c9f9315d8d
specs for liking photos from photos#show
2019-07-12 11:29:47 +12:00
Brenda Wallace
a7acaea03d
Update posts liking spec to find where the count moved to
2019-07-12 10:47:48 +12:00
Brenda Wallace
76260fec1d
Merge branch 'dev' into likeable-photos
2019-07-12 10:20:05 +12:00
Brenda Wallace
9686305857
The like icons are now the buttons
2019-07-12 10:13:24 +12:00
Brenda Wallace
a87248a43e
DRY up detecting if photo/post already liked
2019-07-12 09:42:45 +12:00
Brenda Wallace
b36e80bbad
Use our own class to indicate liked
2019-07-12 09:37:44 +12:00
Brenda Wallace
2b1895968b
reverting a line
...
aparently this link works out if you've already like it
2019-07-12 09:32:03 +12:00
Brenda Wallace
af0d84d9f1
Updating likes js code
2019-07-12 09:28:45 +12:00
Brenda Wallace
7d1f9c5a3a
Most post like into a wrapper in the html
2019-07-12 08:47:22 +12:00
Brenda Wallace
addb9a48cf
Fix growstuff markdown specs to expect path only links
2019-07-11 15:12:16 +00:00
Brenda Wallace
408e8388f2
Use relative paths for markdown crop links
2019-07-11 15:12:16 +00:00
Brenda Wallace
7b6dc1943a
Fixes staging linking to production
2019-07-11 15:12:16 +00:00
Brenda Wallace
3d92cd1d1d
fixes percy error, running same snapshot more than once
2019-07-11 15:12:16 +00:00
Brenda Wallace
ae1e48129c
more percy specs
2019-07-11 15:12:16 +00:00
Brenda Wallace
80429f935a
Merge branch 'dev' into likeable-photos
2019-07-11 22:42:22 +12:00
dependabot-preview[bot]
40e9662234
Bump jsonapi-resources from 0.9.9 to 0.9.10
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.9 to 0.9.10.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.9...v0.9.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-11 10:29:45 +00:00
Brenda Wallace
c50556221c
TRying to get mailboxxer working
2019-07-11 22:28:51 +12:00
Brenda Wallace
26bb9a4c22
Merge branch 'master' into dev
2019-07-11 22:27:51 +12:00
Brenda Wallace
738644ffbc
Remove unnecesary theme param from pagination
2019-07-11 10:18:54 +00:00
Brenda Wallace
5c1dd2ac6b
Update inbox link in spec
2019-07-11 10:18:54 +00:00
Brenda Wallace
93e7703a6a
Add missing translation
2019-07-11 10:18:54 +00:00
Brenda Wallace
01e8cafb9f
Update inbox link in spec
2019-07-11 10:18:54 +00:00
Brenda Wallace
2a390f9c24
Fix sorting
2019-07-11 10:18:54 +00:00
Brenda Wallace
347417b7ed
Put newest messages at the top of the page
2019-07-11 10:18:54 +00:00
Brenda Wallace
88da4a724d
Add the unread inbox menu display to percy
2019-07-11 10:18:54 +00:00
Brenda Wallace
5c69dc0528
use badges for unread message count
2019-07-11 10:18:54 +00:00
Brenda Wallace
edf4985da0
adding breadcrumbs
2019-07-11 10:18:54 +00:00
Brenda Wallace
b064d8db96
tidy up larger screen display of inbox
2019-07-11 10:18:54 +00:00
Brenda Wallace
13813c4693
Fix spec for notifications#index
2019-07-11 10:18:54 +00:00
Brenda Wallace
8b47e277ec
fixes percy error, running same snapshot more than once
2019-07-11 10:18:54 +00:00
Brenda Wallace
5233df666d
update notification view spec, not a table anymore
2019-07-11 10:18:54 +00:00
Brenda Wallace
6383dbc19f
more percy specs
2019-07-11 10:18:54 +00:00
Brenda Wallace
a7837f0d8f
Update notification spec to count messages, not rows
2019-07-11 10:18:54 +00:00
Brenda Wallace
dde6668293
Notifications responsiveness
2019-07-11 10:18:54 +00:00
Brenda Wallace
7ec572b107
Merge branch 'inbox' into mailbox
2019-07-11 22:07:26 +12:00
Brenda Wallace
d2b310b9eb
Remove unnecesary theme param from pagination
2019-07-11 22:06:55 +12:00
Brenda Wallace
fa39a23b01
Merge branch 'inbox' into mailbox
2019-07-11 22:04:13 +12:00
Brenda Wallace
c91fdf4744
Update inbox link in spec
2019-07-11 22:01:03 +12:00
Brenda Wallace
063c745aca
Add missing translation
2019-07-11 20:13:10 +12:00
Brenda Wallace
3f8ddc24f0
Merge branch 'inbox' of github.com:br3nda/growstuff into inbox
2019-07-11 20:12:04 +12:00
Brenda Wallace
d2c5d8e9ce
Update inbox link in spec
2019-07-11 20:11:49 +12:00
Brenda Wallace
e97608b5ff
Update inbox link in spec
2019-07-11 20:11:28 +12:00
Daniel O'Connor
1c96007f1c
Merge branch 'dev' into inbox
2019-07-11 17:33:21 +09:30
Brenda Wallace
cafad7a009
Fix sorting
2019-07-11 19:53:45 +12:00
Brenda Wallace
b1440041cd
Remove duplicate and empty css definitions
2019-07-11 06:18:16 +00:00
Brenda Wallace
430a29865d
Remove badge override
2019-07-11 06:18:16 +00:00
Brenda Wallace
e355c83c15
Put newest messages at the top of the page
2019-07-11 17:26:40 +12:00
Brenda Wallace
cac685ba7e
Merge pull request #2048 from Growstuff/dev
...
Release 56
2019-07-11 17:06:34 +12:00
Brenda Wallace
6a3aae2902
Merge pull request #2074 from Growstuff/dependabot/npm_and_yarn/lodash-4.17.14
...
[Security] Bump lodash from 4.17.11 to 4.17.14
2019-07-11 16:54:57 +12:00
dependabot-preview[bot]
cf3f5bf5a6
[Security] Bump lodash from 4.17.11 to 4.17.14
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-11 04:32:32 +00:00
dependabot-preview[bot]
6a0fc51ae5
[Security] Bump lodash.template from 4.4.0 to 4.5.0
...
Bumps [lodash.template](https://github.com/lodash/lodash ) from 4.4.0 to 4.5.0. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-11 04:25:20 +00:00
Brenda Wallace
da8d67c7e7
Add the unread inbox menu display to percy
2019-07-11 13:20:40 +12:00
Brenda Wallace
29e606a870
use badges for unread message count
2019-07-11 13:17:31 +12:00
Brenda Wallace
49c02dfaab
Merge branch 'badges' into inbox
2019-07-11 13:16:28 +12:00
Brenda Wallace
97ffc0d1bf
adding breadcrumbs
2019-07-11 13:13:17 +12:00
Brenda Wallace
4d1b45317b
tidy up larger screen display of inbox
2019-07-11 13:06:02 +12:00
Brenda Wallace
1250fa388f
Fix spec for notifications#index
2019-07-11 12:41:02 +12:00
Brenda Wallace
aee21344f5
Merge branch 'dev' into inbox
2019-07-11 12:15:39 +12:00
Brenda Wallace
2cc307f09b
fixes percy error, running same snapshot more than once
2019-07-11 12:14:54 +12:00
Brenda Wallace
de80a84502
update notification view spec, not a table anymore
2019-07-11 12:12:05 +12:00
Brenda Wallace
67af069804
more percy specs
2019-07-11 12:08:15 +12:00
Brenda Wallace
f444196b5c
Update notification spec to count messages, not rows
2019-07-11 11:48:10 +12:00
Brenda Wallace
a6e9ef2d92
Notifications responsiveness
2019-07-11 11:33:46 +12:00
Brenda Wallace
edfef7f513
Merge remote-tracking branch 'upstream/dev' into badges
2019-07-11 08:49:41 +12:00
Brenda Wallace
170c7d99ac
Merge branch 'dev' into likeable-photos
2019-07-11 08:42:07 +12:00
Brenda Wallace
98f190a53f
Removed mention of jasmine
...
They aren't used anymore.
2019-07-10 20:23:15 +00:00
Brenda Wallace
4e6debcb55
Https in url to gardenate
2019-07-10 09:03:05 +00:00
Brenda Wallace
c447ea03f7
Remove spec looking for old wrangle guidelines
2019-07-10 09:03:05 +00:00
Brenda Wallace
104e838448
Https in specs
2019-07-10 09:03:05 +00:00
Brenda Wallace
3e4a9f0292
Ebay link using https
2019-07-10 09:03:05 +00:00
Brenda Wallace
b1b459f9d8
link to markdown docs using https
2019-07-10 09:03:05 +00:00
Brenda Wallace
bd938c777d
Link to open streetmap using https
2019-07-10 09:03:05 +00:00
Brenda Wallace
37e6ed1b08
Link to ogp.me using https
2019-07-10 09:03:05 +00:00
Brenda Wallace
8f55a75123
Link to facebook, twitter and flickr with https
2019-07-10 09:03:05 +00:00
Brenda Wallace
6ce28a87aa
Remove outdated links from wrangle guidelines
2019-07-10 09:03:05 +00:00
Brenda Wallace
bd7a201e55
Link to gardenate with https
2019-07-10 09:03:05 +00:00
Brenda Wallace
80a551ca43
Link to google with https
2019-07-10 09:03:05 +00:00
Brenda Wallace
6b02bb9cc6
remove IE9 shim
2019-07-10 09:03:05 +00:00
Brenda Wallace
4e67a11841
use https links to facebook, twitter, and flickr
2019-07-10 09:03:05 +00:00
Brenda Wallace
f8c643d13a
Updating links to use https to mapbox
2019-07-10 09:03:05 +00:00
Brenda Wallace
3a4c429275
Adding wikihow instructions link
2019-07-10 08:45:50 +00:00
Brenda Wallace
d661d8579f
Merge branch 'dev' into likeable-photos
2019-07-10 14:54:17 +12:00
Brenda Wallace
ac3679fa18
Remove duplicate and empty css definitions
2019-07-10 11:37:41 +12:00
Brenda Wallace
0a07442317
Remove badge override
2019-07-10 11:36:03 +12:00
Brenda Wallace
97246b8632
Merge pull request #2066 from Growstuff/imgbot
...
[ImgBot] Optimize images
2019-07-09 23:59:25 +12:00
ImgBotApp
cf787cd278
[ImgBot] Optimize images
...
/app/assets/images/open_service.png -- 1.08kb -> 0.40kb (63.12%)
2019-07-09 10:38:04 +00:00
Brenda Wallace
69c9754664
Merge pull request #2064 from Br3nda/fix-1989
...
Fix 1989
2019-07-09 22:21:55 +12:00
Brenda Wallace
b1c6560a8f
Merge branch 'dev' into fix-1989
2019-07-09 22:10:30 +12:00
Brenda Wallace
04b4354bda
Merge branch 'dev' into likeable-photos
2019-07-09 14:23:50 +12:00
Brenda Wallace
87558982b1
Merge branch 'map-fix' into dev
2019-07-09 14:15:04 +12:00
Brenda Wallace
fb4ed1f637
Merge branch 'fix/2011' into dev
2019-07-09 14:14:42 +12:00
Brenda Wallace
35fe92a7db
Merge branch 'fix-inbox-menu' into dev
2019-07-09 14:14:31 +12:00
Brenda Wallace
3e89ca95ed
Merge branch 'dev' into fix-1989
2019-07-09 13:18:02 +12:00
Brenda Wallace
38ebbd0adb
Make headers consistent
...
fixes #2011
2019-07-09 01:00:19 +00:00
Brenda Wallace
7b87f8e4db
Add flash messages to controllers
2019-07-09 09:19:27 +12:00
Brenda Wallace
68bc237dd9
Wrap for readbility
2019-07-09 09:12:52 +12:00
Brenda Wallace
f127dd18ba
fix display of inbox item in menu
...
fixes #2046
2019-07-09 09:11:49 +12:00
Brenda Wallace
fa8cc5a499
Expect https in footer spec
2019-07-09 08:04:32 +12:00
Brenda Wallace
827e871a22
Merge branch 'dev' into fix-1989
2019-07-09 01:12:47 +12:00
Brenda Wallace
465a07c377
Merge pull request #2038 from Br3nda/following-page
...
Show activity from people i follow
2019-07-09 01:11:38 +12:00
Brenda Wallace
ec974cdfee
Merge branch 'dev' into following-page
2019-07-09 00:31:32 +12:00
Brenda Wallace
833f46eea8
Merge branch 'dev' into fix-1989
2019-07-09 00:30:12 +12:00
Brenda Wallace
9033d432f7
Merge branch 'dev' into likeable-photos
2019-07-09 00:29:50 +12:00
Brenda Wallace
4f0fca3634
Merge pull request #2054 from Br3nda/tidy-member-edit
...
Tidy up member edit
2019-07-09 00:29:31 +12:00
Brenda Wallace
7749b2daaf
Merge branch 'dev' into fix-1989
2019-07-09 00:29:07 +12:00
Brenda Wallace
4ea9e17e09
Merge branch 'dev' into tidy-member-edit
2019-07-08 23:32:18 +12:00
Brenda Wallace
43ba345f4d
Update app/views/devise/registrations/_edit_apps.html.haml
...
Co-Authored-By: pozorvlak <miles@assyrian.org.uk >
2019-07-08 23:32:02 +12:00
dependabot-preview[bot]
17708a8122
Bump faker from 1.9.5 to 1.9.6
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.5 to 1.9.6.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v.1.9.5...1.9.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-08 10:57:02 +00:00
Brenda Wallace
9f9bf5012a
Make headers consistent
...
fixes #2011
2019-07-08 22:27:33 +12:00
Brenda Wallace
46a7e3fb42
Merge branch 'dev' into fix-1989
2019-07-08 22:21:54 +12:00
Brenda Wallace
bd9a6f7620
Merge branch 'dev' into likeable-photos
2019-07-08 22:20:41 +12:00
Brenda Wallace
4f43f2e998
Merge branch 'dev' into following-page
2019-07-08 22:20:26 +12:00
Brenda Wallace
d23a94c691
Move open service badge into asset pipeline
2019-07-08 22:19:16 +12:00
dependabot-preview[bot]
036010bb39
Bump coveralls from 0.7.1 to 0.8.19
...
Bumps [coveralls](https://coveralls.io ) from 0.7.1 to 0.8.19.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-08 10:16:42 +00:00
Brenda Wallace
80a1066efe
Added alt tag
2019-07-08 22:15:53 +12:00
Brenda Wallace
bdbb44e4a3
fix mix content warnings
...
closes #2043
2019-07-08 22:14:58 +12:00
Brenda Wallace
2c7183c097
Merge branch 'dev' into likeable-photos
2019-07-08 22:04:02 +12:00
Brenda Wallace
6ad694cf30
Tidy up member edit
2019-07-08 21:56:37 +12:00
dependabot-preview[bot]
d09ac4b6d7
Bump rubocop-rails from 2.1.0 to 2.2.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.1.0 to 2.2.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.1.0...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-08 09:38:32 +00:00
Brenda Wallace
def17e020e
New line at end of file
2019-07-08 21:28:39 +12:00
Brenda Wallace
05ed9de8b6
Add leaflet initializer
2019-07-08 20:51:14 +12:00
codefactor-io
5d07a30d17
[CodeFactor] Apply fixes
2019-07-08 08:16:24 +00:00
Brenda Wallace
dd6446b195
fix icon method name
2019-07-08 20:13:21 +12:00
Brenda Wallace
e40a2c3176
remove debugger
2019-07-08 20:12:42 +12:00
Brenda Wallace
cfab855a0f
revert adding id
2019-07-08 20:06:48 +12:00
Brenda Wallace
f1df90f189
Remove debugger
2019-07-08 20:05:48 +12:00
Brenda Wallace
bff31ddb5c
Removed extra blank lines
2019-07-08 20:04:27 +12:00
Brenda Wallace
6fc9a858a9
Merge branch 'dev' into likeable-photos
2019-07-08 20:03:41 +12:00
Brenda Wallace
f638d0c2d3
rubocop lint
2019-07-08 20:03:27 +12:00
Brenda Wallace
61047df429
Merge branch 'dev' into following-page
2019-07-08 20:02:47 +12:00
Brenda Wallace
3b9aee3f67
Merge pull request #2041 from Br3nda/post-photos
...
Adding photos directly to a post
2019-07-08 20:02:29 +12:00
Brenda Wallace
a66add6568
Merge branch 'dev' into likeable-photos
2019-07-08 20:02:09 +12:00
Brenda Wallace
cbed8cc259
likes for photos
2019-07-08 20:00:55 +12:00
Brenda Wallace
8baf8757ca
Merge branch 'dev' into following-page
2019-07-08 17:07:55 +12:00
Brenda Wallace
4845211429
Merge branch 'dev' into post-photos
2019-07-08 17:07:45 +12:00
Brenda Wallace
72cf7365a2
Merge branch 'master' into dev
2019-07-08 17:07:19 +12:00
Brenda Wallace
bda0712234
Merge pull request #2047 from Growstuff/imgbot
...
[ImgBot] Optimize images
2019-07-08 17:06:42 +12:00
Brenda Wallace
680111add7
Merge branch 'dev' into post-photos
2019-07-08 17:06:04 +12:00
Brenda Wallace
253c0cb939
Merge branch 'dev' into following-page
2019-07-08 16:44:03 +12:00
ImgBotApp
770c6f45fd
[ImgBot] Optimize images
...
/app/assets/images/placeholder_600.png -- 31.66kb -> 29.12kb (8.03%)
2019-07-08 04:43:51 +00:00
Brenda Wallace
e7cfe0b5c4
Update spec to look for placeholder_600
2019-07-08 04:43:03 +00:00
Brenda Wallace
6d7b990797
Remove unused rails.png
2019-07-08 04:43:03 +00:00
Brenda Wallace
f7af2bf816
Higher res photo placeholder
2019-07-08 04:43:03 +00:00
Daniel O'Connor
cf0d648b31
Merge branch 'dev' into post-photos
2019-07-08 13:45:26 +09:30
Daniel O'Connor
76c18014e2
Merge pull request #2042 from Br3nda/active-gardens
...
only show active gardens on planting form
2019-07-08 13:40:08 +09:30
Brenda Wallace
0a030c56bb
files should end with a new line
2019-07-08 04:08:58 +00:00
Brenda Wallace
bbd43f57bc
Prevent post images going off screen
2019-07-08 04:08:58 +00:00
Brenda Wallace
9c25fd043f
only show active gardens on planting form
2019-07-08 13:24:27 +12:00
Brenda Wallace
5cef4d728c
Adding photos directly to a post
2019-07-08 13:20:57 +12:00
Brenda Wallace
4acf165f24
specs for event_helper
2019-07-08 12:44:26 +12:00
Brenda Wallace
acad29dab0
Feature spec for timeline/activity page
2019-07-08 12:26:11 +12:00
Brenda Wallace
1427441163
No link to the planting with no date
2019-07-08 11:49:13 +12:00
Brenda Wallace
7054787870
fix up members#show spec
2019-07-08 11:04:23 +12:00
Brenda Wallace
029beab1dd
timeline service specs
2019-07-08 10:39:46 +12:00
Brenda Wallace
3d9791cb96
update spec, now that resolve_model has moved
2019-07-08 10:10:01 +12:00
Brenda Wallace
e080407deb
update spec to not have links to plantings with not dates
2019-07-08 10:08:26 +12:00
Brenda Wallace
5c6e65cd01
remove quotes in haml
2019-07-08 10:05:53 +12:00
Brenda Wallace
013b388beb
remove quotes in haml
2019-07-08 10:05:36 +12:00
Brenda Wallace
07945e9f69
remove quotes in haml
2019-07-08 10:05:13 +12:00
Brenda Wallace
e6a60e93c9
remove quotes in haml
2019-07-08 10:04:56 +12:00
Brenda Wallace
3859122fa5
tidy
2019-07-08 10:04:08 +12:00
Brenda Wallace
c61f13625c
Moved html into haml instead of html_safe in helper
2019-07-08 09:52:33 +12:00
Brenda Wallace
1c50d9e50d
rename blog_icon to post_icon
2019-07-08 09:42:06 +12:00
Brenda Wallace
b1edf8542e
Removed slug from query
2019-07-08 09:40:21 +12:00
Brenda Wallace
81723d99d9
make comment icon match other icons
2019-07-08 09:36:47 +12:00
Brenda Wallace
b1fdb5242a
simplifying resolving models
2019-07-08 09:34:48 +12:00
Brenda Wallace
e26c6d52a4
Further DRYing
2019-07-08 09:31:50 +12:00
Brenda Wallace
933c78b4e5
DRY members#show view
2019-07-08 09:19:44 +12:00
Brenda Wallace
7a4312f41e
Dry up timeline code
2019-07-08 09:19:26 +12:00
Brenda Wallace
03dfcdcc57
rubocop lint fix ups
2019-07-08 09:04:58 +12:00
Brenda Wallace
fe81923ae1
DRY timeline view
2019-07-08 09:04:19 +12:00
Brenda Wallace
ca281b84cb
Merge remote-tracking branch 'upstream/dev' into following-page
2019-07-07 22:09:39 +12:00
Brenda Wallace
528e4c2c85
button to get to timeline
2019-07-07 22:08:42 +12:00
Brenda Wallace
050dfda77e
Timeline
2019-07-07 22:03:15 +12:00
Brenda Wallace
d40c985d49
Merge pull request #2006 from Growstuff/dev
...
Release 55
2019-07-07 08:38:57 +12:00
Brenda Wallace
cc271b2cc3
Back out the max homepage items change
2019-07-06 11:16:21 +00:00
Brenda Wallace
eda77365a5
truncate long locations
2019-07-06 11:16:21 +00:00
Brenda Wallace
8528f80678
Layout fix up on hompage for large screens
2019-07-06 11:16:21 +00:00
Brenda Wallace
7266f6b590
include some interesting members in percy spec
...
so they show on the home page
2019-07-06 12:08:34 +12:00
Brenda Wallace
f8aff32168
Back out the max homepage items change
2019-07-06 11:04:10 +12:00
Brenda Wallace
1281f78d40
truncate long locations
2019-07-06 11:04:10 +12:00
Brenda Wallace
997a30d1bc
Layout fix up on hompage for large screens
2019-07-06 11:04:10 +12:00
Miles Gould
ba1512a85a
Delete duplicate percentage_grown attribute
...
Fixes #2031
2019-07-05 10:49:29 +00:00
dependabot-preview[bot]
b483c47258
Bump faker from 1.9.4 to 1.9.5
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.4 to 1.9.5.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/1.9.4...v.1.9.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-05 07:33:07 +00:00
Brenda Wallace
77f309c083
Merge pull request #2017 from Br3nda/upgrade/bootstrap-43
...
Upgrade boostrap gem
2019-07-05 10:18:33 +12:00
Brenda Wallace
cdc3be0414
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-05 10:05:44 +12:00
Brenda Wallace
136aff87ac
Removign empty class in scss
2019-07-04 10:36:25 +00:00
Brenda Wallace
826c8845a2
Removing commented out cruft
2019-07-04 10:36:25 +00:00
Brenda Wallace
5e7445f770
Merge branch 'dev' into UTFGardenNames
2019-07-04 10:56:46 +12:00
Brenda Wallace
a880aae748
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-04 08:07:29 +12:00
Brenda Wallace
5cb220caeb
Merge pull request #2025 from Growstuff/dependabot/npm_and_yarn/js-yaml-3.13.1
...
Bump js-yaml from 3.12.1 to 3.13.1
2019-07-04 07:27:10 +12:00
dependabot[bot]
0fa6fa9e5a
Bump js-yaml from 3.12.1 to 3.13.1
...
Bumps [js-yaml](https://github.com/nodeca/js-yaml ) from 3.12.1 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases )
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.1...3.13.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2019-07-03 10:51:41 +00:00
Brenda Wallace
904e30c9dd
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-03 22:47:20 +12:00
Brenda Wallace
d53393b0ca
Fix downcase
2019-07-03 09:39:32 +00:00
Brenda Wallace
ea18c722ef
lower caseon pluralizing
2019-07-03 09:39:32 +00:00
Brenda Wallace
ac91450827
Fixes count on members'cards
2019-07-03 09:39:32 +00:00
dependabot-preview[bot]
b0a47f1319
Bump webdrivers from 4.0.1 to 4.1.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.0.1 to 4.1.0.
- [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.0.1...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-03 08:28:06 +00:00
Brenda Wallace
bd1f8e1e05
Merge branch 'upgrade/bootstrap-43' of github.com:br3nda/growstuff into upgrade/bootstrap-43
2019-07-03 12:04:23 +12:00
Brenda Wallace
52b6ab3931
Output and stop on error
2019-07-03 12:04:13 +12:00
Brenda Wallace
8b22004066
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-03 09:58:04 +12:00
Miles Gould
a18ff03599
Fix remaining uses of devise_error_messages!
2019-07-02 21:57:43 +00:00
Brenda Wallace
9e1415dedd
fixes flex/wrap on home page members
2019-07-03 08:54:08 +12:00
Brenda Wallace
4495d03899
Move percy specs to static check run
2019-07-03 08:48:35 +12:00
Brenda Wallace
cc7ebf086f
Merge remote-tracking branch 'origin/upgrade/bootstrap-43' into upgrade/bootstrap-43
2019-07-03 08:41:34 +12:00
Brenda Wallace
50945c6f75
Files should end with a trailing newline
2019-07-03 08:41:23 +12:00
Brenda Wallace
c791b21c47
Merge branch 'dev' into upgrade/bootstrap-43
2019-07-03 08:41:01 +12:00
Brenda Wallace
8c02ea943a
Tidy up photo display (line up)
2019-07-03 08:25:23 +12:00
Brenda Wallace
b90f6d5ff6
Tidy up facts on plantings#show
2019-07-03 08:20:58 +12:00
Brenda Wallace
036fea1c03
Fix scss compile error, by using our own variable
2019-07-03 08:16:46 +12:00
Brenda Wallace
13450f64ed
Squish a devise deprecation warning
2019-07-02 09:41:40 +00:00
Brenda Wallace
ad888575a5
Upgrade boostrap gem
2019-07-02 16:55:15 +12:00
Brenda Wallace
5ad298e43a
TYPO!
2019-07-02 04:52:39 +00:00
Brenda Wallace
67239ec8b1
rubocop fixup
2019-07-02 04:52:39 +00:00
Brenda Wallace
fda4d88e5a
Fix up locale spec
2019-07-02 04:52:39 +00:00
Brenda Wallace
b56771f9b7
specs for comments on profile pages
2019-07-02 04:52:39 +00:00
Brenda Wallace
4f59ef2e43
more profile page specs
2019-07-02 04:52:39 +00:00
Brenda Wallace
d37c4139a6
Fixes error displaying plantings with no planted_at date
2019-07-02 04:52:39 +00:00
Brenda Wallace
bf6cb5352d
Test for displaying plantings on profile page
2019-07-02 04:52:39 +00:00
Brenda Wallace
97028bdf1d
Refactoring member profile spec to use shared example
...
so we can test the page both signed in and not signed in
2019-07-02 04:52:39 +00:00
Brenda Wallace
ce60d6bb0c
Remove stray \n in translation
2019-07-01 10:28:39 +00:00
dependabot-preview[bot]
0870342871
Bump capybara from 3.24.0 to 3.25.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.24.0 to 3.25.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.24.0...3.25.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-29 02:07:39 +00:00
Brenda Wallace
c4657f5972
Merge pull request #1942 from Br3nda/upgrade/bootstrap
...
Upgrade to bootstrap 4
2019-06-28 10:05:02 +12:00
Brenda Wallace
fec37368ae
Remove pyenv
2019-06-28 09:53:23 +12:00
Brenda Wallace
8faa712e07
be_success -> be_successfull
...
fixes a deprecation warning
2019-06-27 22:26:15 +12:00
Brenda Wallace
b0a8288330
Merge branch 'dev' into upgrade/bootstrap
2019-06-27 22:18:06 +12:00
Brenda Wallace
6b7378c8f6
Merge branch 'master' into dev
2019-06-27 22:17:45 +12:00
Brenda Wallace
b65f2e858f
update rubocop to match codeclimate settings
2019-06-27 22:14:48 +12:00
Brenda Wallace
fe7cb43c11
prettier links
2019-06-27 22:13:23 +12:00
Brenda Wallace
f1097e0f7c
update photos spec
2019-06-27 22:13:09 +12:00
Brenda Wallace
66a0d8f2d0
only show info+pagination if there are results to show
2019-06-27 22:06:54 +12:00
Brenda Wallace
952c1b9a2a
styled and moved the signin/signup prompts
2019-06-27 22:04:54 +12:00
Brenda Wallace
9e69f0aae3
photos as cards
2019-06-27 22:00:46 +12:00
Brenda Wallace
d4a4d61f6b
tidy up photo display
2019-06-27 21:59:15 +12:00
Brenda Wallace
19085ed237
fixed link to harvest or plantings photos
2019-06-27 21:54:29 +12:00
Brenda Wallace
d1e7ba701b
fixing mobile display
2019-06-27 21:48:48 +12:00
Brenda Wallace
c94b026c58
solving rubocop dependencies errors
2019-06-27 21:33:25 +12:00
Brenda Wallace
8b3adcf7a7
Rubocop fix up
2019-06-27 21:26:35 +12:00
Brenda Wallace
b9e38719ce
Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
...
Conflicts:
Gemfile.lock
2019-06-27 21:25:00 +12:00
Brenda Wallace
677b82a3d0
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-27 21:23:52 +12:00
dependabot-preview[bot]
1ae0558e4c
Bump puma from 3.12.1 to 4.0.0
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.1 to 4.0.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.12.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-27 02:48:00 +00:00
Brenda Wallace
70a69e7220
Update app/assets/stylesheets/_predictions.scss
2019-06-27 14:45:42 +12:00
Brenda Wallace
7f2afa718d
Update app/assets/stylesheets/_predictions.scss
2019-06-27 14:45:22 +12:00
Brenda Wallace
dc6034c01b
Update app/assets/stylesheets/_variables.scss
2019-06-27 14:45:06 +12:00
Brenda Wallace
ea2e0697a7
Update Gemfile
2019-06-27 14:44:30 +12:00
Brenda Wallace
99f97f51dc
Update app/assets/stylesheets/_variables.scss
2019-06-27 14:43:38 +12:00
Brenda Wallace
9dada23e42
Marking the tests that fail as pending
...
Until we fix in chrome head less
2019-06-27 14:31:22 +12:00
dependabot-preview[bot]
f2c6f27c10
Bump scout_apm from 2.5.0 to 2.5.1
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.5.0 to 2.5.1.
- [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.0...v2.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-26 19:25:47 +00:00
dependabot-preview[bot]
53636dc47a
Bump rubocop from 0.71.0 to 0.72.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.71.0 to 0.72.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.71.0...v0.72.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-26 19:07:41 +00:00
Brenda Wallace
3bcfc88856
Add title to page
2019-06-26 16:30:55 +12:00
Brenda Wallace
1d98668ac4
scss lint
2019-06-26 16:21:59 +12:00
Brenda Wallace
88025b8a21
scss lint
2019-06-26 11:32:02 +12:00
Brenda Wallace
c60162e415
scss lint
2019-06-26 11:31:37 +12:00
Brenda Wallace
c702623c4f
Prefer single quoted strings
2019-06-26 11:31:10 +12:00
Brenda Wallace
0324e515e0
scss lint
2019-06-26 11:30:47 +12:00
Brenda Wallace
3dac09968d
Remove empty rule
2019-06-26 11:30:30 +12:00
Brenda Wallace
aa3297f4da
scss lint
2019-06-26 11:29:41 +12:00
Brenda Wallace
a361e804ee
scss lint
2019-06-26 11:27:19 +12:00
Brenda Wallace
db57432fee
scss lint
2019-06-26 11:26:52 +12:00
Brenda Wallace
d955dea240
scss lint
2019-06-26 11:26:36 +12:00
Brenda Wallace
d5e22d3285
scss lint
2019-06-26 11:26:14 +12:00
Brenda Wallace
6634465c1f
new line at end
2019-06-26 11:25:27 +12:00
Brenda Wallace
7a613b5dcc
Merge scss
2019-06-26 11:25:10 +12:00
Brenda Wallace
b176ba59dc
removed byline method
...
avoiding use of htmlseafe
2019-06-26 11:21:40 +12:00
Brenda Wallace
264506ef38
Move crop wrangling view test to feature spec
2019-06-26 11:16:41 +12:00
Brenda Wallace
382169b19c
MAtch button label in spec
2019-06-26 11:13:21 +12:00
Brenda Wallace
ef43399ffd
Match spec to page. h3 -> h5
2019-06-26 11:12:09 +12:00
Brenda Wallace
c540bd88fc
add back a div the specs look for
2019-06-26 10:51:10 +12:00
Brenda Wallace
6383bd73d6
Tidy up display of member avatar on seeds
2019-06-26 10:22:32 +12:00
Brenda Wallace
38a0b76eaa
add id to header search for input, so specs pass
2019-06-26 10:08:34 +12:00
Brenda Wallace
a3f25a4526
use another variable in scss
2019-06-26 10:08:19 +12:00
Brenda Wallace
c12f39d5d1
set ID on crop search form
2019-06-26 10:03:19 +12:00
Brenda Wallace
faefc0b293
the --rails flag isn't needed for rubocop anymore
2019-06-26 09:46:31 +12:00
Brenda Wallace
389b48d918
Use variables for scss colours
2019-06-26 09:45:01 +12:00
Brenda Wallace
6accfee811
Removed unnecsary colouring
2019-06-26 09:44:26 +12:00
Brenda Wallace
3488b29142
Removed empty rule
2019-06-26 09:43:57 +12:00
Brenda Wallace
db55432d31
SCSS lint fixes
2019-06-26 09:39:50 +12:00
Brenda Wallace
cc219a8aa2
remove commented out code
2019-06-26 09:39:01 +12:00
Brenda Wallace
a729a61f40
remove comments out styles
2019-06-26 09:37:54 +12:00
Brenda Wallace
3f59fe6bc7
style login buttons as buttons
2019-06-26 09:35:50 +12:00
Brenda Wallace
5efdf80bc2
lint
2019-06-26 09:35:35 +12:00
Brenda Wallace
b2c6a85aa9
use variable for colour
2019-06-26 09:35:21 +12:00
Brenda Wallace
b21b95bbc2
scss lint fixes
2019-06-26 09:31:19 +12:00
Brenda Wallace
5e15912371
Adding owner to planting in spec, so it passes
2019-06-26 09:23:22 +12:00
Brenda Wallace
d50ae70824
in the spec, visit the path, not the full url
2019-06-26 09:14:01 +12:00
Brenda Wallace
e020db7eef
travici needs to call search:reindex
2019-06-26 09:13:12 +12:00
Brenda Wallace
1df19ead92
removed phantom
2019-06-26 09:12:57 +12:00
Brenda Wallace
06ae5ecd6f
DRY buttons
2019-06-26 09:12:39 +12:00
Brenda Wallace
73f2fd2323
fix another deprecation warning about rails 6
2019-06-26 09:07:03 +12:00
Brenda Wallace
474732f909
Fix sql warning in logs
2019-06-26 09:05:14 +12:00
Brenda Wallace
5b977964e8
Fixing deprecation warning by devise
2019-06-26 09:04:38 +12:00
Brenda Wallace
a69e4020d7
back to reading gardens from the plantings
2019-06-26 08:09:49 +12:00
Brenda Wallace
a598214a60
renamed scss files
2019-06-25 21:34:52 +12:00
Brenda Wallace
73f7e695b4
Ignore leaflet
2019-06-25 21:32:13 +12:00
Brenda Wallace
30728d8146
Rule declaration should be followed by an empty line
2019-06-25 21:31:38 +12:00
Brenda Wallace
ee2d169c1d
Unknown property align
2019-06-25 21:31:24 +12:00
Brenda Wallace
92f0453d25
Alpha ordered css
2019-06-25 21:30:55 +12:00
Brenda Wallace
c6bb21cdfa
0.5 should be written without a leading zero as .5
2019-06-25 21:30:25 +12:00
Brenda Wallace
56bae53295
0.1 should be written without a leading zero as .1
2019-06-25 21:29:50 +12:00
Brenda Wallace
c6b7696558
Files should end with a trailing newline
2019-06-25 21:29:30 +12:00
Brenda Wallace
b77693c82f
Imported partial bootstrap/variables.scss should be written as bootstrap/variables
2019-06-25 21:29:13 +12:00
Brenda Wallace
ea4d48184b
Delete trailing spaces
2019-06-25 21:13:09 +12:00
Brenda Wallace
5f3a180f9c
restore <title> on harvests#index
2019-06-25 21:12:09 +12:00
Brenda Wallace
7f00a5063b
view spec updates
2019-06-25 21:06:32 +12:00
Brenda Wallace
ec1824fd4f
Remove comment specs, they're on another view now
2019-06-25 20:56:57 +12:00
Brenda Wallace
702a66dea9
Update spec for editing gardens
2019-06-25 20:45:54 +12:00
Brenda Wallace
103d1ce2eb
rubocop lint
2019-06-25 20:39:50 +12:00
Brenda Wallace
58d08ceb5a
fix look up of translation for homepage
2019-06-25 20:35:40 +12:00
Brenda Wallace
4a09394485
Remove crop name test from homepage members list
2019-06-25 20:33:18 +12:00
Brenda Wallace
20e236fb4b
more spec updates
2019-06-25 20:31:15 +12:00
Brenda Wallace
72a0c07a93
Added member location back to match specs
2019-06-25 16:29:52 +12:00
Brenda Wallace
4f04d843a3
Move the subquerys in members#show to private
2019-06-25 16:18:15 +12:00
Brenda Wallace
1dd9a1028e
Updating the way we look for the plantparts radio buttons in specs
2019-06-25 16:17:43 +12:00
Brenda Wallace
b1b6de0aae
set @gardens for plantings controller and spec
2019-06-25 15:55:06 +12:00
Brenda Wallace
3d065c72ba
update new planting view spec
2019-06-25 15:54:50 +12:00
Brenda Wallace
3dab7b89f9
update planting specs
2019-06-25 15:36:08 +12:00
Brenda Wallace
dce1ab6239
Format the output from rspec
2019-06-25 15:24:53 +12:00
Brenda Wallace
e2a764e8bc
call search:reindex on ci runs
2019-06-25 15:18:31 +12:00
Brenda Wallace
aab2f75caa
use console.log instead of alert
...
so our headless chrome doesn't get stuck on the alert
2019-06-25 15:15:16 +12:00
Brenda Wallace
5150e8e2a7
Plant part is a radio button now. updating spec
2019-06-25 13:43:30 +12:00
Brenda Wallace
4fc7e0d0b2
fix up home spec
2019-06-25 13:28:08 +12:00
Brenda Wallace
8af856f990
Updating specs
2019-06-25 11:36:23 +12:00
Brenda Wallace
d7e4863f02
bundle install results
2019-06-25 10:12:34 +12:00
Brenda Wallace
5de269c097
Move header into partial, to match what specs expect
2019-06-25 10:12:12 +12:00
Brenda Wallace
64864bfcd5
Remove phantom directory mention from travis config
2019-06-25 09:09:28 +12:00
Brenda Wallace
0171e67b7e
Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
...
Conflicts:
Gemfile.lock
2019-06-25 09:08:42 +12:00
dependabot-preview[bot]
f7406de7dc
Bump scout_apm from 2.4.24 to 2.5.0
...
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby ) from 2.4.24 to 2.5.0.
- [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.4.24...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-24 21:07:32 +00:00
Brenda Wallace
3e0f6c476f
set body on post in spec, so we know what to look for
...
and we don't trip on whitespace changes
2019-06-25 09:01:37 +12:00
Brenda Wallace
191a3940d7
update unlock spec
2019-06-25 08:57:37 +12:00
Brenda Wallace
5dc4c4fcde
update from should rspec syntax
2019-06-25 08:54:53 +12:00
Brenda Wallace
1747f810e3
Match to existing specs
2019-06-25 08:54:40 +12:00
Brenda Wallace
723c312412
Updating forum pages to match specs
2019-06-24 21:35:01 +12:00
Brenda Wallace
47c5e36692
Updating forum specs
2019-06-24 21:30:06 +12:00
Brenda Wallace
4443ce9d8b
Update spec to find first garden actions link
2019-06-24 20:08:02 +12:00
Brenda Wallace
c4534c28de
Update planting finished from quick menus
2019-06-24 19:59:17 +12:00
Brenda Wallace
3f24fbe181
rubocop linting
2019-06-24 18:38:28 +12:00
Brenda Wallace
926915aca0
Update rss spec
...
we can't check status codes anymore
2019-06-24 18:29:18 +12:00
Brenda Wallace
c797f33c08
add title back to places search
2019-06-24 18:12:48 +12:00
Brenda Wallace
2546d0c704
Split the search places spec, to quicker see what broke
2019-06-24 18:11:08 +12:00
Brenda Wallace
cafc514ee5
spec updates
2019-06-24 18:06:32 +12:00
codefactor-io
f24ae3aafb
[CodeFactor] Apply fixes
2019-06-18 06:45:30 +00:00
Brenda Wallace
52403d8dd6
Pin elasticsearch back at 6, to fix errors on staging/prod
2019-06-18 06:45:30 +00:00
Brenda Wallace
fcf4e0f15d
Icons from icon8, used with permission
2019-06-17 10:42:47 +12:00
Brenda Wallace
7fc434bd00
remove whitespace
2019-06-17 10:40:34 +12:00
Brenda Wallace
f35444bf9e
add href to the plantings quick actions links
2019-06-17 10:40:23 +12:00
Brenda Wallace
02b312ea81
Gardens actions in the actions menu, and needing the confirm
2019-06-17 10:39:51 +12:00
Brenda Wallace
ea261748c3
Update crop spec to expect the full size photos
2019-06-16 21:14:31 +12:00
Brenda Wallace
941dc498f0
Fix homepage links!
2019-06-16 17:07:04 +12:00
Brenda Wallace
a11193dcc6
show date planted
2019-06-16 17:06:49 +12:00
Brenda Wallace
b9dcd9e5b9
Added missing icons
2019-06-16 17:06:33 +12:00
Brenda Wallace
ef91e26d28
rubocop lint fixes
2019-06-16 10:31:03 +12:00
Brenda Wallace
391874e27e
rubocop lint fixes
2019-06-16 10:30:09 +12:00
Brenda Wallace
31e1545a21
comment out status code test until it works with chrome headless
2019-06-16 10:28:19 +12:00
Brenda Wallace
36897433bf
login can be email or loginname
2019-06-16 10:23:51 +12:00
Brenda Wallace
505f0b24d3
tidy up crops photos
2019-06-15 22:53:10 +12:00
Brenda Wallace
8ca5098f0f
photos display tidy up
2019-06-15 22:35:39 +12:00
Brenda Wallace
67d90ec6f0
mark status test as pending until we work out how on headless chrome
2019-06-15 22:20:51 +12:00
Brenda Wallace
6eea0c4a8e
Restore message button
2019-06-15 21:42:41 +12:00
Brenda Wallace
70bfcabaec
Add seeds to member profile, and update specs
2019-06-15 21:18:10 +12:00
Brenda Wallace
adb0a1043d
Move gardens specs to gardens folder
2019-06-15 20:07:48 +12:00
Brenda Wallace
d2fdb499ed
Move member specs to members folder
2019-06-15 20:05:18 +12:00
Brenda Wallace
e678cc3841
can't check status code - so check text instead
2019-06-15 19:40:02 +12:00
Brenda Wallace
4b0b91c4d9
Update spec for editing seeds
2019-06-15 19:13:11 +12:00
Brenda Wallace
cf8182d793
Merge branch 'dev' into upgrade/bootstrap
2019-06-15 19:00:51 +12:00
Brenda Wallace
9fb07501bb
click actions in menu when capybara test is adding photos
2019-06-15 18:59:11 +12:00
Brenda Wallace
7bc497d92c
add href to seeds actions so capybara can find it
2019-06-15 18:56:30 +12:00
Brenda Wallace
6d15f1393e
confirm the alert dialogue when deleting
2019-06-15 18:53:21 +12:00
Brenda Wallace
9993c610cb
Update rego form, so it matches the specs
2019-06-15 18:20:51 +12:00
Brenda Wallace
8599543daf
actions menu is a link, not a button. fix spec
2019-06-15 17:13:22 +12:00
Brenda Wallace
2a0c93ed1a
wrangle menu - and capybara needs to have screen size big enough to see the menu
2019-06-15 17:11:40 +12:00
Brenda Wallace
3bc69e65c2
Click actions menu before checking for links in garden feature specs
2019-06-15 15:18:32 +12:00
Brenda Wallace
d21cbf994b
poltergeist work around not needed anymore
2019-06-15 14:34:49 +12:00
Brenda Wallace
e639c63565
Link to production at top of readme
2019-06-15 13:21:41 +12:00
Brenda Wallace
6abf717234
crop is required on seeds form
2019-06-15 10:59:06 +12:00
Brenda Wallace
71e8f6f76c
tradeable is required fields
2019-06-15 10:56:56 +12:00
Brenda Wallace
bfe3e1ea69
Updated labels to look for in spec for adding seeds
2019-06-15 08:50:34 +12:00
Brenda Wallace
d82d20743c
Add the required class back to seeds form
2019-06-15 08:49:18 +12:00
Brenda Wallace
29ae663a47
we don't need to manually trigger javascript events anymore
2019-06-15 08:36:10 +12:00
Brenda Wallace
fe7bc0f721
tidy up link hovers
2019-06-15 08:33:17 +12:00
Brenda Wallace
4ed80dde7b
More contrast in colours
2019-06-15 08:25:23 +12:00
Brenda Wallace
ad67b66313
buttons on homepage blurb
2019-06-15 08:25:11 +12:00
Brenda Wallace
9e7e1adfd3
Merge branch 'dev' into upgrade/bootstrap
2019-06-15 08:23:26 +12:00
Brenda Wallace
71af9c7b76
Merge pull request #1991 from Growstuff/dev
...
Production release
2019-06-15 08:10:52 +12:00
Brenda Wallace
d4c328a8b0
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-15 08:08:27 +12:00
Brenda Wallace
45ba712eb7
Fix database connection to share with capybara
...
and the database cleaner to use transactions, not truncation
2019-06-15 08:06:54 +12:00
dependabot-preview[bot]
2917be8158
Bump capybara from 3.23.0 to 3.24.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.23.0 to 3.24.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.23.0...3.24.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-14 19:06:31 +00:00
dependabot-preview[bot]
4c2fb13eaa
Bump jquery-rails from 4.3.3 to 4.3.5
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v4.3.3...v4.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-14 18:48:55 +00:00
Brenda Wallace
44fbae6776
Use comments for blog icon
...
So it doesn't look like an edit button
2019-06-14 21:30:04 +12:00
Brenda Wallace
cb1dcc9f8f
variables for scss
2019-06-14 21:10:02 +12:00
Brenda Wallace
43fea8f905
style the navbar search
2019-06-14 21:09:46 +12:00
Brenda Wallace
d93fdd02e3
get specs for browsing crops working
2019-06-14 20:39:42 +12:00
Brenda Wallace
6259d72ce0
delete link on drops needs href
2019-06-14 20:32:38 +12:00
Brenda Wallace
4fa4286670
dismiss the alert when deleting crops
2019-06-14 20:32:12 +12:00
Brenda Wallace
e46becac10
give link a href so capybara can find it
2019-06-14 20:22:35 +12:00
Brenda Wallace
40c75e0109
Delete needs confirmations in the specs
2019-06-14 18:12:33 +12:00
Brenda Wallace
f73b260212
replace existing database cleaner
...
the old one doesn't play nice with capybara
2019-06-14 18:06:41 +12:00
Brenda Wallace
5816b6c64c
Removed comment show spec. Page doesn't exist now
2019-06-14 17:10:03 +12:00
Brenda Wallace
551d6f9aa3
Bump up line length
2019-06-14 16:43:25 +12:00
Brenda Wallace
7564a87232
Bring back rails rubocops
2019-06-14 16:42:09 +12:00
Brenda Wallace
ad6ec0473c
Sort gems
2019-06-14 16:39:59 +12:00
Brenda Wallace
b9e2154edb
rubocop lint
2019-06-14 16:39:25 +12:00
Brenda Wallace
2fc3c33520
rubocop lint
2019-06-14 16:38:49 +12:00
Brenda Wallace
f98c33e688
wrap long line
2019-06-14 16:38:20 +12:00
Brenda Wallace
8eb299c146
only show actions menu if you can do the actions
2019-06-14 16:36:04 +12:00
Brenda Wallace
115b0925cd
Sorting css
2019-06-14 16:32:16 +12:00
Brenda Wallace
cfb1cd798f
Removing un-used css
2019-06-14 16:31:43 +12:00
Brenda Wallace
b259ac5b43
New line at end of file
2019-06-14 16:31:20 +12:00
Brenda Wallace
3ae8900b05
Sorting css
2019-06-14 16:31:01 +12:00
Brenda Wallace
27b1b5e8db
prefer single quotes
2019-06-14 16:30:26 +12:00
Brenda Wallace
dc0607c42a
Remove duplicated translations
2019-06-14 16:28:13 +12:00
Brenda Wallace
d98cb87d95
Wrapped long line
2019-06-14 16:27:28 +12:00
Brenda Wallace
43d300820c
indentation fix
2019-06-14 16:26:31 +12:00
Brenda Wallace
dea14ff0ff
Add new line at end of file
2019-06-14 16:26:06 +12:00
Brenda Wallace
6143d88576
Remove trailing whitespace
2019-06-14 16:24:51 +12:00
Brenda Wallace
5cedea9da8
removing trailing whitespace
2019-06-14 16:23:31 +12:00
Brenda Wallace
19350e7aa0
Removing phantom
2019-06-14 16:15:49 +12:00
Brenda Wallace
0d252bf3d3
Add chrome, from apt, on travis-ci
2019-06-14 16:14:59 +12:00
Brenda Wallace
d98e94bd21
Switch from poltergeist to selenium chrome headless
2019-06-14 16:13:53 +12:00
Brenda Wallace
58ffcb281f
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-14 16:06:44 +12:00
Brenda Wallace
19eae7d259
crop search form on white background
...
for readability
2019-06-14 16:06:32 +12:00
Daniel O'Connor
28f68717f5
Address code climate concerns by extracting query methods
2019-06-14 13:36:20 +09:30
Brenda Wallace
d7b973e684
Add harvest predictions to homepage blurb
2019-06-14 15:58:27 +12:00
Brenda Wallace
465c7c7b6d
Move crop form error messages to alert
2019-06-14 15:54:04 +12:00
Brenda Wallace
6c23302435
Fix duplicate labels on crop form
2019-06-14 15:52:05 +12:00
Brenda Wallace
feb11811a5
badges were overlapping the menu
2019-06-14 15:35:22 +12:00
Brenda Wallace
f2e87c9863
elipsis when photo title is too long
2019-06-14 15:31:16 +12:00
Brenda Wallace
6d18400a8b
turn off all link hover underlines
2019-06-14 15:22:53 +12:00
Brenda Wallace
c5988ded4e
tidy up badges and progress bar
2019-06-14 15:21:06 +12:00
Brenda Wallace
533c9aefdb
push the link to bottom of member cards
2019-06-14 15:14:22 +12:00
Brenda Wallace
5ec29b40d0
tidy up sci name action menu
2019-06-14 15:08:01 +12:00
Brenda Wallace
ab3f65742f
better hover on members avatar
2019-06-14 15:07:44 +12:00
Brenda Wallace
62302b3fd7
Fix round display of member avatars
2019-06-14 15:06:55 +12:00
Brenda Wallace
3863c0e0e8
These colours returned
2019-06-14 15:06:39 +12:00
Brenda Wallace
35fa2122b8
padding on thumbnail photos
2019-06-14 12:20:55 +12:00
Brenda Wallace
bd6533ccc3
Revert "Revert "DRY the photos helper""
...
This reverts commit 7f7f2cae47 .
2019-06-14 12:01:33 +12:00
Brenda Wallace
0af9fe0e4c
Updated a wierd spec on crop.photos.size that looked wrong
2019-06-14 12:00:41 +12:00
Brenda Wallace
7f7f2cae47
Revert "DRY the photos helper"
...
This reverts commit 798fff43cf .
2019-06-14 11:52:10 +12:00
Brenda Wallace
2949abd6bf
SEt subject of post in spec, so it matches the tests
2019-06-14 11:47:15 +12:00
Brenda Wallace
58e28b9311
nicer link to member gardens
2019-06-14 11:45:55 +12:00
Brenda Wallace
e0b9acc27d
Tidier link to member posts
2019-06-14 11:27:43 +12:00
Brenda Wallace
6086a1aaa5
strip tags on subjects
2019-06-14 11:26:29 +12:00
Brenda Wallace
bd8ab9365d
padding on member icon
2019-06-14 11:26:11 +12:00
Brenda Wallace
def468827c
Update helper spec
2019-06-14 11:21:23 +12:00
Brenda Wallace
798fff43cf
DRY the photos helper
2019-06-14 11:20:06 +12:00
Brenda Wallace
c0b2a8431b
Reinstate likes
2019-06-14 11:01:16 +12:00
Brenda Wallace
22e7a85388
inline search form on crops#search
2019-06-14 10:54:30 +12:00
Brenda Wallace
6e9207c2ed
Fix tabulation error in haml
2019-06-14 10:13:02 +12:00
Brenda Wallace
f8e9cd8fbf
Tidy up photo associations on photos#show
2019-06-14 10:11:55 +12:00
Brenda Wallace
9a5ebc5260
rename photos/photo_associations to photos/associations
2019-06-14 10:06:48 +12:00
Brenda Wallace
4cedc6e262
Action menus for photos#show
2019-06-14 10:03:51 +12:00
Brenda Wallace
729254ac24
added href to link so capybara finds it
2019-06-14 10:00:28 +12:00
Brenda Wallace
c0c1b1df70
Tidy up on photos#new
2019-06-14 09:56:12 +12:00
Brenda Wallace
6db1c7b327
Merge remote-tracking branch 'refs/remotes/origin/upgrade/bootstrap'
...
Conflicts:
spec/features/harvests/harvesting_a_crop_spec.rb
2019-06-13 23:06:51 +12:00
Brenda Wallace
52edaae43b
update harvest spec to find edit behind actions menu
2019-06-13 23:05:59 +12:00
Brenda Wallace
6f036271c5
update harvest spec to find edit behind actions menu
2019-06-13 23:05:02 +12:00
Brenda Wallace
a25955714d
class on member link, so spec finds it
2019-06-13 23:04:06 +12:00
Brenda Wallace
fbef77b5d0
Fix members list spec, and DRY
2019-06-13 23:00:54 +12:00
Brenda Wallace
8e986ff2c3
consistent use of card-link on crops#show
2019-06-13 22:31:53 +12:00
Brenda Wallace
37e87d3744
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-13 21:45:48 +12:00
Brenda Wallace
e801a1d7c6
Removing unused views
2019-06-13 21:06:10 +12:00
Brenda Wallace
82661c577c
Removing comments views
2019-06-13 21:05:29 +12:00
Brenda Wallace
92ae1a7bd2
Merge branch 'dev' into upgrade/bootstrap
2019-06-13 20:52:25 +12:00
Brenda Wallace
d551a99da6
set text in post body to find in post rss spec
2019-06-13 20:51:27 +12:00
Brenda Wallace
220db5d28c
Merge branch 'master' into dev
2019-06-13 20:36:24 +12:00
Brenda Wallace
10475cb711
Matching labels on seeds form to specs
2019-06-13 20:32:00 +12:00
Brenda Wallace
6825f8810f
tidy up seeds form
2019-06-13 20:01:21 +12:00
Daniel O'Connor
949c57bf7d
Line length
2019-06-13 07:58:52 +00:00
Daniel O'Connor
a1cdc2ee93
Passing rubocop
2019-06-13 07:58:52 +00:00
Daniel O'Connor
7bfb2061e1
Passing rubocop
2019-06-13 07:58:52 +00:00
Daniel O'Connor
f1ebc35e53
Rubocop fixes
2019-06-13 07:58:52 +00:00
Daniel O'Connor
28f262368b
Rubocop fix
2019-06-13 07:58:52 +00:00
Daniel O'Connor
fedcaae08f
Upgraded rubocop configuration
2019-06-13 07:58:52 +00:00
Brenda Wallace
331f568b4c
upgrade rubocop
2019-06-13 07:58:52 +00:00
Brenda Wallace
6c49f1768c
add extra click into spec
2019-06-13 19:51:18 +12:00
Brenda Wallace
740fdb3ec5
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-13 19:43:53 +12:00
Brenda Wallace
62fb1142b2
Merge branch 'dev' into upgrade/bootstrap
2019-06-13 17:53:51 +12:00
Daniel O'Connor
0bdddf8207
Merge pull request #1981 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.8
...
Bump jsonapi-resources from 0.9.7 to 0.9.8
2019-06-13 14:49:28 +09:30
Daniel O'Connor
dcc10273ef
Update search placeholder
2019-06-13 13:59:19 +09:30
Daniel O'Connor
347dfc3258
Apply similar layout to app/views/crops/index.html.haml
2019-06-13 13:56:53 +09:30
Daniel O'Connor
a26003940d
Crop search result page - doubled breadcrumbs
2019-06-13 13:54:59 +09:30
Brenda Wallace
2989e59a7c
Add bonsai to heroku config
2019-06-13 04:20:59 +00:00
Daniel O'Connor
d4c3927e61
Merge branch 'dev' into dependabot/bundler/jsonapi-resources-0.9.8
2019-06-13 13:44:33 +09:30
dependabot-preview[bot]
8486921924
[Security] Bump chartkick from 3.1.0 to 3.2.0
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.1.0 to 3.2.0. **This update includes security fixes.**
- [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.1.0...v3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-12 05:15:09 +00:00
dependabot-preview[bot]
cb7c965b69
Bump capybara-screenshot from 1.0.22 to 1.0.23
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.22 to 1.0.23.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases )
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.22...v1.0.23 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-12 05:00:21 +00:00
codefactor-io
a9f8df62c5
[CodeFactor] Apply fixes
2019-06-12 04:52:57 +00:00
Brenda Wallace
9285ffaec7
Update app/views/members/_actions.html.haml
2019-06-12 16:51:55 +12:00
Brenda Wallace
329e856569
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-12 16:27:49 +12:00
Brenda Wallace
39586cc1ba
Update app/controllers/plantings_controller.rb
2019-06-12 16:23:29 +12:00
Brenda Wallace
cfac7defed
Remove commented out gem
2019-06-12 16:20:11 +12:00
Daniel O'Connor
6244c4bfe9
Merge branch 'dev' into upgrade/bootstrap
2019-06-12 13:43:15 +09:30
Daniel O'Connor
2fa7f52503
Merge branch 'dev' into dependabot/bundler/jsonapi-resources-0.9.8
2019-06-12 13:41:29 +09:30
dependabot-preview[bot]
ff250711e4
Bump capybara from 3.22.0 to 3.23.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.22.0 to 3.23.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.22.0...3.23.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-12 04:10:45 +00:00
Brenda Wallace
878c692b27
posts display
2019-06-12 14:48:00 +12:00
Brenda Wallace
44e861dc6f
block buttons
2019-06-12 14:47:43 +12:00
Brenda Wallace
1473842e05
Merge branch 'upgrade/bootstrap' of github.com:br3nda/growstuff into upgrade/bootstrap
2019-06-12 14:40:14 +12:00
Brenda Wallace
6d8c02f282
Make the member icon tiny on comments
2019-06-12 14:39:37 +12:00
Brenda Wallace
a495807739
Percy snapshots for notifications
2019-06-12 14:29:49 +12:00
Brenda Wallace
9982e94af7
Run all feature specs to find percy snapshots
2019-06-12 14:29:28 +12:00
Brenda Wallace
e8865ba528
More alerty message about no messages
2019-06-12 12:36:56 +12:00
Brenda Wallace
e56133a944
Delete percy_new_spec.rb
2019-06-12 12:10:02 +12:00
Brenda Wallace
64dcb62c03
Fix tabulated
2019-06-12 11:24:16 +12:00
Brenda Wallace
b52dc34381
Header on notifications
2019-06-12 11:22:25 +12:00
Brenda Wallace
2d9d8c45a2
Update index.html.haml
2019-06-12 11:21:07 +12:00
Brenda Wallace
accf549e58
Delete percy-new.sh
2019-06-12 11:18:24 +12:00
Brenda Wallace
a53e9e59a9
Delete .hound.yml
2019-06-12 11:17:54 +12:00
Brenda Wallace
cb84579e78
Delete .mention-bot
2019-06-12 11:17:38 +12:00
Brenda Wallace
690afc1747
One more button from homepage
2019-06-12 09:39:57 +12:00
Brenda Wallace
7cb4bf2314
LArge buttons on home page
2019-06-12 09:39:29 +12:00
Brenda Wallace
4ef16accf6
Merge branch 'dev' into upgrade/bootstrap
2019-06-12 09:36:32 +12:00
Brenda Wallace
4f1eddd631
specs want 30 on a page - so telling the controller
2019-06-12 09:35:51 +12:00
Brenda Wallace
2386fe7afe
new hash syntax
2019-06-12 09:27:49 +12:00
Brenda Wallace
040c414827
find translation of some_of_our_crops
2019-06-12 09:27:40 +12:00
dependabot-preview[bot]
85b2d3d2c3
Bump jsonapi-resources from 0.9.7 to 0.9.8
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.7 to 0.9.8.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.7...v0.9.8 )
2019-06-11 21:27:11 +00:00
dependabot-preview[bot]
001b8c2079
Bump newrelic_rpm from 6.3.0.355 to 6.4.0.356
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.3.0.355 to 6.4.0.356.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/compare/6.3.0.355...6.4.0.356 )
2019-06-11 21:25:24 +00:00
Brenda Wallace
0b44acc90e
Merge branch 'dev' into upgrade/bootstrap
2019-06-12 09:23:41 +12:00
Brenda Wallace
d44d6a0b19
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-12 09:23:10 +12:00
codefactor-io
571f4298bb
[CodeFactor] Apply fixes
2019-06-11 21:22:53 +00:00
Brenda Wallace
4086e6dd00
remove comments from json
2019-06-12 09:22:33 +12:00
Brenda Wallace
4b7705fcad
wrap a context link in before in specs
2019-06-12 09:20:32 +12:00
Brenda Wallace
ee152b3ba3
Match sign in for to the older labels, so tests pass without changes
2019-06-12 09:20:09 +12:00
Brenda Wallace
78f3badcd7
upgrade rubocop
2019-06-12 09:12:23 +12:00
Brenda Wallace
7e3d43c47c
add missing translations for buttons
2019-06-12 09:10:37 +12:00
Brenda Wallace
c80cbf203c
follow, edit, and message buttons on members#show
2019-06-12 09:10:25 +12:00
Brenda Wallace
b92cef4c02
view all buttons on home page
2019-06-12 09:10:07 +12:00
dependabot-preview[bot]
4d2318ea68
Bump searchkick from 4.0.1 to 4.0.2
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.0.1...v4.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-10 23:21:07 +00:00
dependabot-preview[bot]
16f981813a
Bump haml from 5.0.4 to 5.1.1
...
Bumps [haml](https://github.com/haml/haml ) from 5.0.4 to 5.1.1.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/v5.0.4...v5.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-10 22:41:05 +00:00
Brenda Wallace
0d02f5758b
actions menu for harvests
2019-06-09 15:53:01 +12:00
Brenda Wallace
b617468e26
remove commented out code
2019-06-09 14:03:20 +12:00
Brenda Wallace
8762b11555
tidy plantings action menu
2019-06-09 14:02:55 +12:00
Brenda Wallace
7bc641fb55
fix gardens action menu
2019-06-09 14:02:41 +12:00
Brenda Wallace
80e8364de0
title on planting thumbnails
2019-06-09 14:02:30 +12:00
Brenda Wallace
2fa4590315
gardens breadcrumbs
2019-06-09 14:02:13 +12:00
Brenda Wallace
4255cde5ff
member cards on home page fix up
2019-06-09 13:24:05 +12:00
Brenda Wallace
5957309dea
Update harvest spec
2019-06-09 10:16:34 +12:00
Brenda Wallace
cf3068dc08
card display on small screens
2019-06-09 10:05:31 +12:00
Brenda Wallace
0572c4678b
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-09 09:54:47 +12:00
Brenda Wallace
c7ae520d66
add missing translation for "Record Harvest"
2019-06-09 09:54:28 +12:00
Brenda Wallace
4fd24e61d9
harvest own on card
2019-06-09 09:54:09 +12:00
Brenda Wallace
0cbc224298
remove commented out code
2019-06-09 09:53:56 +12:00
Brenda Wallace
5c5abcde30
fix up titles
2019-06-09 09:53:46 +12:00
Brenda Wallace
0c4b9a800e
Use our own index-cards class for card layout instead of bootstrap grid
2019-06-09 09:53:31 +12:00
dependabot-preview[bot]
6587b7349f
Bump rubocop from 0.70.0 to 0.71.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.70.0 to 0.71.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.70.0...v0.71.0 )
2019-06-08 07:52:00 +00:00
dependabot-preview[bot]
f5fb95c975
Bump haml_lint from 0.31.0 to 0.32.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.31.0 to 0.32.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.31.0...v0.32.0 )
2019-06-08 07:21:09 +00:00
Brenda Wallace
3d11dac718
Fixing harvest specs
2019-06-08 18:21:15 +12:00
codefactor-io
977ff7d174
[CodeFactor] Apply fixes
2019-06-08 05:20:29 +00:00
Brenda Wallace
628a7e3ae1
Fix planting specs
2019-06-08 17:02:59 +12:00
Brenda Wallace
1526cea92a
required explanation test on plantings form
2019-06-08 16:02:19 +12:00
Brenda Wallace
f4457f877f
fixing planting specs
2019-06-08 16:02:06 +12:00
Brenda Wallace
eb628635e2
fix logic on planting.active
2019-06-08 15:39:14 +12:00
Brenda Wallace
8d3e080afb
classes for gardens button
2019-06-08 15:38:39 +12:00
Brenda Wallace
9b8638a3b6
tests for plantings.active scope
2019-06-08 15:38:27 +12:00
Brenda Wallace
532699a1ec
menu on the left, works better on mobile
2019-06-08 15:38:18 +12:00
Brenda Wallace
d2c062a3f1
garden actions
2019-06-08 14:57:29 +12:00
Brenda Wallace
fae3155237
match to spec
2019-06-08 14:57:11 +12:00
Brenda Wallace
51133359fb
tidy
2019-06-08 10:29:52 +12:00
Brenda Wallace
9b62d4609b
added back the plantings quick actions menu
2019-06-08 10:29:17 +12:00
Brenda Wallace
e3ddf61c4d
asterisk for required fields
2019-06-08 09:47:28 +12:00
Brenda Wallace
47fbfa815a
More room on gardens form
2019-06-08 09:31:53 +12:00
Brenda Wallace
e9103f500d
put autosuggest at tooltip level
2019-06-08 09:24:41 +12:00
Brenda Wallace
5f705c47c5
garden form name is required
2019-06-08 09:24:29 +12:00
Brenda Wallace
7965845ab2
crops show sidebar tidy up harvests and plantings
2019-06-08 09:24:18 +12:00
Brenda Wallace
8cc3bada0a
update spec to find elements on the new forms
2019-06-08 09:23:27 +12:00
Brenda Wallace
5a2f9f84d8
Comment for post deploy script in heroku config
2019-06-08 08:34:50 +12:00
Brenda Wallace
771730c916
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-08 08:28:05 +12:00
Brenda Wallace
fde3f06bdb
Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
...
Conflicts:
Gemfile.lock
2019-06-08 08:27:20 +12:00
Brenda Wallace
96eaba2a79
Needs bonsai to deploy on heroku
2019-06-08 08:23:56 +12:00
codefactor-io
b62f648042
[CodeFactor] Apply fixes
2019-06-07 10:38:58 +00:00
Brenda Wallace
ee7ea523e1
capitalise name in spec to match new view
2019-06-07 20:44:44 +12:00
Brenda Wallace
9e1d531de9
nil for perennial doesn't mean annual
2019-06-07 20:44:30 +12:00
Brenda Wallace
4fc460b2a2
Match to crops specs
2019-06-07 20:42:57 +12:00
Brenda Wallace
49069f4c4a
seeds button helper, for actions links
2019-06-07 20:36:14 +12:00
Brenda Wallace
06650a790d
active scopes on plantings and seeds
2019-06-07 20:36:02 +12:00
Brenda Wallace
3bcb34d336
Member cards with only the active data counted
2019-06-07 20:35:42 +12:00
Brenda Wallace
ffeaa08ff7
restore crops sidebar to match specs
2019-06-07 20:35:24 +12:00
Brenda Wallace
b1b24f5e0a
mark delete link as danger
2019-06-07 20:35:02 +12:00
Brenda Wallace
81f1a55aca
actions menu for seeds
2019-06-07 20:34:37 +12:00
Brenda Wallace
74bae31557
Max size for hero photo
2019-06-07 20:34:18 +12:00
Brenda Wallace
b608a0e3ac
Scientific name matching alt names
2019-06-07 14:08:13 +12:00
Brenda Wallace
a93aecdb3b
Alternate names specs
2019-06-07 14:01:21 +12:00
Brenda Wallace
c708608e9b
Tidy up members#show photo display
2019-06-07 13:09:29 +12:00
Brenda Wallace
b2ee3ee299
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-06-07 10:56:42 +12:00
Brenda Wallace
4ab140a15e
actions are now in the actoins menu. update spec
2019-06-06 22:30:28 +12:00
Brenda Wallace
78ea7d6a53
Crop wrangling is now under the admin menu - update spec
2019-06-06 22:30:17 +12:00
codefactor-io
2786476faa
[CodeFactor] Apply fixes
2019-06-06 08:37:27 +00:00
Brenda Wallace
6daca910ab
Fixed buttons on crops#show
2019-06-05 23:24:34 +12:00
Brenda Wallace
0715646688
Change crop autosuggest styles
2019-06-05 23:12:12 +12:00
Brenda Wallace
84ca2154f4
fix up footer
2019-06-05 22:58:12 +12:00
Brenda Wallace
fad43f18c8
missing titles, icons, and breadcrumps
2019-06-05 22:46:41 +12:00
Brenda Wallace
9cc97e10cd
tidy up crops sort form
2019-06-05 22:37:13 +12:00
Brenda Wallace
a7e83202fb
a margin below every card
2019-06-05 22:31:39 +12:00
Brenda Wallace
d346ae8e4b
tidy up crops#index on a small screen
2019-06-05 22:29:29 +12:00
Brenda Wallace
04d941111b
tidy up harvests#index on a small screen
2019-06-05 22:29:18 +12:00
Brenda Wallace
385ecac46f
Revert "Tidy up crops#index on small screens"
...
This reverts commit 5a5e0c8f82 .
2019-06-05 22:27:05 +12:00
Brenda Wallace
5a5e0c8f82
Tidy up crops#index on small screens
2019-06-05 22:19:05 +12:00
Brenda Wallace
eb1cb31f6a
fix alignment of header on members#show
2019-06-05 17:22:09 +12:00
Brenda Wallace
6af4bb9ecf
Fix tiny crop photos on small screens
2019-06-05 17:21:44 +12:00
Brenda Wallace
9b0eb212b1
Button back needs to wrap
2019-06-05 17:21:30 +12:00
Brenda Wallace
75cc2040b1
Expand maincontainer on small screens
2019-06-05 17:21:20 +12:00
Brenda Wallace
70afa97b80
only shrink the member card on the homepage
2019-06-05 08:35:39 +12:00
Brenda Wallace
75b04ffe04
attempting to make posts appear nice on mobile
2019-06-04 20:02:28 +12:00
Brenda Wallace
16f9f4c66e
plantings actions as dropdown menu
2019-06-04 20:02:02 +12:00
Brenda Wallace
0235f233ab
plantigns tidy for small screens
2019-06-04 15:45:23 +12:00
Brenda Wallace
abfe1ace20
harvest -> planting assignment form tidy for small screens
2019-06-04 15:45:13 +12:00
Brenda Wallace
b3bcce9583
plantings form tidy for small screens
2019-06-04 15:44:55 +12:00
Brenda Wallace
357b70f068
harvest form tidy for small screens
2019-06-04 15:44:45 +12:00
dependabot-preview[bot]
92c69af977
Bump chartkick from 3.0.2 to 3.1.0
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.0.2 to 3.1.0.
- [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.0.2...v3.1.0 )
2019-06-03 22:52:06 +00:00
dependabot-preview[bot]
1fb7b435e4
[Security] Bump axios from 0.18.0 to 0.18.1
...
Bumps [axios](https://github.com/axios/axios ) from 0.18.0 to 0.18.1. **This update includes security fixes.**
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/v0.18.1/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.18.0...v0.18.1 )
2019-06-03 22:17:36 +00:00
dependabot-preview[bot]
bd7adb5123
Bump capybara from 3.19.1 to 3.22.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.19.1 to 3.22.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.19.1...3.22.0 )
2019-06-03 22:00:54 +00:00
Brenda Wallace
ab4119c68d
make gardens for nicer on mobile
2019-06-03 23:19:15 +12:00
Brenda Wallace
c7d5915b44
Make seeds form nicer on mobile
2019-06-03 23:16:28 +12:00
Brenda Wallace
6c41b52cb1
Fix - planting.active scope to not show finished
2019-06-03 23:01:57 +12:00
Brenda Wallace
2dd4e95e7c
don't set max card
2019-06-03 22:47:43 +12:00
Brenda Wallace
cf69c13527
fix up erros on planting form
2019-06-03 22:47:19 +12:00
Brenda Wallace
f944ce11d0
margin on sect
2019-06-03 22:31:11 +12:00
Brenda Wallace
89f51c8a81
make the seed card wider
2019-06-03 22:25:08 +12:00
Brenda Wallace
14aa9a66df
Move crop photos into row
2019-06-03 22:24:55 +12:00
Brenda Wallace
09499499b7
bugfix - label on signup link
2019-06-03 22:24:22 +12:00
Brenda Wallace
f94199676c
fullsize garden images
2019-06-03 22:23:49 +12:00
Brenda Wallace
00010d3a0f
Breadcrumps
2019-06-03 22:23:36 +12:00
Brenda Wallace
6bc3291185
tidy up plantings
2019-06-03 22:23:06 +12:00
Brenda Wallace
11afea1c54
fixing plantings form
2019-06-03 22:22:53 +12:00
Brenda Wallace
7c45647ff2
gardens tidy up
2019-06-03 22:22:40 +12:00
Brenda Wallace
5255b5d572
More crops tidy up
2019-06-03 22:22:28 +12:00
dependabot-preview[bot]
17f696cf0e
Bump percy-capybara from 4.0.0 to 4.0.1
...
Bumps [percy-capybara]() from 4.0.0 to 4.0.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-31 21:51:05 +00:00
dependabot-preview[bot]
505e6a3219
Bump searchkick from 4.0.0 to 4.0.1
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v4.0.0...v4.0.1 )
2019-05-31 21:20:15 +00:00
Brenda Wallace
1a15916c73
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-30 11:18:04 +12:00
Brenda Wallace
f7db832a0e
Match the tests further
2019-05-30 09:49:50 +12:00
Brenda Wallace
85410858cc
Tidy up the delete link in crops actions
2019-05-30 09:49:37 +12:00
codefactor-io
7f1bb7913c
[CodeFactor] Apply fixes
2019-05-29 21:48:42 +00:00
Brenda Wallace
e6c2e9abf6
Merge branch 'dev' into upgrade/bootstrap
2019-05-30 09:48:28 +12:00
Brenda Wallace
3f86c5a749
Update CONTRIBUTORS.md
2019-05-30 09:48:09 +12:00
Brenda Wallace
f0d49b7e9d
capitalize to match the specs
2019-05-29 15:46:42 +12:00
Brenda Wallace
210b912859
Home page tidy
2019-05-29 15:06:09 +12:00
Brenda Wallace
73996317d5
Fixing display on small screens
2019-05-29 10:48:56 +12:00
Brenda Wallace
2f4fc948db
Move overrides last
2019-05-29 10:48:26 +12:00
Brenda Wallace
390ac6587f
Seed cards title smaller, fit more on screen
2019-05-27 09:29:32 +12:00
Brenda Wallace
8d6e48ad3d
tidy up crops form
2019-05-27 09:27:43 +12:00
Brenda Wallace
27b3f5fac9
turn of shadow on thumbnails
2019-05-27 08:36:46 +12:00
Brenda Wallace
8d07cc6c39
More crops tidy
2019-05-27 08:36:35 +12:00
Brenda Wallace
e220b3dcd8
MAtching to the specs
2019-05-27 08:08:27 +12:00
Brenda Wallace
611c692624
Update CONTRIBUTORS.md
2019-05-27 03:46:11 +12:00
Brenda Wallace
8524b13333
Update CONTRIBUTORS.md
2019-05-27 03:45:37 +12:00
Brenda Wallace
df4f7de178
Add dependabot's new name
2019-05-27 03:42:39 +12:00
Brenda Wallace
180c8af89d
Merge pull request #1968 from Growstuff/dev-cf-autofix
...
Apply fixes from CodeFactor
2019-05-25 21:52:46 +12:00
Brenda Wallace
028e149338
button label matching spec
2019-05-25 19:17:53 +12:00
Brenda Wallace
223e61b8a8
Re-instate search title
2019-05-25 19:15:46 +12:00
Brenda Wallace
73c834adf3
added missing translation
2019-05-25 19:15:35 +12:00
Brenda Wallace
0811699020
USe search bar partial
2019-05-25 19:15:27 +12:00
Brenda Wallace
0d3bdc09ab
Tool tips on actions
2019-05-25 17:17:25 +12:00
Brenda Wallace
91894db0db
Remove unused grid sizer class
2019-05-25 17:02:26 +12:00
Brenda Wallace
ac52fb743c
tidy post display on small screens
2019-05-25 17:02:16 +12:00
Brenda Wallace
70d4b85f98
Member actions
2019-05-25 17:02:06 +12:00
Brenda Wallace
62214d6e36
allow plantings factor boxes to be bigger
2019-05-25 17:01:53 +12:00
Brenda Wallace
c7e4216a31
move global actions
2019-05-25 17:01:28 +12:00
Brenda Wallace
fcabfef8d9
Put planting owner details in a card
2019-05-25 15:19:15 +12:00
Brenda Wallace
1e03d15434
Move post actions to own file
2019-05-25 15:18:58 +12:00
Brenda Wallace
b21aa50203
Tidy up seeds on homepage
2019-05-25 15:18:43 +12:00
Brenda Wallace
94aa920360
Fix button id
2019-05-25 15:14:02 +12:00
Brenda Wallace
f822b32ac8
More Actions into drop down
2019-05-25 15:11:07 +12:00
Brenda Wallace
e4be6feaed
Tidy up forms form
2019-05-25 14:26:31 +12:00
Brenda Wallace
54f54f020a
Make sure we precompile the assets before running percy
2019-05-25 10:31:26 +12:00
Brenda Wallace
4c92c97aaa
Add names to admin pages in percy spec
2019-05-25 10:29:40 +12:00
Brenda Wallace
7ffefcf1b5
Add admin and crop wrangling to percy spec
2019-05-25 10:24:31 +12:00
Brenda Wallace
4caa30b2f5
button horizontal again
2019-05-25 10:22:57 +12:00
Brenda Wallace
6af086e94d
Tidy up percy specs for major #new pages
2019-05-25 10:04:16 +12:00
Brenda Wallace
ba000fd6ae
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-25 09:55:57 +12:00
Brenda Wallace
c54da57b31
Merge branch 'dev' into upgrade/bootstrap
2019-05-24 23:05:36 +12:00
Brenda Wallace
3ad36c647b
seed form
2019-05-24 21:15:45 +12:00
Brenda Wallace
5c544e3026
smaller planting cards
2019-05-24 21:15:36 +12:00
Brenda Wallace
b07f5526f1
Vertical buttons
2019-05-24 20:50:17 +12:00
Brenda Wallace
3ec0294565
post body
2019-05-24 20:47:18 +12:00
Brenda Wallace
95ed451c21
post header
2019-05-24 20:46:54 +12:00
Brenda Wallace
334037ed1e
form tidy
2019-05-24 20:43:00 +12:00
Brenda Wallace
ca17e6a258
Starting to tidy the crops form
2019-05-24 20:37:56 +12:00
Brenda Wallace
e4a375de79
Add missing translations
2019-05-24 20:37:32 +12:00
Brenda Wallace
f711b7e3b7
Add crops new to the percy specs
2019-05-24 20:37:16 +12:00
Brenda Wallace
c67adc1bd0
move global actions buttons
2019-05-24 20:37:06 +12:00
Brenda Wallace
cb5c28f0a3
seeds forms
2019-05-24 20:36:57 +12:00
Brenda Wallace
a2738aa99e
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-24 20:15:11 +12:00
Brenda Wallace
a18f0f4d38
rubocop lint
2019-05-24 20:15:01 +12:00
Brenda Wallace
b4b1a97a2a
Tidy harvest#index
2019-05-24 20:14:47 +12:00
Brenda Wallace
20fbec96d4
Tidying up forms
2019-05-24 20:14:24 +12:00
codefactor-io
6e78c678d7
[CodeFactor] Apply fixes
2019-05-24 01:24:29 +00:00
Brenda Wallace
c3ebdcb782
Merge pull request #1967 from Growstuff/dev-cf-autofix
...
Apply fixes from CodeFactor
2019-05-24 13:24:09 +12:00
codefactor-io
b55e99a05e
[CodeFactor] Apply fixes
2019-05-24 01:23:32 +00:00
codefactor-io
9fd2f34bf7
[CodeFactor] Apply fixes
2019-05-23 11:30:10 +00:00
Brenda Wallace
64c3d0ec3e
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-23 22:55:00 +12:00
Brenda Wallace
2f4a3fdcee
tidy up seeds form
2019-05-23 22:54:38 +12:00
Brenda Wallace
a43b2858d4
harvest form tidy up
2019-05-23 22:44:18 +12:00
Brenda Wallace
753814eb1d
Merge branch 'dev' into upgrade/bootstrap
2019-05-23 20:19:38 +12:00
dependabot[bot]
8c3c554e7f
Bump selenium-webdriver from 3.142.2 to 3.142.3
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.2 to 3.142.3.
- [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[bot] <support@dependabot.com >
2019-05-23 08:18:59 +00:00
Brenda Wallace
42c9879569
Merge pull request #1961 from Growstuff/dev
...
Production release
2019-05-23 11:41:09 +12:00
dependabot[bot]
d155f92206
Bump haml-rails from 2.0.0 to 2.0.1
...
Bumps [haml-rails](https://github.com/indirect/haml-rails ) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/indirect/haml-rails/releases )
- [Commits](https://github.com/indirect/haml-rails/compare/v2.0.0...v2.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-22 20:43:02 +00:00
dependabot[bot]
2a60435825
Bump rubocop from 0.69.0 to 0.70.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.69.0 to 0.70.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.69.0...v0.70.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-23 08:06:45 +12:00
Brenda Wallace
6216601d2a
Tidy up plantings#new
2019-05-22 16:53:14 +12:00
Brenda Wallace
8e23f25ebb
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
Gemfile.lock
2019-05-22 07:51:12 +12:00
Brenda Wallace
7cb0002b37
Convert to scss
2019-05-21 14:04:23 +12:00
Brenda Wallace
a8f1740584
Re-instate the buttons
2019-05-21 13:39:56 +12:00
Brenda Wallace
c421eaaf4b
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-21 13:38:06 +12:00
Brenda Wallace
3559780fb4
Plant something button
2019-05-21 13:37:43 +12:00
Brenda Wallace
d2e0331539
DRY the photos icon use
2019-05-21 13:37:31 +12:00
Brenda Wallace
bd897efcce
Addprogress back to plantings
2019-05-21 12:06:52 +12:00
Brenda Wallace
d217282bf3
Add photos to activity
2019-05-21 12:06:22 +12:00
Brenda Wallace
eb5195e80a
Merge branch 'dev' into upgrade/bootstrap
2019-05-21 11:16:03 +12:00
dependabot[bot]
c5c1bec5fb
Bump jsonapi-resources from 0.9.6 to 0.9.7
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.6 to 0.9.7.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.6...v0.9.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-20 09:00:30 +00:00
dependabot[bot]
0e359bb3f1
Bump haml_lint from 0.30.0 to 0.31.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.30.0 to 0.31.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.30.0...v0.31.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-19 20:02:19 +00:00
codefactor-io
0d9d7efbe7
[CodeFactor] Apply fixes
2019-05-19 08:35:36 +00:00
Brenda Wallace
9adca482d6
member in percy spec located
2019-05-19 20:34:46 +12:00
Brenda Wallace
8a2e5f1f54
Fix percy spec
2019-05-19 18:07:05 +12:00
Brenda Wallace
2e5445da3e
Create some activity on the member's page
2019-05-19 15:46:42 +12:00
Brenda Wallace
5f1d65dfc0
typo. tradeable -> tradable
2019-05-19 15:36:45 +12:00
Brenda Wallace
47e9f38cce
Move badges on planting thumbnail
2019-05-19 15:35:14 +12:00
Brenda Wallace
f293661bbe
seeds tidy up
2019-05-19 15:34:51 +12:00
Brenda Wallace
4de9b2f558
fix bug in percy spec
2019-05-19 15:34:37 +12:00
Brenda Wallace
dea6f36b0e
Fix filter posts by member
2019-05-19 15:34:26 +12:00
Brenda Wallace
7528a337cf
Seeds to be in percy specs
2019-05-19 15:10:31 +12:00
Brenda Wallace
4a78a30779
Put membet activity on their profile
2019-05-19 15:10:03 +12:00
Brenda Wallace
6c3278ee38
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-19 13:46:42 +12:00
Brenda Wallace
57cd11e2ab
tidy up members#show
2019-05-19 11:52:35 +12:00
Brenda Wallace
e0e54d7c07
pull-right becomes text-right
2019-05-19 11:52:08 +12:00
Brenda Wallace
d9a1323234
Tidy up gardens#show
2019-05-19 11:51:53 +12:00
Brenda Wallace
1855d1318b
pull-right becomes text-right
2019-05-19 11:50:40 +12:00
Brenda Wallace
586cdef0ed
Tidy up comments display
2019-05-19 11:50:28 +12:00
Brenda Wallace
13419d37bb
pull-right becomes text-right
2019-05-19 11:50:04 +12:00
Brenda Wallace
dcfe49901e
Posts actions in dropdown menus
2019-05-19 10:20:35 +12:00
codefactor-io
4af8282a44
[CodeFactor] Apply fixes
2019-05-18 19:36:26 +00:00
Brenda Wallace
64b3ab25e1
tidy up plantings#index
2019-05-18 23:18:42 +12:00
Brenda Wallace
dccbf440cb
Breadcrumbs
2019-05-18 23:18:27 +12:00
Brenda Wallace
b19bef0ec3
Adding posts and comments to percy spec
2019-05-18 22:29:49 +12:00
Brenda Wallace
5982a58851
Fix posts#index
2019-05-18 22:26:50 +12:00
Brenda Wallace
7bf2d75605
More post content in percy specs
2019-05-18 21:45:31 +12:00
Brenda Wallace
253d1806ef
Fix the admin menu
2019-05-18 21:42:26 +12:00
Brenda Wallace
b19586dd1d
six harvests/plantings on the homepage
2019-05-18 21:42:12 +12:00
Brenda Wallace
f019969240
Tidy up posts
2019-05-18 21:41:41 +12:00
Brenda Wallace
2046d73330
Tidy up posts#index
2019-05-18 21:12:36 +12:00
Brenda Wallace
77c0dea122
Tidy up posts#show
2019-05-18 20:14:25 +12:00
Brenda Wallace
72479eb44f
Another gardens#show test
2019-05-17 12:26:50 +12:00
Brenda Wallace
d4eaacf11e
Add menus to percy spec
2019-05-17 12:18:48 +12:00
Brenda Wallace
a21366a098
fix icons on header nav
2019-05-17 12:18:36 +12:00
Brenda Wallace
707dc2e156
Fix display of member menu
2019-05-17 11:54:49 +12:00
Brenda Wallace
0b9a0609bc
Pretty shadows on photos
2019-05-17 11:54:39 +12:00
Brenda Wallace
83be516918
Align crop photos better
2019-05-17 11:54:12 +12:00
Brenda Wallace
d55af1b77d
Fix droppdown/dropup menus
2019-05-17 11:53:32 +12:00
Brenda Wallace
8d451b9687
Only show tradeable badge is actually tradeable
2019-05-17 11:06:29 +12:00
Brenda Wallace
c5c7376759
Tidy up the small screen display of harvest and plantings on the homepage
2019-05-17 10:09:29 +12:00
Brenda Wallace
42764602ff
Use flex instead of isotope
2019-05-17 09:50:25 +12:00
Brenda Wallace
4c0bca4b86
Removing isotope
...
we don't need it anymore
2019-05-17 09:49:57 +12:00
Brenda Wallace
e21e5d5960
Fixed padding on photos#show
2019-05-16 22:18:56 +12:00
Brenda Wallace
758bfacb4f
Restore title on photos#show page
2019-05-16 22:16:58 +12:00
Brenda Wallace
a65d2ba7b5
Addings gardens#show to percy spec
2019-05-16 21:57:12 +12:00
Brenda Wallace
3deb01d983
Reduce max width
2019-05-16 21:53:55 +12:00
Brenda Wallace
2cfcfffccc
tidy up sciname display on crops#show
2019-05-16 21:53:46 +12:00
Brenda Wallace
c999715ab0
Restoring the nav bar
2019-05-16 21:53:27 +12:00
Brenda Wallace
e26fff6d23
Add icon to find seeds
2019-05-16 21:50:03 +12:00
Brenda Wallace
b0de475cbe
Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap
2019-05-16 19:58:52 +12:00
Brenda Wallace
599cc349b8
Home page tidy for plantings, harvests, and discussion
2019-05-16 19:58:37 +12:00
Brenda Wallace
5a804db769
Merge branch 'dev' into upgrade/bootstrap
2019-05-15 12:57:07 +12:00
Brenda Wallace
89ad44e5da
Coloured button
2019-05-15 11:25:59 +12:00
Brenda Wallace
2ef7c7df19
tidy more crops#show
2019-05-15 11:25:39 +12:00
Brenda Wallace
0ee13c3320
Tidy up posts on crops#show
2019-05-15 09:32:27 +12:00
Brenda Wallace
569e2bb9a3
tidy up crops#show
2019-05-15 08:46:37 +12:00
Brenda Wallace
2165dc4e17
Tidy
2019-05-14 21:13:06 +12:00
Brenda Wallace
b5c88d8f33
set plant part in percy spec
2019-05-14 21:08:23 +12:00
Brenda Wallace
e9013a57dd
more
2019-05-14 21:00:34 +12:00
Brenda Wallace
b7ac04fc45
Restory homepage text
2019-05-14 20:36:49 +12:00
Brenda Wallace
8db6d06283
Restoring colours
2019-05-14 20:36:20 +12:00
dependabot[bot]
e54b92e306
Bump rubocop from 0.68.1 to 0.69.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.1 to 0.69.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.68.1...v0.69.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-14 08:33:52 +00:00
dependabot[bot]
d25091eead
Bump selenium-webdriver from 3.142.0 to 3.142.2
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.0 to 3.142.2.
- [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[bot] <support@dependabot.com >
2019-05-14 08:17:26 +00:00
dependabot[bot]
ee6fee5299
Bump rubocop-rspec from 1.32.0 to 1.33.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.32.0 to 1.33.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.32.0...v1.33.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-14 08:04:16 +00:00
dependabot[bot]
003df985af
Bump capybara from 3.19.0 to 3.19.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.19.0 to 3.19.1.
- [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.19.0...3.19.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-13 10:06:41 +00:00
Brenda Wallace
e029425785
Lint
2019-05-13 07:58:05 +12:00
codefactor-io
69531f232d
[CodeFactor] Apply fixes
2019-05-12 19:56:07 +00:00
Brenda Wallace
f47b22505c
Comment out global actions until it is prettier
2019-05-13 07:53:08 +12:00
Brenda Wallace
ddaa4319ec
Fix time freezer for percy specs
2019-05-13 07:52:52 +12:00
Brenda Wallace
f5d48d1b56
Removing bootstrap 3 - only bootstrap 4
...
because both isn't particularly clever
2019-05-13 07:52:38 +12:00
dependabot[bot]
9357f7a30c
Bump capybara from 3.18.0 to 3.19.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.18.0 to 3.19.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.18.0...3.19.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
d5a60c4a8f
Bump unicorn from 5.5.0 to 5.5.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.0 to 5.5.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
5fdbf3c4ac
Bump haml_lint from 0.29.0 to 0.30.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.29.0 to 0.30.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.29.0...v0.30.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
9cb6f03206
Bump selenium-webdriver from 3.141.0 to 3.142.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.142.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/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
80b0133f58
Bump haml_lint from 0.28.0 to 0.29.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.28.0 to 0.29.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.28.0...v0.29.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
8f796271f7
Bump newrelic_rpm from 6.2.0.354 to 6.3.0.355
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.2.0.354 to 6.3.0.355.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/compare/6.2.0.354...6.3.0.355 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
ca12d6be4d
Bump rubocop from 0.68.0 to 0.68.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.0 to 0.68.1.
- [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.68.0...v0.68.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
Awesome Code
fa49dfc9e7
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-05-12 22:29:35 +12:00
dependabot[bot]
9b2f3fbcb4
Bump rubocop from 0.67.2 to 0.68.0
...
Bumps rubocop from 0.67.2 to 0.68.0.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
7d313fef5d
Bump paranoia from 2.4.1 to 2.4.2
...
Bumps [paranoia](https://github.com/rubysherpas/paranoia ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubysherpas/paranoia/releases )
- [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md )
- [Commits](https://github.com/rubysherpas/paranoia/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
Brenda Wallace
51d0ac1052
adding mdbootstrap
2019-05-12 22:29:35 +12:00
dependabot[bot]
78903b4a40
Bump bullet from 5.9.0 to 6.0.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.9.0 to 6.0.0.
- [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/5.9.0...6.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
Brenda Wallace
43384a18f7
Add percy to travis
2019-05-12 22:29:35 +12:00
dependabot[bot]
8f3799f0eb
Bump coffee-rails from 4.2.2 to 5.0.0
...
Bumps [coffee-rails](https://github.com/rails/coffee-rails ) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/rails/coffee-rails/releases )
- [Changelog](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/coffee-rails/compare/v4.2.2...v5.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
611710b758
Bump sidekiq from 5.2.6 to 5.2.7
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.6 to 5.2.7.
- [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.6...v5.2.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
dependabot[bot]
8ce120011f
Bump capybara from 3.17.0 to 3.18.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.17.0 to 3.18.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.17.0...3.18.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-12 22:29:35 +12:00
Brenda Wallace
ef94b3d1a4
Removed irc link
2019-05-12 22:29:35 +12:00
Brenda Wallace
61b3c7880c
Freeze time
2019-05-12 22:29:35 +12:00
Brenda Wallace
89fa4743b8
Create less members per run
2019-05-12 22:29:35 +12:00
Brenda Wallace
4ec9630267
signin/signup pages
2019-05-12 22:29:35 +12:00
Brenda Wallace
559ca226d5
One run self data viewing when logged in
2019-05-12 22:29:35 +12:00
Brenda Wallace
3a2662b488
Adding viewing own data
2019-05-12 22:29:35 +12:00
Brenda Wallace
75a03ab18e
Set the gravatar, so percy doesn't alert on every snapshot
2019-05-12 22:29:35 +12:00
Brenda Wallace
3ebd7ede87
Add percy
2019-05-12 22:29:35 +12:00
Brenda Wallace
4d513aaabd
Merge branch 'dev' into upgrade/bootstrap
2019-05-11 07:58:57 +12:00
dependabot[bot]
5bae18ed6e
Bump capybara from 3.18.0 to 3.19.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.18.0 to 3.19.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.18.0...3.19.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-10 07:42:15 +00:00
dependabot[bot]
9182846a93
Bump unicorn from 5.5.0 to 5.5.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.0 to 5.5.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-06 18:49:37 +00:00
Brenda Wallace
76f7a8f5d0
Merge branch 'master' into dev
2019-05-06 22:20:31 +12:00
dependabot[bot]
b7d10b2660
Bump haml_lint from 0.29.0 to 0.30.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.29.0 to 0.30.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.29.0...v0.30.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-06 22:19:18 +12:00
dependabot[bot]
43c93bcd44
Bump selenium-webdriver from 3.141.0 to 3.142.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.142.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/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-05 07:08:17 +12:00
dependabot[bot]
e7ade7605d
Merge pull request #1948 from Growstuff/dependabot/bundler/haml_lint-0.29.0
2019-05-04 11:33:06 +00:00
dependabot[bot]
e2010d4900
Bump haml_lint from 0.28.0 to 0.29.0
...
Bumps [haml_lint](https://github.com/sds/haml-lint ) from 0.28.0 to 0.29.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.28.0...v0.29.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-03 07:39:06 +00:00
dependabot[bot]
2d3450f2a5
Bump newrelic_rpm from 6.2.0.354 to 6.3.0.355
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.2.0.354 to 6.3.0.355.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/compare/6.2.0.354...6.3.0.355 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-01 21:41:42 +12:00
dependabot[bot]
3360977eb4
Bump rubocop from 0.68.0 to 0.68.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.0 to 0.68.1.
- [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.68.0...v0.68.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-01 20:45:11 +12:00
Awesome Code
82a35ac69b
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-04-30 11:30:34 +00:00
Brenda Wallace
8b6c3ef3fb
Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
...
Conflicts:
Gemfile.lock
2019-04-30 19:51:09 +12:00
dependabot[bot]
b77422137f
Bump rubocop from 0.67.2 to 0.68.0
...
Bumps rubocop from 0.67.2 to 0.68.0.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-30 19:49:31 +12:00
Daniel O'Connor
7353ee111d
Merge pull request #1944 from Growstuff/dependabot/bundler/paranoia-2.4.2
...
Bump paranoia from 2.4.1 to 2.4.2
2019-04-30 14:19:54 +09:30
Brenda Wallace
75f14aecc0
Crop page tidy
2019-04-30 13:15:19 +12:00
Brenda Wallace
126769bfad
Remove jquery roadmap
2019-04-30 13:14:24 +12:00
Brenda Wallace
e92f5392a1
Alphabetical gems
2019-04-30 13:11:45 +12:00
Brenda Wallace
5b9a51c770
Merge branch 'dev' into upgrade/bootstrap
2019-04-30 10:08:14 +12:00
Brenda Wallace
0c61e72f86
Use full size crop images
2019-04-29 18:36:28 +12:00
Brenda Wallace
6dbf7a7932
Fix typo
2019-04-29 18:26:07 +12:00
Brenda Wallace
0c81f962aa
homepage tidy
2019-04-29 18:16:14 +12:00
Brenda Wallace
d400e73ff6
Move global actions
2019-04-29 15:31:47 +12:00
Brenda Wallace
3cb6fb90f7
Fix crop display
2019-04-29 15:31:39 +12:00
Brenda Wallace
d039c68f8a
Tidy up crops#index on mobile
2019-04-27 20:49:17 +12:00
Brenda Wallace
9ecf210ffb
More form tidy up
2019-04-27 19:19:42 +12:00
Brenda Wallace
45745a4e38
Add crops#new to percy
2019-04-27 19:11:59 +12:00
Brenda Wallace
945d320a0a
Remove the title from every page - because sometimes we don't want it
2019-04-27 19:11:49 +12:00
Brenda Wallace
eabf1fc659
Tidy up (most) forms
2019-04-27 19:11:30 +12:00
Brenda Wallace
430334a831
More photo specs for percy
2019-04-27 16:46:11 +12:00
Brenda Wallace
25626ea0ec
Added #edit to percy
2019-04-27 09:53:59 +12:00
Brenda Wallace
f2a840a1de
Fix spec
2019-04-26 22:09:17 +12:00
Brenda Wallace
83038fc4f3
More rounded photos
2019-04-26 22:03:56 +12:00
Brenda Wallace
9524899f78
tidy up harvests #index
2019-04-26 22:03:49 +12:00
Brenda Wallace
2db8dcf7c1
Pretty rounded images
2019-04-26 22:03:30 +12:00
Brenda Wallace
31bcb35fb4
Don't turn crop images into circles
2019-04-26 22:03:20 +12:00
Brenda Wallace
f96b2ca661
Tidy columns on crops index card
2019-04-26 21:41:30 +12:00
Brenda Wallace
548e15a866
Tidy up Photos#show
2019-04-26 21:38:34 +12:00
Brenda Wallace
83668c4890
Add photos#show to percy
2019-04-26 21:30:09 +12:00
Brenda Wallace
7c51d94dc0
More crops#show tidy up
2019-04-26 21:27:46 +12:00
Brenda Wallace
0871620c55
Tidy up finding seeds from crops#show
2019-04-26 21:27:35 +12:00
dependabot[bot]
81a3c7bfbc
Bump paranoia from 2.4.1 to 2.4.2
...
Bumps [paranoia](https://github.com/rubysherpas/paranoia ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubysherpas/paranoia/releases )
- [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md )
- [Commits](https://github.com/rubysherpas/paranoia/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-26 07:33:13 +00:00
Brenda Wallace
6d8a9c3579
Move global actions
2019-04-26 17:54:52 +12:00
Brenda Wallace
4196ce9e6b
Fix search
2019-04-26 17:35:22 +12:00
Brenda Wallace
b82c3b5b76
Tidy up seeds
2019-04-26 17:34:55 +12:00
Brenda Wallace
30b4485727
adding mdbootstrap
2019-04-26 16:36:54 +12:00
Brenda Wallace
de3aeaf823
add base branch to percy
2019-04-26 16:34:04 +12:00
Brenda Wallace
662160306d
add #new to percy tests
2019-04-26 16:34:00 +12:00
Brenda Wallace
088dd29fac
Add an avatar to all members
2019-04-26 16:26:22 +12:00
dependabot[bot]
7bb1424f0c
Bump bullet from 5.9.0 to 6.0.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.9.0 to 6.0.0.
- [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/5.9.0...6.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-26 00:45:04 +12:00
Brenda Wallace
71cf334e03
Add back the link to crop seeds
2019-04-26 00:18:04 +12:00
Brenda Wallace
b9ae3a4ab4
Add harvests to the homepage in percy specs
2019-04-26 00:01:54 +12:00
Brenda Wallace
cf3477e333
Use full size image
2019-04-26 00:01:38 +12:00
Brenda Wallace
d5d9c805ad
Shadows on the homepage
2019-04-25 23:51:53 +12:00
Brenda Wallace
3316514a7a
More material bits
2019-04-25 23:41:34 +12:00
Brenda Wallace
bff809f482
Removed extra graphs on crops#show
2019-04-25 23:33:49 +12:00
Brenda Wallace
4918d0c950
Tidy up homepage
2019-04-25 23:28:41 +12:00
Brenda Wallace
7dd3f169ee
Fixed haml error
2019-04-25 12:49:23 +12:00
Brenda Wallace
ab7eb913de
removed git conflict marker
2019-04-25 12:47:24 +12:00
Brenda Wallace
5534438843
Add percy to travis
2019-04-25 12:45:44 +12:00
Brenda Wallace
724adcb183
Merge remote-tracking branch 'upstream/dev' into material-merge
2019-04-25 12:36:12 +12:00
Brenda Wallace
5ad741ad7b
Merge remote-tracking branch 'upstream/dev' into material-merge
...
Conflicts:
app/views/members/_avatar.html.haml
2019-04-25 12:36:01 +12:00
dependabot[bot]
bba9e43b77
Bump coffee-rails from 4.2.2 to 5.0.0
...
Bumps [coffee-rails](https://github.com/rails/coffee-rails ) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/rails/coffee-rails/releases )
- [Changelog](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/coffee-rails/compare/v4.2.2...v5.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-24 22:37:30 +12:00
dependabot[bot]
9c7564c3b2
Bump sidekiq from 5.2.6 to 5.2.7
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.6 to 5.2.7.
- [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.6...v5.2.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-24 20:10:12 +12:00
dependabot[bot]
45fd123525
Merge pull request #1938 from Growstuff/dependabot/bundler/capybara-3.18.0
2019-04-24 06:57:20 +00:00
dependabot[bot]
bc33bf3084
Bump capybara from 3.17.0 to 3.18.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.17.0 to 3.18.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.17.0...3.18.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-24 01:36:20 +00:00
Brenda Wallace
85e7454d16
Removed irc link
2019-04-24 12:07:41 +12:00
pozorvlak
242059adf8
Merge pull request #1937 from Br3nda/percy
...
Add percy - visual difference detection
2019-04-23 17:34:37 +01:00
Brenda Wallace
3c53a8464d
Freeze time
2019-04-23 13:47:36 +12:00
Brenda Wallace
09db299416
Create less members per run
2019-04-23 13:12:13 +12:00
Brenda Wallace
c3d52e0b71
signin/signup pages
2019-04-23 13:04:24 +12:00
Brenda Wallace
21ba03fc7f
One run self data viewing when logged in
2019-04-23 10:52:27 +12:00
Brenda Wallace
e9cbda13b3
Adding viewing own data
2019-04-23 10:44:36 +12:00
Brenda Wallace
03acf35e73
Set the gravatar, so percy doesn't alert on every snapshot
2019-04-23 10:32:01 +12:00
Brenda Wallace
ba62208dd1
Add percy
2019-04-23 10:21:07 +12:00
dependabot[bot]
2b4d0fecf4
[Security] Bump nokogiri from 1.10.2 to 1.10.3
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-23 08:47:13 +12:00
Brenda Wallace
f7e1cb6508
Merge pull request #1934 from Growstuff/dependabot/bundler/nokogiri-1.10.3
...
[Security] Bump nokogiri from 1.10.2 to 1.10.3
2019-04-23 08:44:44 +12:00
dependabot[bot]
eb428e7741
[Security] Bump nokogiri from 1.10.2 to 1.10.3
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-22 18:06:31 +00:00
Brenda Wallace
0491820a35
Only show planted_at if it is set
2019-04-21 22:31:54 +12:00
Brenda Wallace
e327e6fd11
Merge pull request #1918 from Growstuff/dev
...
Release 51
2019-04-21 22:00:39 +12:00
Brenda Wallace
64877fe2ac
more tidy up of password reset form
2019-04-21 19:07:33 +12:00
Brenda Wallace
9dfe4d5b2d
More form tidy up
2019-04-21 15:24:45 +12:00
Brenda Wallace
ee03b57d89
Tidy up sign up form
2019-04-21 15:04:35 +12:00
Brenda Wallace
e6e50a3a42
Turn the plantings facts into cards with drop shadow
2019-04-21 14:02:04 +12:00
Brenda Wallace
730c2b79f7
Tidy up forgot password page
2019-04-21 14:01:45 +12:00
Brenda Wallace
ba3ee3a9f0
Tidy up login form
2019-04-21 13:55:45 +12:00
Brenda Wallace
f5f5ecdea7
Merge remote-tracking branch 'upstream/dev' into material-merge
...
Conflicts:
Gemfile.lock
app/assets/javascripts/application.js
app/assets/stylesheets/application.sass
app/assets/stylesheets/plantings.sass
app/views/crops/_thumbnail.html.haml
app/views/crops/show.html.haml
app/views/home/_members.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
app/views/plantings/_descendants.html.haml
app/views/plantings/show.html.haml
app/views/seeds/_thumbnail.html.haml
app/views/shared/_global_actions.html.haml
spec/models/crop_spec.rb
2019-04-21 11:27:27 +12:00
Awesome Code
78c8fdb743
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-04-20 09:44:42 +00:00
Awesome Code
4e07b0d620
Auto corrected by following Lint Ruby RSpec/LeadingSubject
2019-04-20 09:42:28 +00:00
Brenda Wallace
7b56c7a6ab
Merge branch 'dev' into UTFGardenNames
2019-04-20 20:17:52 +12:00
Brenda Wallace
5480fbb427
Merge pull request #1927 from Br3nda/reindex-rake
...
Reindex in batches
2019-04-20 20:16:49 +12:00
Brenda Wallace
1ebaf88092
Merge pull request #1889 from Br3nda/plantings-show
...
Remove table display on plantings#show, replace with boxes
2019-04-20 20:16:13 +12:00
Brenda Wallace
4312ef0047
FIX typo in view
2019-04-20 20:07:19 +12:00
Brenda Wallace
9ee3f514cd
Adding trailing comma
...
because codeclimate likes them
2019-04-20 20:01:34 +12:00
Brenda Wallace
3371353db8
Revert spec
...
less to update
2019-04-20 19:57:45 +12:00
Brenda Wallace
a2f9f2f6df
Replace (revert back) to simple image_tag in photos#show
...
so i don't need to update specs
2019-04-20 19:56:23 +12:00
Brenda Wallace
10a7689b05
Lint
2019-04-20 19:30:09 +12:00
Brenda Wallace
e2f3723777
Remove
2019-04-20 15:14:43 +12:00
Brenda Wallace
fa9205a94e
Remove ooops icons
2019-04-20 15:12:07 +12:00
Brenda Wallace
f86177e78f
lint
2019-04-20 15:10:08 +12:00
Brenda Wallace
33460bb171
Update spec
2019-04-20 15:09:24 +12:00
Brenda Wallace
e41bc6c6f1
8 members
2019-04-20 15:06:59 +12:00
Brenda Wallace
9c01ef94ac
Revert to previous code
...
So i don't need to update lotsa specs
2019-04-20 15:05:03 +12:00
Brenda Wallace
bf4c8a83e1
Update some planting show specs
2019-04-20 14:31:02 +12:00
Brenda Wallace
3e91d3e982
Merge branch 'dev' into plantings-show
2019-04-20 14:13:45 +12:00
dependabot[bot]
4842d31ea6
Merge pull request #1930 from Growstuff/dependabot/bundler/capybara-3.17.0
2019-04-20 01:33:14 +00:00
Brenda Wallace
570c53318d
Consistently using h3
2019-04-20 13:25:47 +12:00
Brenda Wallace
bf2bc6302a
Merge remote-tracking branch 'origin/plantings-show' into plantings-show
2019-04-20 13:22:21 +12:00
Brenda Wallace
b9267336b4
Merge branch 'dev' into plantings-show
2019-04-20 13:22:18 +12:00
Brenda Wallace
5484664716
Update spec
2019-04-20 12:16:58 +12:00
dependabot[bot]
41cee3b416
Bump capybara from 3.16.2 to 3.17.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.2 to 3.17.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.16.2...3.17.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-20 00:13:35 +00:00
dependabot[bot]
7b08ad6091
Merge pull request #1929 from Growstuff/dependabot/bundler/oj-3.7.12
2019-04-20 00:12:09 +00:00
Brenda Wallace
7c113f0e1c
Back to using thumbnails
2019-04-20 10:01:18 +12:00
Brenda Wallace
e899634696
lint
2019-04-20 09:54:21 +12:00
Brenda Wallace
7ea13c40ed
Isotope not needed for photo thumbnails
2019-04-20 09:54:02 +12:00
Brenda Wallace
01beb6ac7e
Merge remote-tracking branch 'origin/plantings-show' into plantings-show
2019-04-20 09:47:32 +12:00
Brenda Wallace
54146a3a9f
javascript lint
2019-04-20 09:47:19 +12:00
Brenda Wallace
9da4ccd6de
Merge branch 'dev' into plantings-show
2019-04-20 09:46:14 +12:00
dependabot[bot]
63788e4844
Bump oj from 3.7.11 to 3.7.12
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-19 21:45:27 +00:00
Brenda Wallace
91b7f58e9d
No longer have 100% on plantings that are finished
2019-04-20 09:45:06 +12:00
Brenda Wallace
a8009c49e8
Merge pull request #1931 from Growstuff/dependabot/bundler/searchkick-4.0.0
...
Bump searchkick from 3.1.2 to 4.0.0
2019-04-20 09:43:57 +12:00
Brenda Wallace
b71df87ac3
better use of fullsize crop image
2019-04-20 09:40:31 +12:00
Brenda Wallace
03bdb45b2d
Higher res photo, so it doesn't look pixelated
2019-04-20 09:36:18 +12:00
Brenda Wallace
94a2127c04
Tidy up small screen display
2019-04-20 09:35:59 +12:00
Brenda Wallace
837111f6dc
Checks we have a planted_from before we pluralize it
2019-04-20 09:27:07 +12:00
Brenda Wallace
c66ee04690
Only suggest recording harvests if they planting isn't finished
2019-04-20 09:19:13 +12:00
Brenda Wallace
31c628e950
Put back our own progress bar
2019-04-20 09:18:52 +12:00
Brenda Wallace
27d12bf07e
Isotope making nice layout on plantings#show
2019-04-20 09:09:07 +12:00
Brenda Wallace
89b4b3bee0
Use fas icons everywhere
2019-04-20 09:06:21 +12:00
Brenda Wallace
d4b487846d
Fixed space in image name
2019-04-20 07:27:06 +12:00
Brenda Wallace
4c0c9047f9
Merge branch 'dev' into reindex-rake
2019-04-19 20:50:32 +12:00
dependabot[bot]
b221b13856
Bump searchkick from 3.1.2 to 4.0.0
...
Bumps [searchkick](https://github.com/ankane/searchkick ) from 3.1.2 to 4.0.0.
- [Release notes](https://github.com/ankane/searchkick/releases )
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/searchkick/compare/v3.1.2...v4.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-19 07:22:15 +00:00
Brenda Wallace
1eea251f95
Merge branch 'dev' into plantings-show
2019-04-19 10:39:26 +12:00
Brenda Wallace
1ad88c91f4
Merge pull request #1858 from Br3nda/feature/memcachier
...
Remove staging file and re-instate memcachier
2019-04-19 10:37:56 +12:00
Brenda Wallace
d7e3d2e9db
Reindex in batches
2019-04-19 10:10:35 +12:00
Brenda Wallace
e81e4146e7
Merge remote-tracking branch 'origin/feature/memcachier' into feature/memcachier
2019-04-19 09:31:24 +12:00
Brenda Wallace
f60174a8b9
Merge remote-tracking branch 'upstream/dev' into feature/memcachier
2019-04-19 09:30:48 +12:00
Brenda Wallace
5908d9f9dd
Merge pull request #1901 from Br3nda/feature/searchkick
...
Swap elasticsearch gem for searchkick
2019-04-19 09:26:48 +12:00
Brenda Wallace
eb46b8113f
Merge remote-tracking branch 'upstream/dev' into plantings-show
2019-04-19 09:16:32 +12:00
Brenda Wallace
32a88b4482
Merge remote-tracking branch 'origin/plantings-show' into plantings-show
2019-04-19 09:16:01 +12:00
Brenda Wallace
a2e2362594
Linter fix ups
2019-04-19 09:15:41 +12:00
Brenda Wallace
6af61d0e86
Add someone else's plantings, to ensure test is valid
2019-04-19 09:11:56 +12:00
Brenda Wallace
909ce99ab8
Merge remote-tracking branch 'origin/feature/searchkick' into feature/searchkick
2019-04-19 09:06:55 +12:00
Brenda Wallace
3829db6bc2
Specs for biasing results from elastic search
2019-04-19 09:05:53 +12:00
pozorvlak
b3385663e8
Fix spelling of portobello
...
Co-Authored-By: Br3nda <brenda@wallace.net.nz >
2019-04-19 08:47:08 +12:00
Brenda Wallace
453242d04e
Merge remote-tracking branch 'upstream/dev' into feature/searchkick
2019-04-19 08:43:28 +12:00
Brenda Wallace
10006599eb
Merge branch 'dev' into feature/memcachier
2019-04-19 08:36:40 +12:00
pozorvlak
d7497e4342
Fixed comment
...
Co-Authored-By: Br3nda <brenda@wallace.net.nz >
2019-04-19 08:32:38 +12:00
Daniel O'Connor
1df411f162
Merge pull request #1926 from Growstuff/dependabot/bundler/selenium-webdriver-3.141.5926
...
Bump selenium-webdriver from 3.141.0 to 3.141.5926
2019-04-18 17:38:53 +09:30
Daniel O'Connor
8a14a7bc0d
Merge branch 'dev' into plantings-show
2019-04-18 17:33:30 +09:30
dependabot[bot]
fcd7ad8ed6
Bump selenium-webdriver from 3.141.0 to 3.141.5926
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.141.5926.
- [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[bot] <support@dependabot.com >
2019-04-18 07:20:57 +00:00
Brenda Wallace
85ba701045
Merge branch 'dev' into feature/searchkick
2019-04-17 12:35:09 +12:00
Brenda Wallace
3868201c73
Merge branch 'dev' into feature/memcachier
2019-04-17 10:38:10 +12:00
Awesome Code
8b0ecd568e
Auto corrected by following Lint Ruby RSpec/ImplicitSubject
2019-04-17 10:37:30 +12:00
Awesome Code
d0001691d5
Auto corrected by following Lint Ruby EmptyLine
2019-04-16 22:02:27 +12:00
Awesome Code
a4e398bb62
Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace
2019-04-16 09:55:51 +00:00
dependabot[bot]
deef508b9c
Bump cancancan from 3.0.0 to 3.0.1
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.0.0...3.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-16 20:43:16 +12:00
dependabot[bot]
b9a7c24da6
Bump sidekiq from 5.2.5 to 5.2.6
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.5 to 5.2.6.
- [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.5...v5.2.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-15 20:31:42 +12:00
Awesome Code
b9ca89b336
Auto corrected by following Lint Ruby RSpec/LetBeforeExamples
2019-04-14 19:38:16 +00:00
Awesome Code
ff3ea5c52f
Auto corrected by following Lint Ruby RSpec/HookArgument
2019-04-14 18:38:06 +00:00
Awesome Code
b84b1e89c1
Auto corrected by following Lint Ruby RSpec/ExampleWording
2019-04-14 18:37:52 +00:00
Awesome Code
e54c13afe3
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-04-14 18:36:34 +00:00
Awesome Code
50a2de3709
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-04-14 10:01:46 +00:00
Brenda Wallace
0ae33d9b03
Merge branch 'dev' into plantings-show
2019-04-13 21:02:56 +12:00
Brenda Wallace
9ed955d94c
Merge branch 'dev' into feature/searchkick
2019-04-13 13:09:31 +12:00
dependabot[bot]
5a8404e356
Bump leaflet-rails from 1.3.1 to 1.4.0
...
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails ) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases )
- [Changelog](https://github.com/axyjo/leaflet-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.3.1...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-13 13:08:59 +12:00
Brenda Wallace
9a17df1786
Merge branch 'dev' into feature/searchkick
2019-04-13 12:14:07 +12:00
Brenda Wallace
331a5c9a99
Merge branch 'master' into dev
2019-04-13 12:13:44 +12:00
dependabot[bot]
fb133b97b0
Bump capybara from 3.16.1 to 3.16.2 ( #1915 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.1 to 3.16.2.
- [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.16.1...3.16.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-13 12:12:35 +12:00
Brenda Wallace
b733a91064
Merge branch 'dev' into feature/searchkick
2019-04-13 12:10:40 +12:00
Brenda Wallace
cb680a5a0e
Auto corrected by following Lint Ruby Space ( #1917 )
2019-04-13 12:09:47 +12:00
Brenda Wallace
12d5632b63
Merge branch 'dev' into feature/searchkick
2019-04-13 12:06:37 +12:00
Brenda Wallace
3e01da0036
Remove waffle link, replace with github projects ( #1916 )
2019-04-13 12:05:58 +12:00
Brenda Wallace
e322c863b2
Removed unused arg to dbsearch
2019-04-13 10:20:33 +12:00
Brenda Wallace
e34a2d609b
Plurals spec only when we have elastic search
2019-04-13 10:17:21 +12:00
Brenda Wallace
174f54cb75
Linting
2019-04-13 10:13:36 +12:00
Brenda Wallace
0a0cd24e2a
Removed extra reindex
2019-04-13 10:06:44 +12:00
Brenda Wallace
347d751935
More plurals and misspellings in search specs
2019-04-13 10:03:18 +12:00
Brenda Wallace
026efe5d15
Rubocop lint
2019-04-13 09:50:49 +12:00
Brenda Wallace
fa1913c8b6
Split a method to reduce the complexity
2019-04-13 09:50:36 +12:00
Brenda Wallace
3ecb81300a
Re-index before we use autocomplete
...
so elastic search is in sync
2019-04-13 09:42:13 +12:00
Brenda Wallace
526450f0eb
Added search controller specs
2019-04-13 09:42:13 +12:00
Brenda Wallace
9683983f23
Merge branch 'dev' into feature/searchkick
2019-04-10 20:02:35 +12:00
Brenda Wallace
7ac410c499
varieties info on crops#show ( #1848 )
...
* Tests for crop.photos
* More info on a crop's varieties, and parent
* Update spec for new crop varieties display
* Add varieties div wrapper, so test can find the area of the page
2019-04-10 20:02:05 +12:00
Brenda Wallace
bd1a1c53f4
Removed unneeded rubocop disable
2019-04-08 21:59:44 +12:00
Brenda Wallace
ccb69c5f7d
Style/lint tidy up models
2019-04-08 21:59:26 +12:00
Brenda Wallace
e165c77d64
Force autocomplete to json format
2019-04-08 21:39:20 +12:00
Brenda Wallace
74e6a7cf2f
Rename @matches to @crops
2019-04-08 21:39:20 +12:00
Brenda Wallace
5b35e3fe95
remove an unnecesary index
2019-04-08 21:39:20 +12:00
Brenda Wallace
55e89e95fe
Fix a deprecation warning
2019-04-08 21:39:20 +12:00
Brenda Wallace
302e19776f
code style fix up
2019-04-08 21:39:20 +12:00
Brenda Wallace
01a3654d41
Working without elastic search too
2019-04-08 21:39:20 +12:00
Brenda Wallace
77d1fc7347
Move crop searching specs from the crop model to the crop search service
2019-04-08 21:39:20 +12:00
Brenda Wallace
ca743e421d
Add matching ES methods for when no elastic search configured
2019-04-08 21:39:20 +12:00
Brenda Wallace
f3ae1a8ec3
Fix dangerous sql warning
2019-04-08 21:39:20 +12:00
Brenda Wallace
789cffeca1
Eager loading
2019-04-08 21:39:20 +12:00
Brenda Wallace
e5c0edb0d0
Tidy up specs
2019-04-08 21:39:20 +12:00
Brenda Wallace
e465b6f19c
Elastic search spec helper
2019-04-08 21:39:20 +12:00
Brenda Wallace
150d44ad6f
named arguments for search
2019-04-08 21:39:20 +12:00
Brenda Wallace
ab57451b17
only reindex our one crop
2019-04-08 21:39:20 +12:00
Brenda Wallace
bd797a4d8e
Change call to reindex crops in specs
2019-04-08 21:39:20 +12:00
Brenda Wallace
c8716b6a1a
Add oj gem, to speed up json use
2019-04-08 21:39:20 +12:00
Brenda Wallace
370747390a
Add default pagination to crop search service
2019-04-08 21:39:20 +12:00
Brenda Wallace
61e0c2eb1d
Swap elasticssearch for searchkick
2019-04-08 21:39:20 +12:00
Brenda Wallace
ae4ad3a62a
Change to use searchkick
2019-04-08 21:39:20 +12:00
Brenda Wallace
f5c7f5e6d7
Merge pull request #1883 from Growstuff/dev
...
Production release
2019-04-08 15:07:13 +12:00
Brenda Wallace
a998a8b0f6
Update README.md
2019-04-08 14:50:29 +12:00
Brenda Wallace
ad90dd6dfa
Fixes wrong host name in emails
2019-04-08 14:23:34 +12:00
dependabot[bot]
a48acc0253
Bump rubocop from 0.66.0 to 0.67.2
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.66.0 to 0.67.2.
- [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.66.0...v0.67.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-08 14:16:02 +12:00
dependabot[bot]
7ca263aa64
Bump capybara from 3.16.0 to 3.16.1
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.16.0 to 3.16.1.
- [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.16.0...3.16.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-06 09:18:12 +13:00
dependabot[bot]
d8b70a927a
Bump js-routes from 1.4.5 to 1.4.6
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/railsware/js-routes/releases )
- [Changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md )
- [Commits](https://github.com/railsware/js-routes/compare/v1.4.5...v1.4.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-05 22:41:23 +13:00
dependabot[bot]
7c6a76b41c
Bump cancancan from 2.3.0 to 3.0.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 2.3.0 to 3.0.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.3.0...3.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-05 10:14:18 +13:00
dependabot[bot]
b43b8f5868
Bump js-routes from 1.4.4 to 1.4.5
...
Bumps [js-routes](https://github.com/railsware/js-routes ) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/railsware/js-routes/releases )
- [Changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md )
- [Commits](https://github.com/railsware/js-routes/compare/v1.4.4...v1.4.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-03 03:52:09 +13:00
Brenda Wallace
c89682792c
Merge branch 'dev' into feature/memcachier
2019-04-02 22:22:00 +13:00
Awesome Code
a2fd0f0ae2
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-04-01 10:15:18 +00:00
Brenda Wallace
6ef3b02764
Remove commented out code
2019-04-01 23:02:50 +13:00
Brenda Wallace
495002d8b9
Change "background" to "before"
2019-04-01 23:02:50 +13:00
Awesome Code
4ba5319ba8
Auto corrected by following Lint Ruby Capybara/FeatureMethods
2019-04-01 23:02:50 +13:00
dependabot[bot]
71ab33d20c
Bump i18n-tasks from 0.9.28 to 0.9.29
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.28 to 0.9.29.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.28...v0.9.29 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-01 22:26:08 +13:00
Brenda Wallace
ff22adfd76
Merge branch 'dev' into feature/memcachier
2019-03-31 10:21:27 +13:00
Brenda Wallace
a62c268dda
Merge branch 'dev' into plantings-show
2019-03-31 10:20:57 +13:00
Awesome Code
6e10dc2a2b
Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace
2019-03-31 10:20:08 +13:00
Awesome Code
4dcb420534
Auto corrected by following Lint Ruby RSpec/HookArgument
2019-03-31 10:19:51 +13:00
Awesome Code
fb243c1f8d
Auto corrected by following Lint Ruby RSpec/ExpectChange
2019-03-31 09:24:13 +13:00
Awesome Code
837ae8cb8e
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-03-30 18:09:37 +13:00
Awesome Code
f48e131e14
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-30 18:07:30 +13:00
Brenda Wallace
5e51c4ab9b
Merge branch 'dev' into plantings-show
2019-03-30 18:03:31 +13:00
Brenda Wallace
a58ce0f6a2
Tidy up mobile
2019-03-30 18:01:55 +13:00
Brenda Wallace
2e91a3f381
Merge branch 'dev' into feature/memcachier
2019-03-30 16:52:50 +13:00
dependabot[bot]
30b5c0ce9d
Bump capybara from 3.15.0 to 3.16.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.15.0 to 3.16.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.15.0...3.16.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-30 10:11:58 +13:00
Brenda Wallace
6cf60afec4
Don't check for markasinished on plantings#index
2019-03-29 15:49:11 +13:00
Brenda Wallace
4d95130216
Move phtos to a gallery
2019-03-29 15:48:57 +13:00
Brenda Wallace
43bb606a2b
Cleaning up small screen presentation
2019-03-29 15:48:47 +13:00
Brenda Wallace
830b554dc9
Test updates
2019-03-29 11:28:17 +13:00
Brenda Wallace
e4d4cdc3fa
Fix up seed description helper
2019-03-29 10:45:51 +13:00
Brenda Wallace
cb91b43d25
Fix deprecation warning
2019-03-29 10:29:05 +13:00
Brenda Wallace
bab9c01bf5
Updating tests
2019-03-29 10:25:30 +13:00
Brenda Wallace
9be4c4179f
Updating specs
2019-03-28 15:49:39 +13:00
Brenda Wallace
5722859a24
Move notes higher
2019-03-28 10:01:05 +13:00
Brenda Wallace
2bc12570c4
Consistent display of seeds/harvests
2019-03-27 22:38:28 +13:00
Brenda Wallace
0c9702e1a4
Move photo query, so we use eager loading
2019-03-27 22:28:06 +13:00
Brenda Wallace
562a7b1a10
Merge remote-tracking branch 'origin/plantings-show' into plantings-show
2019-03-27 21:19:43 +13:00
Brenda Wallace
626d5f8d7c
Move harvest and seeds to the right on plantings#show
2019-03-27 21:19:35 +13:00
Brenda Wallace
d35dfeea21
Show date taken, not data the database record was created
2019-03-27 21:19:22 +13:00
Brenda Wallace
984da54534
Merge branch 'dev' into plantings-show
2019-03-27 21:13:28 +13:00
Brenda Wallace
3ced3da682
Merge branch 'dev' into feature/memcachier
2019-03-27 21:06:23 +13:00
Brenda Wallace
9c231703ab
Merge pull request #1888 from Growstuff/dependabot/bundler/devise-4.6.2
...
Bump devise from 4.6.1 to 4.6.2
2019-03-27 21:06:00 +13:00
Brenda Wallace
e7b0b6f18e
Remove table display on plantings#show, replace with boxes
2019-03-27 21:04:56 +13:00
dependabot[bot]
2126863632
Bump devise from 4.6.1 to 4.6.2
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.6.1 to 4.6.2.
- [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.1...v4.6.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-27 07:46:45 +00:00
dependabot[bot]
566308a49d
Merge pull request #1887 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.6
2019-03-26 10:00:26 +00:00
Brenda Wallace
1e0f308db2
Merge branch 'dev' into UTFGardenNames
2019-03-26 22:43:56 +13:00
Brenda Wallace
0717e0a00d
Merge branch 'dev' into feature/memcachier
2019-03-26 22:42:45 +13:00
dependabot[bot]
9222782808
Bump jsonapi-resources from 0.9.5 to 0.9.6
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.5 to 0.9.6.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.5...v0.9.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-26 09:39:24 +00:00
Brenda Wallace
dcbc0ecdff
Merge branch 'master' into dev
2019-03-26 22:36:54 +13:00
Brenda Wallace
c059c46833
Merge pull request #1747 from brandonbaker40/bb-track-types-of-gardens
...
tracks types of gardens
2019-03-26 22:34:48 +13:00
Brenda Wallace
8d579a4616
Gardens have descriptions
2019-03-26 22:27:10 +13:00
Brenda Wallace
1e240cf4b8
replace a rubocop ignore
2019-03-26 22:12:09 +13:00
Brenda Wallace
2d2304d8c0
Rubocop lint
2019-03-26 22:07:54 +13:00
Brenda Wallace
5d32bc8010
don't allow spaces in slug
2019-03-26 22:07:47 +13:00
Brenda Wallace
e369b93384
Pass params to garden spec - for rails 5
2019-03-26 22:07:35 +13:00
Brenda Wallace
09dc928250
Update model specs to not use should
2019-03-26 22:07:07 +13:00
Brenda Wallace
95d2aa221f
Removed plot spec
2019-03-26 22:06:53 +13:00
Brenda Wallace
55f6636da5
change "required" to "optional"
2019-03-26 22:06:41 +13:00
Brenda Wallace
8a900b2e87
Update garden_Types controller spec for rails 5
2019-03-26 21:48:38 +13:00
Brenda Wallace
e5ee89c865
garden_types.description becomes garden_type.name
2019-03-26 21:43:34 +13:00
Brenda Wallace
48022fb541
nullify gardens.garden_type when garden_type is destroyed
2019-03-26 21:18:14 +13:00
Brenda Wallace
1fe5f67aa1
Update garden_type model spec
2019-03-26 21:14:31 +13:00
Brenda Wallace
63edfa36df
Gardens have garden_Types in specs
2019-03-26 21:13:12 +13:00
Brenda Wallace
c71da41d43
Update controller spec
2019-03-26 21:12:20 +13:00
Brenda Wallace
cc88f5c6c7
Update subtitler
2019-03-26 21:11:25 +13:00
Brenda Wallace
629ffa1982
Update translations
2019-03-26 21:10:40 +13:00
Brenda Wallace
721a8694a0
Removing plots
2019-03-26 21:09:26 +13:00
Brenda Wallace
b51072fd00
Update test from containers to garden_types
2019-03-26 21:06:22 +13:00
Brenda Wallace
b446e44ac0
Moved garden types to admin menu
2019-03-26 21:02:48 +13:00
Brenda Wallace
5395aefa66
Rename containers to garden types
2019-03-26 20:56:11 +13:00
Brenda Wallace
02e0dd091a
Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens
2019-03-26 19:35:16 +13:00
Brenda Wallace
de2fa81aae
Remove staging env from bundle
2019-03-26 15:57:30 +13:00
Brenda Wallace
8e8c9d179b
Added growstuff prefix to env variables
2019-03-26 15:57:29 +13:00
Brenda Wallace
607f0e3887
Rename to mapbox map id
2019-03-26 15:57:29 +13:00
Brenda Wallace
875fa49d44
Remove distinct staging env file
2019-03-26 15:57:29 +13:00
Brenda Wallace
ba27e14226
Move mapbox config to env
2019-03-26 15:57:29 +13:00
Brenda Wallace
59b3a68fc3
Configure memcachier for production
2019-03-26 15:57:29 +13:00
dependabot[bot]
21209ca796
Bump font-awesome-sass from 5.8.0 to 5.8.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.8.0 to 5.8.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.8.0...5.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-26 12:15:31 +13:00
dependabot[bot]
0f548f773a
Bump font-awesome-sass from 5.6.1 to 5.8.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.6.1 to 5.8.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.6.1...5.8.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-24 22:43:13 +13:00
pozorvlak
aae1b57136
Merge pull request #1878 from Br3nda/setup/scout
...
Setup scout, to analyse where our high memory usage is on production
2019-03-22 12:38:43 +00:00
pozorvlak
9a24f29cbb
Merge branch 'dev' into setup/scout
2019-03-22 12:24:29 +00:00
dependabot[bot]
03e2fc6350
Merge pull request #1874 from Growstuff/dependabot/bundler/will_paginate-3.1.7
2019-03-22 08:55:01 +00:00
dependabot[bot]
2483d30f98
Bump will_paginate from 3.1.6 to 3.1.7
...
Bumps [will_paginate](https://github.com/mislav/will_paginate ) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mislav/will_paginate/releases )
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.6...v3.1.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-22 08:38:41 +00:00
dependabot[bot]
a990b17dbb
Merge pull request #1881 from Growstuff/dependabot/bundler/puma-3.12.1
2019-03-22 08:36:47 +00:00
dependabot[bot]
5d019cde37
Bump puma from 3.12.0 to 3.12.1
...
Bumps [puma](https://github.com/puma/puma ) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v3.12.0...v3.12.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-22 07:56:04 +00:00
Awesome Code
e10c641702
Auto corrected by following Lint Ruby Layout/AlignHash
2019-03-22 07:55:05 +00:00
dependabot[bot]
c04fba2cd6
Merge pull request #1880 from Growstuff/dependabot/bundler/capybara-3.15.0
2019-03-22 07:53:23 +00:00
Brenda Wallace
1389baec98
Merge branch 'dev' into setup/scout
2019-03-22 20:45:15 +13:00
dependabot[bot]
5607ffa638
Bump capybara from 3.14.0 to 3.15.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.14.0 to 3.15.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.14.0...3.15.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-22 07:44:56 +00:00
dependabot[bot]
d5baaa2185
Merge pull request #1873 from Growstuff/dependabot/bundler/newrelic_rpm-6.2.0.354
2019-03-22 07:09:24 +00:00
dependabot[bot]
afc769aa5f
Bump rubocop from 0.65.0 to 0.66.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.65.0 to 0.66.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.65.0...v0.66.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
45f22c1b45
Bump responders from 2.4.0 to 2.4.1
...
Bumps [responders](https://github.com/plataformatec/responders ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/plataformatec/responders/releases )
- [Changelog](https://github.com/plataformatec/responders/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/responders/compare/v2.4.0...v2.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
Brenda Wallace
62f2fa134d
Set planting.finished as a boolean
2019-03-20 15:01:33 +13:00
Brenda Wallace
6559645265
update spec
2019-03-20 15:01:33 +13:00
Brenda Wallace
d07c97b6a6
Add filters for the members api
2019-03-20 15:01:33 +13:00
dependabot[bot]
0f1c6ae3b6
Bump byebug from 11.0.0 to 11.0.1
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.0.0 to 11.0.1.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.0...v11.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
Awesome Code
fe6f6046e4
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-20 15:01:33 +13:00
dependabot[bot]
4d062964b6
Bump comfortable_mexican_sofa from 2.0.17 to 2.0.18
...
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa ) from 2.0.17 to 2.0.18.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases )
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.17...v2.0.18 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
f52daa12c5
Bump dalli from 2.7.9 to 2.7.10
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.9...v2.7.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
Awesome Code
f41ecbc68b
Auto corrected by following Lint Ruby EmptyLine
2019-03-20 15:01:33 +13:00
Awesome Code
50ade63429
Auto corrected by following Lint Ruby RSpec/LeadingSubject
2019-03-20 15:01:33 +13:00
dependabot[bot]
d8be8d0c48
Bump unicorn from 5.4.1 to 5.5.0
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.4.1 to 5.5.0.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
89e75ffbee
Bump flickraw from 0.9.9 to 0.9.10
...
Bumps [flickraw](https://github.com/hanklords/flickraw ) from 0.9.9 to 0.9.10.
- [Release notes](https://github.com/hanklords/flickraw/releases )
- [Commits](https://github.com/hanklords/flickraw/compare/V0.9.9...V0.9.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
Awesome Code
e7713ab24b
Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace
2019-03-20 15:01:33 +13:00
Awesome Code
f488e0aeb1
Auto corrected by following Lint Ruby RSpec/ExpectChange
2019-03-20 15:01:33 +13:00
dependabot[bot]
fca035e537
Bump rubocop from 0.64.0 to 0.65.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.64.0 to 0.65.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.64.0...v0.65.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
Awesome Code
5145ead93b
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-20 15:01:33 +13:00
Awesome Code
da997ae538
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-03-20 15:01:33 +13:00
dependabot[bot]
cbf4e0a61a
Bump faker from 1.9.2 to 1.9.3
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.2...v1.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
b49a59bf72
Bump haml-rails from 1.0.0 to 2.0.0
...
Bumps [haml-rails](https://github.com/indirect/haml-rails ) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/indirect/haml-rails/releases )
- [Commits](https://github.com/indirect/haml-rails/compare/v1.0.0...v2.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
ea5b622225
Bump byebug from 10.0.2 to 11.0.0
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 10.0.2 to 11.0.0.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v10.0.2...v11.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
da32a2caf1
Bump newrelic_rpm from 6.0.0.351 to 6.1.0.352
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.0.0.351 to 6.1.0.352.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/compare/6.0.0.351...6.1.0.352 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
dependabot[bot]
9a24bb2fc3
Bump capybara from 3.13.2 to 3.14.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.13.2 to 3.14.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.13.2...3.14.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 15:01:33 +13:00
Brenda Wallace
6cebb4041c
Merge branch 'dev' into setup/scout
2019-03-20 11:28:01 +13:00
dependabot[bot]
265e8ef59f
Bump newrelic_rpm from 6.1.0.352 to 6.2.0.354
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.1.0.352 to 6.2.0.354.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/compare/6.1.0.352...6.2.0.354 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-19 22:25:28 +00:00
dependabot[bot]
64ef425867
Merge pull request #1875 from Growstuff/dependabot/bundler/rubocop-0.66.0
2019-03-19 22:22:56 +00:00
dependabot[bot]
1e3a8119ba
Bump rubocop from 0.65.0 to 0.66.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.65.0 to 0.66.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.65.0...v0.66.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-19 21:51:56 +00:00
dependabot[bot]
65f19c1818
Merge pull request #1801 from Growstuff/dependabot/bundler/responders-2.4.1
2019-03-19 21:49:17 +00:00
dependabot[bot]
2b36609036
Bump responders from 2.4.0 to 2.4.1
...
Bumps [responders](https://github.com/plataformatec/responders ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/plataformatec/responders/releases )
- [Changelog](https://github.com/plataformatec/responders/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/responders/compare/v2.4.0...v2.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-19 21:39:40 +00:00
Brenda Wallace
2690da260d
add scout to heroku addons
2019-03-20 10:02:21 +13:00
Brenda Wallace
19faf66767
Add the scout gem to production
2019-03-20 10:01:57 +13:00
Brenda Wallace
db5bdab055
Set planting.finished as a boolean
2019-03-20 09:43:01 +13:00
Brenda Wallace
77f936cb0f
update spec
2019-03-20 09:43:01 +13:00
Brenda Wallace
37693e8d12
Add filters for the members api
2019-03-20 09:43:01 +13:00
dependabot[bot]
8a52025f03
Merge pull request #1876 from Growstuff/dependabot/bundler/byebug-11.0.1
2019-03-19 20:37:08 +00:00
dependabot[bot]
6c180a0293
Bump byebug from 11.0.0 to 11.0.1
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 11.0.0 to 11.0.1.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.0...v11.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-19 20:28:24 +00:00
Awesome Code
24fb818b2b
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-19 07:22:50 +00:00
dependabot[bot]
150e363055
Bump comfortable_mexican_sofa from 2.0.17 to 2.0.18
...
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa ) from 2.0.17 to 2.0.18.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases )
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.17...v2.0.18 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-19 12:42:49 +13:00
dependabot[bot]
7c3e77fa27
Bump dalli from 2.7.9 to 2.7.10
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.9...v2.7.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-19 00:13:09 +13:00
Awesome Code
2a12d8966e
Auto corrected by following Lint Ruby EmptyLine
2019-03-14 23:17:55 +13:00
Awesome Code
5ca65840a8
Auto corrected by following Lint Ruby RSpec/LeadingSubject
2019-03-14 10:08:50 +00:00
dependabot[bot]
f079159e8f
Bump unicorn from 5.4.1 to 5.5.0
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.4.1 to 5.5.0.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-14 23:05:51 +13:00
dependabot[bot]
80a919c4f9
Bump flickraw from 0.9.9 to 0.9.10
...
Bumps [flickraw](https://github.com/hanklords/flickraw ) from 0.9.9 to 0.9.10.
- [Release notes](https://github.com/hanklords/flickraw/releases )
- [Commits](https://github.com/hanklords/flickraw/compare/V0.9.9...V0.9.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-14 21:36:17 +13:00
Brenda Wallace
63aadfcd98
Merge branch 'master' into dev
2019-03-14 13:29:34 +13:00
Brenda Wallace
7709bf0c3f
Patch Rails
2019-03-14 13:28:37 +13:00
Awesome Code
ad470ede1d
Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace
2019-03-13 17:23:33 +13:00
Awesome Code
cb9d05e355
Auto corrected by following Lint Ruby RSpec/ExpectChange
2019-03-13 16:51:13 +13:00
dependabot[bot]
2d7af01deb
Bump rubocop from 0.64.0 to 0.65.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.64.0 to 0.65.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.64.0...v0.65.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-13 13:56:17 +13:00
Awesome Code
3bc1bba448
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-03-12 22:51:12 +00:00
Awesome Code
f90cc792bb
Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace
2019-03-13 11:42:27 +13:00
dependabot[bot]
6d071665af
Merge pull request #1845 from Growstuff/dependabot/bundler/faker-1.9.3
2019-03-12 08:56:06 +00:00
dependabot[bot]
300c51f0f6
Bump faker from 1.9.2 to 1.9.3
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.2...v1.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-12 08:23:58 +00:00
dependabot[bot]
7b162e6799
Bump haml-rails from 1.0.0 to 2.0.0
...
Bumps [haml-rails](https://github.com/indirect/haml-rails ) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/indirect/haml-rails/releases )
- [Commits](https://github.com/indirect/haml-rails/compare/v1.0.0...v2.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-12 21:20:33 +13:00
dependabot[bot]
ff3d34a40b
Bump byebug from 10.0.2 to 11.0.0
...
Bumps [byebug](https://github.com/deivid-rodriguez/byebug ) from 10.0.2 to 11.0.0.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases )
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md )
- [Commits](https://github.com/deivid-rodriguez/byebug/compare/v10.0.2...v11.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-12 00:07:49 +13:00
dependabot[bot]
2105667bca
Bump newrelic_rpm from 6.0.0.351 to 6.1.0.352
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 6.0.0.351 to 6.1.0.352.
- [Release notes](https://github.com/newrelic/rpm/releases )
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md )
- [Commits](https://github.com/newrelic/rpm/compare/6.0.0.351...6.1.0.352 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-11 23:15:11 +13:00
Brenda Wallace
5ab3d85d32
Merge remote-tracking branch 'upstream/master' into material
2019-03-10 16:12:52 +13:00
dependabot[bot]
a631c934d3
Bump capybara from 3.13.2 to 3.14.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.13.2 to 3.14.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.13.2...3.14.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-06 17:46:09 +13:00
Brenda Wallace
200aa9bd5f
Merge pull request #1822 from Growstuff/dev
...
Release 53
2019-02-22 14:25:35 +13:00
Brenda Wallace
3ed173ebcd
Material design changes
2019-02-17 21:33:36 +13:00
Brenda Wallace
c9940f2c94
Merge pull request #1851 from Growstuff/awesomecode-lint-ruby-space-29410
...
Auto corrected by following Lint Ruby Space
2019-02-17 13:58:38 +13:00
Awesome Code
b7cfed1246
Auto corrected by following Lint Ruby Space
2019-02-16 13:42:20 +00:00
pozorvlak
a8c2c2208a
Merge pull request #1775 from Br3nda/photos/seeds
...
Add photos of seeds
2019-02-16 13:39:46 +00:00
pozorvlak
15bffc1031
Merge branch 'dev' into photos/seeds
2019-02-16 11:18:43 +00:00
Brenda Wallace
1c366e8508
Merge pull request #1849 from Growstuff/dependabot/bundler/better_errors-2.5.1
...
Bump better_errors from 2.5.0 to 2.5.1
2019-02-16 14:42:37 +13:00
Brenda Wallace
0c868d3edb
Merge branch 'dev' into photos/seeds
2019-02-16 12:37:53 +13:00
dependabot[bot]
91b590aa58
Bump better_errors from 2.5.0 to 2.5.1
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.0...v2.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-15 23:32:03 +00:00
pozorvlak
885c86ecf2
Merge pull request #1847 from Br3nda/fix/crop-delete
...
Fixing crop deleting and adding tests
2019-02-15 23:29:52 +00:00
Brenda Wallace
fe74e41709
Merge branch 'dev' into photos/seeds
2019-02-15 09:21:35 +13:00
Brenda Wallace
f0321b4fcb
Merge branch 'dev' into fix/crop-delete
2019-02-15 09:16:01 +13:00
Brenda Wallace
3967e68038
More info on a crop's varieties, and parent
2019-02-15 09:13:08 +13:00
Brenda Wallace
cc218c367c
Merge remote-tracking branch 'origin/photos/seeds' into photos/seeds
2019-02-15 08:48:51 +13:00
Brenda Wallace
467c92bd2c
Merge pull request #1846 from Growstuff/dependabot/bundler/bootstrap-sass-3.4.1
...
Bump bootstrap-sass from 3.4.0 to 3.4.1
2019-02-15 08:46:38 +13:00
Brenda Wallace
d3a542727c
Fixing crop deleting and adding tests
2019-02-15 08:45:18 +13:00
dependabot[bot]
7090f45285
Bump bootstrap-sass from 3.4.0 to 3.4.1
...
Bumps [bootstrap-sass](https://github.com/twbs/bootstrap-sass ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/twbs/bootstrap-sass/releases )
- [Changelog](https://github.com/twbs/bootstrap-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/twbs/bootstrap-sass/compare/v3.4.0...v3.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-14 07:24:59 +00:00
Brenda Wallace
1441850cd6
Merge branch 'dev' into photos/seeds
2019-02-13 13:59:14 +13:00
Brenda Wallace
c840b1bb16
Merge pull request #1829 from Br3nda/crops-show
...
Crops show
2019-02-13 09:26:21 +13:00
Brenda Wallace
3722672869
Merge branch 'dev' into photos/seeds
2019-02-13 09:06:42 +13:00
Brenda Wallace
fa00262f80
Merge branch 'dev' into crops-show
2019-02-13 09:04:51 +13:00
dependabot[bot]
c0dd3534d3
Merge pull request #1843 from Growstuff/dependabot/bundler/faker-1.9.2
2019-02-12 11:35:32 +00:00
dependabot[bot]
d0e46363b6
Bump faker from 1.9.1 to 1.9.2
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.1...v1.9.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 11:04:47 +00:00
dependabot[bot]
77f7c424d8
Merge pull request #1800 from Growstuff/dependabot/bundler/rspec-rails-3.8.2
2019-02-12 11:01:58 +00:00
dependabot[bot]
1d96b11c79
Bump rspec-rails from 3.8.1 to 3.8.2
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 10:42:40 +00:00
dependabot[bot]
9fe660ab46
Merge pull request #1841 from Growstuff/dependabot/bundler/rubocop-0.64.0
2019-02-12 10:40:04 +00:00
dependabot[bot]
e9c2454799
Bump rubocop from 0.61.1 to 0.64.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.61.1 to 0.64.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.61.1...v0.64.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 10:22:19 +00:00
Cesy
f1eeeb6d6a
Merge pull request #1804 from Br3nda/garden-overview
...
Tidy up display on gardens#index
2019-02-12 10:19:19 +00:00
Brenda Wallace
bd86f7372e
Merge branch 'dev' into garden-overview
2019-02-12 21:50:51 +13:00
Brenda Wallace
f57a423c29
Merge branch 'dev' into crops-show
2019-02-12 21:50:05 +13:00
Brenda Wallace
5930334bd6
Merge branch 'dev' into photos/seeds
2019-02-12 21:49:43 +13:00
ImgBotApp
94403ab5a6
[ImgBot] Optimize images
...
*Total -- 299.13kb -> 245.06kb (18.08%)
/app/assets/images/sunniness_shade.png -- 9.28kb -> 4.27kb (53.98%)
/app/assets/images/blog_32.png -- 5.04kb -> 2.45kb (51.35%)
/app/assets/images/sunniness_semi-shade.png -- 14.52kb -> 7.43kb (48.84%)
/app/assets/images/sunniness_not specified.png -- 15.76kb -> 8.17kb (48.16%)
/app/assets/images/sunniness_sun.png -- 5.77kb -> 3.59kb (37.69%)
/app/assets/images/placeholder_150.png -- 2.44kb -> 1.52kb (37.62%)
/app/assets/images/growstuff-brand.png -- 8.05kb -> 6.45kb (19.94%)
/app/assets/images/flickr_32.png -- 2.47kb -> 2.04kb (17.37%)
/app/assets/images/location-not-set.en.png -- 22.23kb -> 19.55kb (12.04%)
/app/assets/images/facebook-login-splash.png -- 176.17kb -> 155.21kb (11.9%)
/app/assets/images/email_32.png -- 1.07kb -> 0.94kb (11.55%)
/app/assets/images/facebook-thumbnail.png -- 19.48kb -> 17.48kb (10.26%)
/app/assets/images/growstuff-apple-touch-icon-precomposed.png -- 10.37kb -> 9.48kb (8.62%)
/app/assets/images/rails.png -- 6.49kb -> 6.47kb (0.33%)
2019-02-12 21:49:11 +13:00
dependabot[bot]
f37a3669b1
Bump devise from 4.6.0 to 4.6.1
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.6.0 to 4.6.1.
- [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.0...v4.6.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 21:30:47 +13:00
Brenda Wallace
c298a1763f
Merge branch 'dev' into photos/seeds
2019-02-12 16:21:51 +13:00
Brenda Wallace
80f0f41026
removed commented out code
2019-02-12 11:51:16 +13:00
Brenda Wallace
56168576f1
Merge branch 'dev' into garden-overview
2019-02-12 11:49:29 +13:00
Brenda Wallace
73234a1dc3
Merge remote-tracking branch 'origin/crops-show' into crops-show
2019-02-12 11:42:08 +13:00
Brenda Wallace
1dfad812a1
Javascript lint
2019-02-12 11:41:40 +13:00
Brenda Wallace
7a4121bf3f
Added missing semicolon
2019-02-12 11:41:33 +13:00
Brenda Wallace
aa21b000d7
Merge branch 'dev' into crops-show
2019-02-12 11:38:41 +13:00
dependabot[bot]
c8b18cd9b2
Merge pull request #1809 from Growstuff/dependabot/bundler/capybara-3.13.2
2019-02-11 22:31:15 +00:00
Brenda Wallace
2f5de1f98e
Merge branch 'dev' into garden-overview
2019-02-12 11:28:45 +13:00
dependabot[bot]
0a1206b692
Bump capybara from 3.13.0 to 3.13.2
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.13.0 to 3.13.2.
- [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.13.0...3.13.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-11 10:45:16 +00:00
pozorvlak
378dd52b1f
Merge pull request #1818 from Br3nda/contributors-bots
...
Fixes checking for github bots in contributors
2019-02-11 10:38:47 +00:00
pozorvlak
f83b8e71f1
Merge branch 'dev' into contributors-bots
2019-02-11 10:17:09 +00:00
Awesome Code
3efc0caaf7
Auto corrected by following Lint Ruby EmptyLine
2019-02-11 11:02:33 +13:00
Awesome Code
689baa85a3
Auto corrected by following Lint Ruby RSpec/ExampleWording
2019-02-11 10:17:54 +13:00
Awesome Code
29ee362bfa
Auto corrected by following Lint Ruby Space
2019-02-11 09:28:43 +13:00
Awesome Code
490db7b342
Auto corrected by following Lint Ruby RSpec/HookArgument
2019-02-11 09:00:34 +13:00
Brenda Wallace
463e0d919c
Merge branch 'dev' into crops-show
2019-02-11 08:17:44 +13:00
Brenda Wallace
a320826abd
Merge pull request #1834 from Growstuff/awesomecode-lint-ruby-rspec-returnfromstub-28915
...
Auto corrected by following Lint Ruby RSpec/ReturnFromStub
2019-02-11 08:02:53 +13:00
Brenda Wallace
db58abc520
Merge branch 'dev' into awesomecode-lint-ruby-rspec-returnfromstub-28915
2019-02-11 07:37:21 +13:00
Brenda Wallace
37b1c17ca9
Merge pull request #1835 from Growstuff/awesomecode-lint-ruby-rspec-sharedcontext-28915
...
Auto corrected by following Lint Ruby RSpec/SharedContext
2019-02-11 07:36:55 +13:00
Brenda Wallace
380b0ffa6c
Merge branch 'dev' into awesomecode-lint-ruby-rspec-sharedcontext-28915
2019-02-11 00:24:20 +13:00
Brenda Wallace
4be359c2b9
Merge branch 'dev' into crops-show
2019-02-10 22:24:40 +13:00
Awesome Code
bbd34c5e7b
Auto corrected by following Lint Ruby RSpec/SharedContext
2019-02-10 09:24:19 +00:00
Awesome Code
54798190a7
Auto corrected by following Lint Ruby RSpec/ReturnFromStub
2019-02-10 09:24:07 +00:00
Awesome Code
49eed9b208
Auto corrected by following Lint Ruby RSpec/LetBeforeExamples
2019-02-10 09:24:00 +00:00
Awesome Code
e32a8bd6ac
Auto corrected by following Lint Ruby RSpec/HooksBeforeExamples
2019-02-10 09:23:43 +00:00
Brenda Wallace
0507f337aa
Merge branch 'dev' into crops-show
2019-02-10 21:52:51 +13:00
Brenda Wallace
fb6a270fa6
Tidy up crop predictions display
2019-02-10 21:51:06 +13:00
Brenda Wallace
e9d81f7f32
Merge branch 'dev' into garden-overview
2019-02-09 19:13:46 +13:00
Brenda Wallace
29da3f7ff1
Merge branch 'dev' into contributors-bots
2019-02-09 19:13:26 +13:00
Brenda Wallace
3f68131ed1
Merge pull request #1820 from Growstuff/dependabot/bundler/devise-4.6.0
...
Bump devise from 4.5.0 to 4.6.0
2019-02-09 19:13:05 +13:00
Brenda Wallace
572af9d135
Merge branch 'dev' into photos/seeds
2019-02-09 17:00:58 +13:00
Brenda Wallace
9be4bf2685
Merge branch 'dev' into garden-overview
2019-02-09 17:00:07 +13:00
Brenda Wallace
68d9b9c50c
Merge branch 'dev' into contributors-bots
2019-02-09 16:59:45 +13:00
Awesome Code
284bb81bbf
Auto corrected by following Lint Ruby RSpecEmptyLine
2019-02-09 03:05:40 +00:00
Brenda Wallace
93835b3ee6
Javascript lint
2019-02-09 15:21:30 +13:00
Brenda Wallace
67b23d8e2c
Merge branch 'dev' into garden-overview
2019-02-09 15:17:09 +13:00
Brenda Wallace
63b8554435
Added missing semicolon
2019-02-09 15:16:53 +13:00
dependabot[bot]
228253113f
Bump devise from 4.5.0 to 4.6.0
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.5.0 to 4.6.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.5.0...v4.6.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-09 01:28:51 +00:00
Brenda Wallace
6902f30bb8
Merge branch 'dev' into contributors-bots
2019-02-09 14:26:53 +13:00
Brenda Wallace
ac577486e1
Merge branch 'master' into dev
2019-02-09 14:26:26 +13:00
Brenda Wallace
6e1972717f
Merge pull request #1826 from Growstuff/awesomecode-lint-ruby-emptyline-28892
...
Auto corrected by following Lint Ruby EmptyLine
2019-02-09 14:26:11 +13:00
Brenda Wallace
18d7ae2953
Further tidy up of the planting quick action buttons
2019-02-09 14:24:51 +13:00
Brenda Wallace
95db0f7297
Shortened the text on the badges
2019-02-09 14:18:15 +13:00
Brenda Wallace
ec4b443d8c
Tool tips
2019-02-09 14:13:07 +13:00
Brenda Wallace
50751611fa
Tidy up where badges appear
2019-02-09 14:12:45 +13:00
Brenda Wallace
fc95a3c4e1
Moved planting css to own file
2019-02-09 14:12:30 +13:00
Brenda Wallace
dfe67d5308
Move thumbnail title up a bit
2019-02-09 12:13:22 +13:00
Brenda Wallace
aa8ed5bb3a
Fix up translation on badges
2019-02-09 11:47:13 +13:00
Brenda Wallace
fcd147412c
Tidy up display on gardens#index
2019-02-09 11:47:13 +13:00
Brenda Wallace
61548e02d1
Merge branch 'dev' into contributors-bots
2019-02-09 11:03:36 +13:00
Awesome Code
404fafd700
Auto corrected by following Lint Ruby EmptyLine
2019-02-08 21:10:48 +00:00
Awesome Code
39a7de8754
Auto corrected by following Lint Ruby EmptyLine
2019-02-08 20:26:29 +00:00
Brenda Wallace
7a94920966
Merge pull request #1823 from Growstuff/awesomecode-lint-ruby-rspec-layout-28889
...
Auto corrected by following Lint Ruby rspec layout
2019-02-09 09:24:16 +13:00
Awesome Code
c4a3c03c34
Auto corrected by following Lint Ruby rspec layout
2019-02-08 20:23:08 +00:00
Brenda Wallace
1539aaa140
Merge pull request #1821 from Br3nda/api-additions
...
Adding more attributes and filters to the api
2019-02-09 09:20:38 +13:00
Brenda Wallace
cde61a1c4f
Use Regex to search for author
2019-02-09 09:04:24 +13:00
Brenda Wallace
bffbd94462
Read the file contents in ruby
2019-02-09 09:03:34 +13:00
Brenda Wallace
9a4f1058e1
Adding more attributes and filters to the api
2019-02-09 08:43:59 +13:00
Brenda Wallace
c8e5cecaf6
Fixes checking for github bots in contributors
2019-02-08 09:51:41 +13:00
Brenda Wallace
452007dc5d
Merge pull request #1817 from Growstuff/dev
...
Release to production
2019-02-07 18:57:56 +13:00
Brenda Wallace
e6de37c8ce
Tests for crop.photos
2019-02-07 15:02:11 +13:00
Brenda Wallace
b7fe5e156e
Fixed brackets, because ruby needs those sometimes
2019-02-05 17:18:36 +13:00
Brenda Wallace
c0fdf262f4
Fixed method name in spec
2019-02-05 17:11:59 +13:00
Brenda Wallace
f6ba22fb28
Fixed typo in spec
2019-02-05 17:10:34 +13:00
Brenda Wallace
e446c14bd7
Use the new Photo.by_cropscope on photos controller
2019-02-05 12:44:34 +13:00
Brenda Wallace
9ff95506bd
Spects for Photo.by_crop
2019-02-05 12:40:15 +13:00
Brenda Wallace
5c0e31721f
tests for crops.by_model_type scope
2019-02-05 12:37:35 +13:00
Brenda Wallace
51e6da7da6
Rubocop lint tidxy
2019-02-05 12:37:23 +13:00
Brenda Wallace
6167af700d
Rubocop lint tidy
2019-02-05 12:37:09 +13:00
Brenda Wallace
9c4e649c5d
Split up photos on crops#show by model type
2019-02-05 12:31:59 +13:00
Brenda Wallace
f640e41b55
Add seeds to crops api spec
2019-02-05 10:23:10 +13:00
Brenda Wallace
18ab0c8697
Add photos back into crop resources
2019-02-05 10:22:58 +13:00
Brenda Wallace
1ea19bee9d
Not planted means the percent_grown is 0
2019-02-05 09:59:20 +13:00
Brenda Wallace
49f7e57334
Make use of factory bot
2019-02-05 09:59:09 +13:00
Brenda Wallace
8d58edf083
Set hte crops in photos#show view spec
2019-02-04 22:35:42 +13:00
Brenda Wallace
b61c2290be
Removed unnecesary helper wrapper
2019-02-04 22:15:18 +13:00
Brenda Wallace
6be8f05223
Set the planted at date to the past (so we don't end up with 0%)
2019-02-04 22:11:50 +13:00
Brenda Wallace
1ead9e333b
Fixed up planting_status when planting no planted yet
2019-02-04 21:55:23 +13:00
Brenda Wallace
dd38a69be7
Fixed up planting status text to match tests
2019-02-04 21:52:13 +13:00
Brenda Wallace
862bdf35f5
Look for crop card on photo#show
2019-02-04 21:43:31 +13:00
Brenda Wallace
bb5a606240
Updated string to look for when planting
2019-02-04 21:43:10 +13:00
Brenda Wallace
d2c63db59b
Translate planting status
2019-02-04 21:42:54 +13:00
Brenda Wallace
6a1954b1e7
added dependent: destroy
2019-02-04 21:22:19 +13:00
Brenda Wallace
8e29a86edf
Merge remote-tracking branch 'origin/photos/seeds' into photos/seeds
2019-02-04 21:19:30 +13:00
Brenda Wallace
d71f6f9fc4
Rubocop tidy up
2019-02-04 21:17:41 +13:00
Brenda Wallace
b29c830f65
Merge branch 'dev' into photos/seeds
2019-02-04 21:17:08 +13:00
Brenda Wallace
b8747d7c52
Controller specs for photos#index
2019-02-04 21:15:10 +13:00
Brenda Wallace
a074810988
FEature specs for showing photos on crops#show
2019-02-04 21:03:31 +13:00
Brenda Wallace
81c899079e
Removed commented out code
2019-02-04 20:57:35 +13:00
Brenda Wallace
f1ad9cc3c7
Rubocop fix up
2019-02-04 20:55:04 +13:00
Brenda Wallace
0759ca9039
Schema update for crops added to photogaphings table
2019-02-04 20:53:04 +13:00
Brenda Wallace
5822764c1d
Fetch photos in the controller
2019-02-04 20:52:13 +13:00
Brenda Wallace
42de920352
Removed display of status
2019-02-04 20:44:20 +13:00
Brenda Wallace
ab880514c2
Further tidy of photo display
2019-02-04 20:43:52 +13:00
Brenda Wallace
dbf707d80e
Crops have seeds
2019-02-04 20:32:23 +13:00
Brenda Wallace
e8ac207fa7
Save the crop on the photo association
2019-02-04 20:32:11 +13:00
Brenda Wallace
a9ca12c1c5
Method to find planting photos only
2019-02-04 19:39:44 +13:00
Brenda Wallace
87d2c8b4c8
Fixed bug - look up photos by crop
2019-02-04 19:39:21 +13:00
Brenda Wallace
b29ab46a48
Merge pull request #1808 from Growstuff/dependabot/bundler/rubocop-rspec-1.32.0
...
Bump rubocop-rspec from 1.31.0 to 1.32.0
2019-02-02 23:22:10 +13:00
dependabot[bot]
951076bc85
Bump rubocop-rspec from 1.31.0 to 1.32.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.31.0 to 1.32.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.31.0...v1.32.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-01 20:17:34 +00:00
Brenda Wallace
76f4ffc78a
Merge pull request #1805 from Br3nda/fix/recent-harvests
...
Fix/recent harvests
2019-02-02 09:14:27 +13:00
Brenda Wallace
e3a0de081e
Merge branch 'dev' into photos/seeds
2019-01-30 16:46:42 +13:00
Brenda Wallace
8c03e3f4ab
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-30 16:45:14 +13:00
Brenda Wallace
41082b31a9
Merge branch 'dev' into fix/recent-harvests
2019-01-30 16:44:47 +13:00
Brenda Wallace
6ebe853cb3
Merge pull request #1771 from Br3nda/routes-tidy-up
...
Routes tidy up
2019-01-30 16:44:30 +13:00
Brenda Wallace
682de8f815
Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up
2019-01-30 15:25:31 +13:00
Brenda Wallace
4c02a3247e
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
2019-01-30 15:25:19 +13:00
Brenda Wallace
6acc6bd5ee
Tell rspec which gardens button to use
2019-01-30 15:25:07 +13:00
Brenda Wallace
0bb483e8eb
Merge branch 'dev' into routes-tidy-up
2019-01-30 15:20:41 +13:00
Brenda Wallace
96fc9d9368
Merge branch 'dev' into fix/recent-harvests
2019-01-30 15:20:30 +13:00
Brenda Wallace
02ed494898
Merge pull request #1810 from Growstuff/dependabot/bundler/newrelic_rpm-6.0.0.351
...
Bump newrelic_rpm from 5.7.0.350 to 6.0.0.351
2019-01-30 15:20:14 +13:00
dependabot[bot]
964dbe5e54
Bump newrelic_rpm from 5.7.0.350 to 6.0.0.351
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.7.0.350 to 6.0.0.351.
- [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 >
2019-01-29 07:20:30 +00:00
Brenda Wallace
9325f03019
Merge pull request #1788 from Growstuff/dependabot/bundler/newrelic_rpm-5.7.0.350
...
Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350
2019-01-28 16:13:01 +13:00
Brenda Wallace
3d3d1407cd
Fixed link in global actions
2019-01-27 18:28:42 +13:00
Brenda Wallace
52272550c8
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
2019-01-27 18:25:43 +13:00
Brenda Wallace
6484e4e6e5
Merge branch 'dev' into fix/recent-harvests
2019-01-27 18:25:22 +13:00
Brenda Wallace
10beb65e1a
Feature spec to check most recently planted/harvested on crops#show
2019-01-27 18:23:15 +13:00
Brenda Wallace
ea35816654
Fix ordering of recent harvests
2019-01-27 18:12:37 +13:00
dependabot[bot]
9c13064191
Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.6.0.349 to 5.7.0.350.
- [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 >
2019-01-26 22:56:56 +00:00
pozorvlak
0664324d29
Merge pull request #1798 from Br3nda/remove-mandrill
...
Remove references to MANDRILL
2019-01-26 22:54:32 +00:00
Brenda Wallace
bc576ccc44
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-27 11:43:49 +13:00
Brenda Wallace
7f8ae04520
Merge branch 'dev' into remove-mandrill
2019-01-27 11:43:33 +13:00
Brenda Wallace
2057aef0ea
Merge pull request #1802 from Growstuff/dependabot/bundler/capybara-3.13.0
...
Bump capybara from 3.12.0 to 3.13.0
2019-01-27 11:42:13 +13:00
Brenda Wallace
02d96bcc51
Removed another mandril reference
2019-01-26 14:02:50 +13:00
pozorvlak
80b0cc973d
Merge pull request #1797 from Growstuff/dev
...
Release 51
2019-01-24 17:33:09 +00:00
dependabot[bot]
5323558204
Bump capybara from 3.12.0 to 3.13.0
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.12.0 to 3.13.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.12.0...3.13.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-24 07:34:02 +00:00
Brenda Wallace
b892548b12
Merge branch 'dev' into routes-tidy-up
2019-01-24 16:09:39 +13:00
Brenda Wallace
b1d34a7fa2
Merge branch 'dev' into remove-mandrill
2019-01-24 15:52:58 +13:00
Brenda Wallace
60e222d9bb
Merge pull request #1796 from Br3nda/app-json-heroku
...
Fixing the app.json for Bonsai
2019-01-24 15:52:38 +13:00
Brenda Wallace
32b2cbd921
Merge branch 'button-translate' into routes-tidy-up
...
Conflicts:
app/views/crops/_search_bar.haml
app/views/layouts/application.html.haml
2019-01-24 13:49:53 +13:00
Brenda Wallace
986bca44f7
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
...
Conflicts:
app/views/layouts/_header.html.haml
spec/features/gardens/actions_spec.rb
2019-01-24 13:48:36 +13:00
Brenda Wallace
45890fec59
Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up
2019-01-24 13:47:17 +13:00
Brenda Wallace
fc6183eb52
DRY actions more
2019-01-24 13:46:35 +13:00
Brenda Wallace
e66f8298c8
Merge branch 'dev' into remove-mandrill
2019-01-24 12:20:39 +13:00
Brenda Wallace
e17e5c9297
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-24 12:20:26 +13:00
Brenda Wallace
9f3b757d2b
Merge branch 'dev' into app-json-heroku
2019-01-24 12:20:01 +13:00
Brenda Wallace
f6deaffb94
Fixed nested row on layout, that was breaking photo add page
2019-01-24 12:17:40 +13:00
Brenda Wallace
449e8da25a
Added missing translation for Edit profile button
2019-01-24 12:17:40 +13:00
Brenda Wallace
d73f8716c0
Include font awesome (so specs pass)
2019-01-24 12:17:40 +13:00
Brenda Wallace
e202c73584
Update buttons_helper.rb
2019-01-24 12:17:40 +13:00
Brenda Wallace
8bfe3278cc
Include icon helper from button helper
2019-01-24 12:17:40 +13:00
Brenda Wallace
a54db7d5ff
Tidied up the planting actions on gardens#index
2019-01-24 12:17:40 +13:00
Brenda Wallace
80e0d964e1
indentation clean up
2019-01-24 12:17:40 +13:00
Brenda Wallace
5218685bd9
Tidy up member edit buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
94a5411a79
Wider action bar
2019-01-24 12:17:40 +13:00
Brenda Wallace
88a277c6ed
Move consistent icons
2019-01-24 12:17:40 +13:00
Brenda Wallace
e912211cee
DRY the icons
2019-01-24 12:17:40 +13:00
Brenda Wallace
4e82584a0a
Fixed label on link in spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
a09c6603e2
Fixed photo specs to find the button on the actions view
2019-01-24 12:17:40 +13:00
Brenda Wallace
2380d62258
Use new finish button on planting badges
2019-01-24 12:17:40 +13:00
Brenda Wallace
1460d4822a
Crop name is in button label - add to spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
28422bfd1d
Seperate some specs
2019-01-24 12:17:40 +13:00
Brenda Wallace
81ee8ec56e
Add crop name to actions
2019-01-24 12:17:40 +13:00
Brenda Wallace
2a98cefedb
Copy finish planting from view to helper
2019-01-24 12:17:40 +13:00
Brenda Wallace
99fb21eebe
Find maze button in spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
33ad133665
Revert modifications to menu
2019-01-24 12:17:40 +13:00
Brenda Wallace
ca75b1c852
Use button helper for crop wrangling
2019-01-24 12:17:40 +13:00
Brenda Wallace
c9be8be9e5
Remove new planting button spec
...
because it's in the button bar now
2019-01-24 12:17:40 +13:00
Brenda Wallace
8023d71a21
Removed outdated spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
6e433306f4
Capitalise some translations
2019-01-24 12:17:40 +13:00
Brenda Wallace
655efb26eb
Removing some unused translations
2019-01-24 12:17:40 +13:00
Brenda Wallace
97675868bd
Fixed button link, using translation that exists
2019-01-24 12:17:40 +13:00
Brenda Wallace
424866b733
Add "something" to global action labels
2019-01-24 12:17:40 +13:00
Brenda Wallace
c78b96b9d6
Update from should to expect syntax
2019-01-24 12:17:40 +13:00
Brenda Wallace
8ec35cc65c
Action specs for someone else's garden
2019-01-24 12:17:40 +13:00
Brenda Wallace
e6e582cb4a
Move some action button specs to feature specs
...
because it's in a buttonbar, not the view now
2019-01-24 12:17:40 +13:00
Brenda Wallace
761a0b4142
Always use the helper for add_photo buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
9130b44fb9
Rubocop fixup
2019-01-24 12:17:40 +13:00
Brenda Wallace
8eb9487967
Move home page greeting test to features spec (from views)
2019-01-24 12:17:40 +13:00
Brenda Wallace
a6ac57f045
Tests for edit and add photo buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
a95c3a988c
DRY the add photo buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
a8547d6033
Update labels on button in crop detail spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
22e50aa618
DRY the edit buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
ad001767e2
Move seed buttongs to buttons helper
2019-01-24 12:17:40 +13:00
Brenda Wallace
b58e0cf3ce
Moved garden actions code to top of view
2019-01-24 12:17:40 +13:00
Brenda Wallace
8ae062fe9b
Added missing harvest actions
2019-01-24 12:17:40 +13:00
Brenda Wallace
c811ab1f51
Moved harvest buttons to match other #show pages
2019-01-24 12:17:40 +13:00
Brenda Wallace
8270611f0c
Removed un-used viewss
2019-01-24 12:17:40 +13:00
Brenda Wallace
02d4d12582
suffix _button to button helpers
2019-01-24 12:17:40 +13:00
Brenda Wallace
8df90dacfc
Seperate specs
2019-01-24 12:17:40 +13:00
Brenda Wallace
6ced6c5c4e
Update link label in spec
2019-01-24 12:17:40 +13:00
Brenda Wallace
dfd7765c47
Rubocop fix ups
2019-01-24 12:17:40 +13:00
Brenda Wallace
e2a0278e40
Use same t() for the button for writing blog posts
2019-01-24 12:17:40 +13:00
Brenda Wallace
313a18db08
Titles of pages consistent with buttons to pages
2019-01-24 12:17:40 +13:00
Brenda Wallace
67e58fe901
Moving buttons to the right of page (with translations)
2019-01-24 12:17:40 +13:00
Brenda Wallace
b86e6e6dab
More translations in garden actions
2019-01-24 12:17:40 +13:00
Brenda Wallace
de3c7fb1c5
Move homepage title to the :title content
2019-01-24 12:17:40 +13:00
Brenda Wallace
ba38637392
Wrapping crop actions in btn-group
2019-01-24 12:17:40 +13:00
Brenda Wallace
d1c367e3d9
Fixed glyphicons
2019-01-24 12:17:40 +13:00
Brenda Wallace
fcfe7f196e
Button for planting stuff
2019-01-24 12:17:40 +13:00
Brenda Wallace
614eff06b9
Bigger buttons
2019-01-24 12:17:40 +13:00
Brenda Wallace
a4f20bff77
More button label translations
2019-01-24 12:17:40 +13:00
Brenda Wallace
f5a63d770c
Moving garden actions to button bar
2019-01-24 12:17:40 +13:00
Brenda Wallace
279ce38c86
Moving actions to the button bar
2019-01-24 12:17:40 +13:00
Brenda Wallace
6eebc7480c
Moved global actions - only show if no buttonbar
2019-01-24 12:17:40 +13:00
Brenda Wallace
acc100f744
Adding missing translations for plantings
2019-01-24 12:17:40 +13:00
Brenda Wallace
2f271da909
Move global buttons and search
2019-01-24 12:17:40 +13:00
Brenda Wallace
6c16dca9b4
Dry the gglypicons
2019-01-24 12:17:40 +13:00
Brenda Wallace
30255a24d2
Use buttons.* translations for glyphicons titles
2019-01-24 12:17:40 +13:00
Brenda Wallace
e886929af5
Put buttons translations under buttons namespace
2019-01-24 12:17:40 +13:00
Brenda Wallace
7169b624b0
Move the action buttons to EVERY page
2019-01-24 12:17:40 +13:00
Brenda Wallace
a3f32aba9b
Call t() on button labels
2019-01-24 12:17:40 +13:00
Brenda Wallace
79c22308df
Fixed nested row on layout, that was breaking photo add page
2019-01-24 11:58:58 +13:00
Brenda Wallace
87c7596ab7
Added missing translation for Edit profile button
2019-01-24 11:54:55 +13:00
Brenda Wallace
251365654f
Include font awesome (so specs pass)
2019-01-24 11:51:48 +13:00
Brenda Wallace
943a5df870
Merge remote-tracking branch 'origin/button-translate' into button-translate
2019-01-24 10:40:24 +13:00
Brenda Wallace
8586d7c73d
Update buttons_helper.rb
2019-01-24 09:18:46 +13:00
Brenda Wallace
a8b9d0d5ff
Include icon helper from button helper
2019-01-24 09:17:13 +13:00
Brenda Wallace
d270be83d0
Tidied up the planting actions on gardens#index
2019-01-23 22:30:44 +13:00
Brenda Wallace
09230fe4e7
indentation clean up
2019-01-23 21:59:06 +13:00
Brenda Wallace
de01cc9c00
Tidy up member edit buttons
2019-01-23 21:57:21 +13:00
Brenda Wallace
2d68aa2082
Wider action bar
2019-01-23 21:49:17 +13:00
Brenda Wallace
e78180dc3a
Move consistent icons
2019-01-23 21:49:11 +13:00
Brenda Wallace
001c0251b2
DRY the icons
2019-01-23 17:34:32 +13:00
Brenda Wallace
a1b576aab4
Fixed label on link in spec
2019-01-23 16:54:07 +13:00
Brenda Wallace
45aa0f1c70
Fixed photo specs to find the button on the actions view
2019-01-23 16:49:06 +13:00
Brenda Wallace
e116229b7b
Use new finish button on planting badges
2019-01-23 16:35:12 +13:00
Brenda Wallace
6c04d26638
Crop name is in button label - add to spec
2019-01-23 16:31:44 +13:00
Brenda Wallace
f39af27538
Seperate some specs
2019-01-23 16:25:01 +13:00
Brenda Wallace
045deb1ae4
Add crop name to actions
2019-01-23 16:19:08 +13:00
Brenda Wallace
9bb08e9dac
Merge remote-tracking branch 'upstream/dev' into button-translate
2019-01-23 16:15:47 +13:00
Brenda Wallace
4d2936b68d
Copy finish planting from view to helper
2019-01-23 16:15:09 +13:00
Brenda Wallace
af7e59e45a
Find maze button in spec
2019-01-23 16:14:22 +13:00
Brenda Wallace
0fa5513bf8
Revert modifications to menu
2019-01-23 15:49:13 +13:00
Brenda Wallace
4fcd892458
Use button helper for crop wrangling
2019-01-23 15:06:56 +13:00
Brenda Wallace
7779f7ec05
Remove new planting button spec
...
because it's in the button bar now
2019-01-23 15:01:34 +13:00
Brenda Wallace
066eaab1c2
Removed outdated spec
2019-01-23 14:54:43 +13:00
Brenda Wallace
a323da6780
Capitalise some translations
2019-01-23 14:52:40 +13:00
Brenda Wallace
409dc1a276
Removing some unused translations
2019-01-23 14:52:17 +13:00
Brenda Wallace
79dfe2b84d
Fixed button link, using translation that exists
2019-01-23 14:37:18 +13:00
Brenda Wallace
3965fa1934
Add "something" to global action labels
2019-01-23 14:37:00 +13:00
Brenda Wallace
14441b6238
Update from should to expect syntax
2019-01-23 14:36:48 +13:00
Brenda Wallace
d980b9af4e
Action specs for someone else's garden
2019-01-23 14:36:36 +13:00
Brenda Wallace
e5bb6fa154
Move some action button specs to feature specs
...
because it's in a buttonbar, not the view now
2019-01-23 14:33:48 +13:00
Brenda Wallace
a926b37ad9
Always use the helper for add_photo buttons
2019-01-23 14:07:39 +13:00
Brenda Wallace
887886ebae
Rubocop fixup
2019-01-23 14:04:48 +13:00
Brenda Wallace
c52e735a0b
Move home page greeting test to features spec (from views)
2019-01-23 14:03:36 +13:00
Brenda Wallace
1ce0c840d2
Merge branch 'dev' into photos/seeds
2019-01-23 13:59:33 +13:00
Brenda Wallace
7acff05ccc
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-23 13:58:31 +13:00
Brenda Wallace
5a2f7dfe25
Merge branch 'dev' into routes-tidy-up
2019-01-23 13:58:01 +13:00
apdarr
4f4421cb38
enforce ssl for new relic
2019-01-23 13:57:32 +13:00
apdarr
58f8a88242
set newrelic to use ssl
2019-01-23 13:57:32 +13:00
Brenda Wallace
06eb01b7c5
Tests for edit and add photo buttons
2019-01-23 08:04:06 +13:00
Brenda Wallace
a5d1303918
DRY the add photo buttons
2019-01-23 08:03:57 +13:00
Brenda Wallace
f7eaf90b77
Update labels on button in crop detail spec
2019-01-22 17:20:52 +13:00
Brenda Wallace
0350d634c6
DRY the edit buttons
2019-01-22 17:20:34 +13:00
Brenda Wallace
e1bc635b04
Move seed buttongs to buttons helper
2019-01-22 17:15:25 +13:00
Brenda Wallace
a2b9a36615
Moved garden actions code to top of view
2019-01-22 17:11:50 +13:00
Brenda Wallace
01a7b7fd37
Added missing harvest actions
2019-01-22 17:11:30 +13:00
Brenda Wallace
dc4292f948
Moved harvest buttons to match other #show pages
2019-01-22 17:11:22 +13:00
Brenda Wallace
431572a77a
Removed un-used viewss
2019-01-22 17:03:34 +13:00
Brenda Wallace
adf3853c09
suffix _button to button helpers
2019-01-22 16:58:13 +13:00
Brenda Wallace
1809ca2746
Seperate specs
2019-01-22 16:54:54 +13:00
Brenda Wallace
57bcac8b02
Update link label in spec
2019-01-22 16:54:25 +13:00
Brenda Wallace
72c957967d
Rubocop fix ups
2019-01-22 16:48:57 +13:00
Brenda Wallace
8ead646bf9
Use same t() for the button for writing blog posts
2019-01-22 16:46:44 +13:00
Brenda Wallace
90b0d0956e
Titles of pages consistent with buttons to pages
2019-01-22 15:55:41 +13:00
Brenda Wallace
d418745e87
Moving buttons to the right of page (with translations)
2019-01-22 15:19:24 +13:00
Brenda Wallace
42d3db9ba4
More translations in garden actions
2019-01-21 18:43:37 +13:00
Brenda Wallace
acab1db135
Move homepage title to the :title content
2019-01-21 18:43:25 +13:00
Brenda Wallace
d6fa35099e
Wrapping crop actions in btn-group
2019-01-21 18:43:07 +13:00
Brenda Wallace
207e962501
Fixed glyphicons
2019-01-21 18:42:52 +13:00
Brenda Wallace
9a6bd714cb
Button for planting stuff
2019-01-21 18:42:44 +13:00
Brenda Wallace
dcd6e3d27c
Bigger buttons
2019-01-21 18:42:34 +13:00
Brenda Wallace
f5a61ba486
More button label translations
2019-01-21 18:42:21 +13:00
Brenda Wallace
f52bb9737d
Moving garden actions to button bar
2019-01-21 18:42:13 +13:00
Brenda Wallace
9f61d7212c
Moving actions to the button bar
2019-01-21 18:42:02 +13:00
Brenda Wallace
fbc958b76a
Moved global actions - only show if no buttonbar
2019-01-21 18:41:51 +13:00
Brenda Wallace
bc359412af
Adding missing translations for plantings
2019-01-21 14:19:40 +13:00
Brenda Wallace
e8a4cc61ea
Move global buttons and search
2019-01-21 14:13:36 +13:00
Brenda Wallace
73fa667c1d
Dry the gglypicons
2019-01-21 14:13:12 +13:00
Brenda Wallace
e6dea31935
Use buttons.* translations for glyphicons titles
2019-01-21 13:40:56 +13:00
Brenda Wallace
47e11c5b7c
Put buttons translations under buttons namespace
2019-01-21 13:37:58 +13:00
Brenda Wallace
0914caae88
Move the action buttons to EVERY page
2019-01-21 11:47:25 +13:00
Brenda Wallace
24ead96a71
Call t() on button labels
2019-01-21 11:46:50 +13:00
Brenda Wallace
e1fdc729db
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-21 11:36:46 +13:00
Brenda Wallace
2b20d32645
Merge branch 'dev' into routes-tidy-up
2019-01-21 11:36:25 +13:00
Brenda Wallace
2bf328be15
Merge branch 'dev' into app-json-heroku
2019-01-21 11:35:31 +13:00
Brenda Wallace
4825cb44ae
Merge branch 'dev' into remove-mandrill
2019-01-21 11:35:22 +13:00
Brenda Wallace
2539899934
Fix notification specs
2019-01-21 10:50:22 +13:00
Brenda Wallace
31321fce17
Merge remote-tracking branch 'upstream/dev' into routes-tidy-up
2019-01-19 12:52:19 +13:00
Brenda Wallace
f07dc1956b
Merge branch 'dev' into app-json-heroku
2019-01-19 12:38:39 +13:00
Brenda Wallace
45793c1cec
Merge branch 'dev' into routes-tidy-up
2019-01-19 12:37:53 +13:00
Brenda Wallace
5b732fedae
Remove references to MANDRILL
2019-01-19 12:36:27 +13:00
Brenda Wallace
f453682696
Fixing sendgrid
2019-01-19 12:33:58 +13:00
Brenda Wallace
6f23a203a2
Switch to SendGrid (remove sparkhost)
2019-01-19 11:57:50 +13:00
Brenda Wallace
b28bddaf0c
Merge branch 'dev' into app-json-heroku
2019-01-19 09:37:28 +13:00
Brenda Wallace
b9471e3a6e
Merge branch 'dev' into photos/seeds
2019-01-19 09:35:00 +13:00
dependabot[bot]
4be6169c93
Bump jsonapi-resources from 0.9.4 to 0.9.5
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.4 to 0.9.5.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.4...v0.9.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-19 09:33:19 +13:00
Brenda Wallace
2bb80746e0
Merge branch 'dev' into routes-tidy-up
2019-01-19 09:32:48 +13:00
Brenda Wallace
a690dc1479
Merge branch 'dev' into app-json-heroku
2019-01-19 09:04:04 +13:00
Brenda Wallace
cab5986573
Merge branch 'dev' into bb-track-types-of-gardens
2019-01-19 09:00:57 +13:00
Brenda Wallace
2c48596de9
Merge branch 'master' into dev
2019-01-19 09:00:15 +13:00
Brenda Wallace
e296f15981
Merge branch 'dev' into routes-tidy-up
2019-01-19 08:57:19 +13:00
Brenda Wallace
2b6645d3b5
Merge branch 'dev' into app-json-heroku
2019-01-19 08:56:57 +13:00
Awesome Code
36765808b9
Auto corrected by following Format Css Code
2019-01-19 08:54:52 +13:00
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
Brenda Wallace
453bc0c6b4
Update crop route specs
2019-01-06 08:45:42 +13:00
Brenda Wallace
f008270ba2
Update spec for finding your own seeds
2019-01-06 08:45:42 +13:00
Brenda Wallace
e8d2226ac6
Look up crop by slug
2019-01-06 08:45:42 +13:00
Brenda Wallace
1381b619be
on collection, routes for notification
2019-01-06 08:45:42 +13:00
Brenda Wallace
71ac88789d
notification stays as member id
2019-01-06 08:45:42 +13:00
Brenda Wallace
686b7f27d0
Fixed paths in gardens feature spec
2019-01-06 08:45:42 +13:00
Brenda Wallace
dcbfc4f9fa
Fixed spec to look for new DRY header template in gardens
2019-01-06 08:45:42 +13:00
Brenda Wallace
b44b7fdd2e
Move follows from members controller to follows controller
2019-01-06 08:45:42 +13:00
Brenda Wallace
59bc036565
Follow/Unfollow updated for routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
9760c02b77
User owner's slug to filter seeds
2019-01-06 08:45:42 +13:00
Brenda Wallace
bbb403be49
Use slug to find a member
2019-01-06 08:45:42 +13:00
Brenda Wallace
0b11641003
Update params in charts/crops controller specs
2019-01-06 08:45:42 +13:00
Brenda Wallace
b92c2f9bae
Use slugs for look up in spec
2019-01-06 08:45:42 +13:00
Brenda Wallace
a219cc4f67
Update harvests controller spec for new routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
07f06705af
Fixed pi charts path
2019-01-06 08:45:42 +13:00
Brenda Wallace
ffb87a4432
Validators of garden name uniquness, and slug name
2019-01-06 08:45:42 +13:00
Brenda Wallace
32e7016b5b
Fixed link to your own seeds
2019-01-06 08:45:42 +13:00
Brenda Wallace
c969a9f830
Use slug, not member name, for urls to members
2019-01-06 08:45:42 +13:00
Brenda Wallace
b85a8551b5
Don't duplicate seed availability info on page
2019-01-06 08:45:42 +13:00
Brenda Wallace
42156dc9e9
Links to data by crop
2019-01-06 08:45:42 +13:00
Brenda Wallace
0a7137cae2
Fixed link to crop harvests
2019-01-06 08:45:42 +13:00
Brenda Wallace
abc796605d
Tidier path the member data
2019-01-06 08:45:42 +13:00
Brenda Wallace
b2bceb5873
Fixed planting display by crop
2019-01-06 08:45:42 +13:00
Brenda Wallace
1c44ef2192
Active/not active tick box on plantings#index
2019-01-06 08:45:42 +13:00
Brenda Wallace
cd98f38c5d
DRY the nav bars and make all the same
2019-01-06 08:45:42 +13:00
Brenda Wallace
e313a7160f
Active plantings option on plantings#index
2019-01-06 08:45:42 +13:00
Brenda Wallace
1e266a92f6
Members slug used in rotes
2019-01-06 08:45:42 +13:00
Brenda Wallace
387200abf7
Moving garden data under members
2019-01-06 08:45:42 +13:00
Brenda Wallace
57d53a5c0e
Fixed naming of member follows/following route
2019-01-06 08:45:42 +13:00
Brenda Wallace
99a69bf192
Tidy up places routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
7a09e20b71
Fixed admin routes. namespace, not a resource
2019-01-06 08:45:42 +13:00
Brenda Wallace
37cba79a52
Fixed newsletters route
2019-01-06 08:45:42 +13:00
Brenda Wallace
5a8bc73099
Simplify places routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
6167d02e66
Fixed path in auto suggest helper
2019-01-06 08:45:42 +13:00
Brenda Wallace
68953188f8
Update to new path names
2019-01-06 08:45:42 +13:00
Brenda Wallace
5d8352db08
DRY the routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
a65983e1ed
Routes for photos and owners
2019-01-06 08:45:42 +13:00
Brenda Wallace
3258694021
Tidy up the routes
2019-01-06 08:45:42 +13:00
Brenda Wallace
a1e317e509
Merge pull request #1778 from Br3nda/fix/schema
...
Fix modified schema deploy error
2019-01-06 08:39:58 +13:00
Brenda Wallace
de8eba738e
Fix modified schema deploy error
2019-01-05 19:44:40 +13:00
Brenda Wallace
0f1ce681d2
Merge pull request #1773 from Growstuff/dependabot/bundler/chartkick-3.0.2
...
Bump chartkick from 3.0.1 to 3.0.2
2019-01-05 19:32:55 +13:00
dependabot[bot]
cecc032dee
Bump chartkick from 3.0.1 to 3.0.2
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 3.0.1 to 3.0.2.
- [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.0.1...v3.0.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-04 10:12:16 +00:00
dependabot[bot]
fddfdf0107
Merge pull request #1774 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.4
2019-01-04 10:09:23 +00:00
Brenda Wallace
72be3e3a41
Merge branch 'dev' into UTFGardenNames
2019-01-04 23:06:43 +13:00
dependabot[bot]
cd43558120
Bump jsonapi-resources from 0.9.3 to 0.9.4
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.3 to 0.9.4.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.3...v0.9.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-04 09:24:41 +00:00
Brenda Wallace
db53d33ede
Merge branch 'dev' into photos/seeds
2019-01-04 22:22:51 +13:00
Brenda Wallace
8e3db87f4e
Merge pull request #1766 from Br3nda/upgrade/rails-5-2
...
Upgrade to Rails 5.2
2019-01-04 22:22:32 +13:00
Brenda Wallace
b13ddf9c92
Add photos of seeds
2019-01-04 22:21:48 +13:00
Brenda Wallace
efc8fb85cb
Merge branch 'dev' into upgrade/rails-5-2
2019-01-04 20:41:52 +13:00
Brenda Wallace
e9ead68e94
Revert "Auto corrected by following Format Javascript Code"
...
This reverts commit 334b33c555 .
2019-01-04 18:17:27 +13:00
Awesome Code
334b33c555
Auto corrected by following Format Javascript Code
2019-01-04 05:15:13 +00:00
Brenda Wallace
4218688d8e
Revert "Auto corrected by following Format Javascript Code"
...
This reverts commit f83a2b6397 .
2019-01-04 18:14:36 +13:00
Awesome Code
f83a2b6397
Auto corrected by following Format Javascript Code
2019-01-03 10:00:13 +00:00
dependabot[bot]
eae3755af7
Merge pull request #1770 from Growstuff/dependabot/bundler/rubocop-rspec-1.31.0
2019-01-03 09:59:47 +00:00
dependabot[bot]
273da44406
Bump rubocop-rspec from 1.30.1 to 1.31.0
...
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec ) from 1.30.1 to 1.31.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.30.1...v1.31.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-03 07:31:04 +00:00
Brenda Wallace
4374a4800b
Commenting out linter checks until overcommit is fixed
2019-01-03 14:44:35 +13:00
Brenda Wallace
12472d3762
Return to previous version
2019-01-03 14:41:11 +13:00
Brenda Wallace
7d7ae1f044
Pin to older childprocess
2019-01-03 14:19:45 +13:00
Brenda Wallace
84201c4f55
Pin to ruby 2.5.3 on linting
2019-01-03 14:12:27 +13:00
Brenda Wallace
8229c7196c
Don't install rubocop in linters. Use the one in the bundle
2019-01-03 13:50:30 +13:00
Brenda Wallace
3de23957a3
Updated package-lock for linters
2019-01-03 13:50:01 +13:00
Brenda Wallace
0971f3b5f4
Updated notification specs for Rails 5.2
2019-01-03 12:50:58 +13:00
Brenda Wallace
d89c8f0fbc
Merge branch 'dev' into upgrade/rails-5-2
2019-01-03 12:31:37 +13:00
Brenda Wallace
301023b713
Merge pull request #1768 from Br3nda/upgrade-heroku-stack
...
Upgrade heroku stack
2019-01-03 12:31:07 +13:00
Brenda Wallace
fd2717ee01
Merge branch 'dev' into upgrade-heroku-stack
2019-01-03 08:51:06 +13:00
Brenda Wallace
5a73f57454
Merge branch 'dev' into UTFGardenNames
2019-01-03 08:46:15 +13:00
Cesy
26198d90e4
Merge pull request #1767 from Br3nda/fix-mailer-from
...
Fix mailer from address
2019-01-02 09:07:15 +00:00
Brenda Wallace
28dcc57307
Set email env on travis runs
2019-01-01 14:10:04 +13:00
Brenda Wallace
1627c347e4
App.json to configure heroku
2019-01-01 14:07:51 +13:00
Brenda Wallace
6df2d92720
Adding from email to example application.yml
2019-01-01 13:59:32 +13:00
Brenda Wallace
a76f5d3a22
More locations with production email addresses
2019-01-01 13:56:08 +13:00
Brenda Wallace
f4df42d136
Fixes not being able to find the 404 page file
2019-01-01 13:42:53 +13:00
Brenda Wallace
c7ad7bcc70
Fixed redundant begin block
2019-01-01 13:38:37 +13:00
Brenda Wallace
47a4b02ce4
Merge remote-tracking branch 'upstream/dev' into dev
2019-01-01 13:36:41 +13:00
Brenda Wallace
164e43f054
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5-2
2019-01-01 13:32:57 +13:00
Brenda Wallace
b7f876429a
Upgrade to ruby 2.6.0
2019-01-01 13:31:09 +13:00
Cesy
f9aa6012aa
Merge pull request #1765 from Br3nda/fix/1764
...
Make mail sender host configurable
2018-12-31 23:29:28 +00:00
Brenda Wallace
a43c235423
Upgrade to Rails 5.2
2019-01-01 10:31:53 +13:00
Brenda Wallace
a6a75050bb
Make mail sender host configurable
2019-01-01 09:55:29 +13:00
Brenda Wallace
b18b397e1c
Merge pull request #1511 from Br3nda/upgrade/rails-5
...
Upgrade to rails 5
2019-01-01 08:45:52 +13:00
Brenda Wallace
73e9a94167
Merge remote-tracking branch 'upstream/dev' into dev
2018-12-31 23:19:42 +13:00
Brenda Wallace
e30b179bc8
Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5
2018-12-31 21:35:47 +13:00
Brenda Wallace
f6e065301f
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-12-31 21:35:19 +13:00
Brenda Wallace
188477206f
Merge branch 'dev' into upgrade/rails-5
2018-12-31 21:34:56 +13:00
Brenda Wallace
fb03923f75
Merge branch 'master' into dev
2018-12-31 21:33:05 +13:00
Brenda Wallace
04eb2c6448
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile.lock
2018-12-31 21:28:48 +13:00
dependabot[bot]
d6c9132049
Bump friendly_id from 5.2.4 to 5.2.5
...
Bumps [friendly_id](https://github.com/norman/friendly_id ) from 5.2.4 to 5.2.5.
- [Release notes](https://github.com/norman/friendly_id/releases )
- [Changelog](https://github.com/norman/friendly_id/blob/master/Changelog.md )
- [Commits](https://github.com/norman/friendly_id/compare/5.2.4...5.2.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-31 21:27:06 +13:00
Brenda Wallace
f2fc6b2a61
Reduce max class complexity
2018-12-30 19:41:08 +13:00
Brenda Wallace
b70dee5041
Update rubocop todo
2018-12-30 19:37:28 +13:00
Brenda Wallace
9a88a9f7e0
Remove trailing whitespace
2018-12-30 17:00:47 +13:00
Brenda Wallace
ac660e986c
Wrap all action bar button groups in a div
...
So we can find them in specs
2018-12-30 16:14:00 +13:00
Brenda Wallace
c0f8c23976
Downgrade geocoder
2018-12-30 16:00:45 +13:00
Brenda Wallace
60f72652da
URI.escape -> CGI.escape
2018-12-30 15:55:10 +13:00
Brenda Wallace
2faa2fd6f0
Content for other formats on photos#show
2018-12-30 15:42:51 +13:00
Brenda Wallace
3f5c63eb04
URI.escape -> CGI.escape
2018-12-30 15:39:06 +13:00
Brenda Wallace
93e1c5e5fc
Disabled # rubocop:disable Rails/OutputSafety
2018-12-30 15:38:37 +13:00
Brenda Wallace
b1d2c46cff
Whitespace fixup
2018-12-30 15:34:31 +13:00
Brenda Wallace
b8fae99bde
Times with zone, in factories
2018-12-30 15:34:24 +13:00
Brenda Wallace
0083d1279a
Marked htmlsafe as # rubocob:ignore Rails/OutputSafety
2018-12-30 15:33:26 +13:00
Brenda Wallace
98e492ad11
DRY
2018-12-30 15:33:10 +13:00
Brenda Wallace
468dded162
Remove controller actions for method that don't exist
2018-12-30 15:32:59 +13:00
Brenda Wallace
7b01fcbd4b
Align all the hashes
2018-12-30 15:22:29 +13:00
Brenda Wallace
7399346354
one line method
2018-12-30 15:18:11 +13:00
Brenda Wallace
0330809e4b
Re-enable rubocop cops
2018-12-30 15:17:22 +13:00
Brenda Wallace
3fec343f2c
Rubocop for hash alignment
2018-12-30 15:13:59 +13:00
Brenda Wallace
22e456f3af
Time stamps need a timezone
2018-12-30 15:06:24 +13:00
Brenda Wallace
d5676338d6
Use the expect syntax
2018-12-30 15:06:14 +13:00
Brenda Wallace
9f90b0368b
Use %r for regexp
2018-12-30 15:06:06 +13:00
Brenda Wallace
ac6a308ea0
Update URL -> CGI
2018-12-30 15:05:41 +13:00
Brenda Wallace
914e9ef3be
photos needs a show method
2018-12-30 15:05:10 +13:00
Brenda Wallace
8e160a4c93
Fixed another wrong method name
2018-12-30 15:05:00 +13:00
Brenda Wallace
24b58c5ac2
FIXED wrong method name
2018-12-30 15:04:50 +13:00
Brenda Wallace
b82b4fa642
Comments controller has no show
2018-12-30 15:04:38 +13:00
Brenda Wallace
1e4cdc9511
Change rake to rails
2018-12-30 14:57:24 +13:00
Brenda Wallace
1574f4b90a
Downgrade active_median gem until we upgrade postgresql.
...
see #1757
2018-12-30 14:39:30 +13:00
Brenda Wallace
c2b64ffbc0
pull elastic search version back
2018-12-30 14:19:33 +13:00
Brenda Wallace
ca28812d83
No longer need to create the active median function in a migration
2018-12-30 13:49:50 +13:00
Brenda Wallace
007e61e76a
Freeze mutable objects assigned to constants.
2018-12-30 13:36:32 +13:00
Brenda Wallace
9e6f0af373
More things detected by rubocop, that we shouldn't ignore
2018-12-30 13:33:34 +13:00
Brenda Wallace
2cc37464fc
Some rubocop ignores that we shouldn't ignore
2018-12-30 13:31:33 +13:00
Brenda Wallace
27e471b7b3
Set rubocop to 0.60
2018-12-30 13:30:16 +13:00
Brenda Wallace
7e8aa7a435
bundle update
2018-12-30 13:22:52 +13:00
Brenda Wallace
0c78791d01
Remove unnecesary whitesapce in specs
2018-12-30 13:22:42 +13:00
Brenda Wallace
276accc314
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile.lock
2018-12-30 13:02:02 +13:00
Brenda Wallace
8348530e22
Tell capybara to normalise whitespace
2018-12-30 12:58:22 +13:00
Daniel O'Connor
5b7cdf2572
Merge branch 'dev' into bb-track-types-of-gardens
2018-12-27 09:14:06 +10:30
Daniel O'Connor
3df0e2da2b
Merge pull request #1750 from Growstuff/dependabot/bundler/newrelic_rpm-5.6.0.349
...
Bump newrelic_rpm from 5.5.0.348 to 5.6.0.349
2018-12-14 12:42:11 +10:30
dependabot[bot]
c8e625c45d
Bump newrelic_rpm from 5.5.0.348 to 5.6.0.349
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.5.0.348 to 5.6.0.349.
- [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-12-13 07:50:43 +00:00
Brenda Wallace
f9d655034b
Merge branch 'dev' into bb-track-types-of-gardens
2018-12-12 09:37:52 +13:00
Brandon Baker
7b15ae319d
corrects more inflections
2018-12-12 09:37:31 +13:00
Brandon Baker
2c0746073e
removes extra empty line detected at block body end
2018-12-12 09:37:31 +13:00
Brandon Baker
c0450477c6
adds plural form of words with māori origin
2018-12-12 09:37:31 +13:00
Brandon Baker
e6007dc094
adds inflections for irregular plural crop names
2018-12-12 09:37:31 +13:00
dependabot[bot]
012cd75f5f
Bump letter_opener from 1.6.0 to 1.7.0
...
Bumps [letter_opener](https://github.com/ryanb/letter_opener ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases )
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-12 09:37:09 +13:00
Brandon Baker
178c6cd944
fixes bug in setting slug on container
2018-12-06 15:51:00 -07:00
dependabot[bot]
43f0cbe0ca
Bump pry from 0.12.0 to 0.12.2
...
Bumps [pry](https://github.com/pry/pry ) from 0.12.0 to 0.12.2.
- [Release notes](https://github.com/pry/pry/releases )
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md )
- [Commits](https://github.com/pry/pry/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-06 10:12:32 +13:00
dependabot[bot]
a91faecaa3
[Security] Bump rails from 4.2.10 to 4.2.11
...
Bumps [rails](https://github.com/rails/rails ) from 4.2.10 to 4.2.11. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v4.2.10...v4.2.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-06 10:08:47 +13:00
dependabot[bot]
e2c3c26edc
Bump active_utils from 3.3.13 to 3.3.15
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.13 to 3.3.15.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.13...v3.3.15 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-06 10:08:12 +13:00
Brandon Baker
bb97082868
adds friendly_id to containers
2018-12-01 19:46:49 -07:00
Brandon Baker
f35284c403
adds more basic specs
2018-12-01 14:08:11 -07:00
Brandon Baker
02174a0acb
builds views for containers
2018-11-30 11:56:58 -07:00
Brandon Baker
f5abc592f1
cleans up rubocop violations
2018-11-29 14:30:02 -07:00
Brandon Baker
5f6852b45c
adds basic specs for container and adds a plot spec for garden
2018-11-29 13:22:35 -07:00
Brandon Baker
c898a958a5
adds container to garden form
2018-11-29 12:51:15 -07:00
Brandon Baker
45ba5ff48a
creates containers, plots, and associations among gardens, plots, and containers
2018-11-29 10:54:04 -07:00
dependabot[bot]
11e8d1f702
Bump active_utils from 3.3.12 to 3.3.13
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.12 to 3.3.13.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.12...v3.3.13 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-27 21:36:30 +13:00
Brandon Baker
beab7fcfda
hides crop varieties that have not been approved
2018-11-26 17:29:27 +13:00
dependabot[bot]
6c6724b558
Bump guard from 2.14.2 to 2.15.0
...
Bumps [guard](https://github.com/guard/guard ) from 2.14.2 to 2.15.0.
- [Release notes](https://github.com/guard/guard/releases )
- [Changelog](https://github.com/guard/guard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/guard/guard/compare/v2.14.2...v2.15.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-15 21:50:23 +13:00
dependabot[bot]
3506cf59de
Bump bullet from 5.8.1 to 5.9.0
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.8.1 to 5.9.0.
- [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/5.8.1...5.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-13 15:15:29 +13:00
dependabot[bot]
825d8b6b3f
Bump pry from 0.11.3 to 0.12.0
...
Bumps [pry](https://github.com/pry/pry ) from 0.11.3 to 0.12.0.
- [Release notes](https://github.com/pry/pry/releases )
- [Changelog](https://github.com/pry/pry/blob/master/CHANGELOG.md )
- [Commits](https://github.com/pry/pry/compare/v0.11.3...v0.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-10 10:42:29 +13:00
dependabot[bot]
0d183cee25
Bump newrelic_rpm from 5.4.0.347 to 5.5.0.348
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.4.0.347 to 5.5.0.348.
- [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-11-10 10:41:56 +13:00
dependabot[bot]
5c45beb54f
Bump font-awesome-sass from 5.5.0 to 5.5.0.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.5.0 to 5.5.0.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
a051f4e06d
[Security] Bump rack from 1.6.10 to 1.6.11
...
Bumps [rack](https://github.com/rack/rack ) from 1.6.10 to 1.6.11. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/1.6.10...1.6.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
2c81429e1e
Bump font-awesome-sass from 5.4.1 to 5.5.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.4.1...5.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
a748fd9773
Bump selenium-webdriver from 3.14.1 to 3.141.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.14.1 to 3.141.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/commits/selenium-3.141.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
977ddf301f
Bump dalli from 2.7.8 to 2.7.9
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.8 to 2.7.9.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.8...v2.7.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
c38f9d8047
Bump rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1
...
Bumps rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
b45162caff
Bump bullet from 5.7.6 to 5.8.1
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.6 to 5.8.1.
- [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/5.7.6...5.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
39d451240c
[Security] Bump loofah from 2.2.2 to 2.2.3
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
18b5792a31
Bump rspec-rails from 3.8.0 to 3.8.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
b80b6d2187
Bump capybara-screenshot from 1.0.21 to 1.0.22
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.21 to 1.0.22.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases )
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.21...v1.0.22 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
235136523e
Bump codeclimate-test-reporter from 1.0.8 to 1.0.9
...
Bumps [codeclimate-test-reporter](https://github.com/codeclimate/ruby-test-reporter ) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/codeclimate/ruby-test-reporter/releases )
- [Changelog](https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeclimate/ruby-test-reporter/compare/v1.0.8...v1.0.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
6aa77041ce
Bump jsonapi-resources from 0.9.0 to 0.9.3
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.0 to 0.9.3.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.0...v0.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
c5a58975e3
Bump cancancan from 2.2.0 to 2.3.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.2.0...2.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
c4849a2e3e
Bump platform-api from 2.1.0 to 2.2.0
...
Bumps [platform-api](https://github.com/heroku/platform-api ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/heroku/platform-api/releases )
- [Commits](https://github.com/heroku/platform-api/compare/v2.1.0...v2.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
6be0486e59
Bump selenium-webdriver from 3.14.0 to 3.14.1
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.14.0 to 3.14.1.
- [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[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
Awesome Code
ebe7cc3868
Auto corrected by following Ruby Style/UnneededCondition
2018-11-08 23:32:20 +13:00
dependabot[bot]
ec22039fc1
Bump rack-protection from 2.0.3 to 2.0.4
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.3 to 2.0.4.
- [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.3...v2.0.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 23:32:20 +13:00
dependabot[bot]
2d10abcc59
Bump font-awesome-sass from 5.5.0 to 5.5.0.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.5.0 to 5.5.0.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.5.0...5.5.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-08 22:27:57 +13:00
dependabot[bot]
832ec2e15e
[Security] Bump rack from 1.6.10 to 1.6.11
...
Bumps [rack](https://github.com/rack/rack ) from 1.6.10 to 1.6.11. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/1.6.10...1.6.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-07 08:33:36 +13:00
dependabot[bot]
709d188004
Bump font-awesome-sass from 5.4.1 to 5.5.0
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.4.1...5.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-06 08:53:58 +13:00
dependabot[bot]
d5dff62b48
Bump selenium-webdriver from 3.14.1 to 3.141.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.14.1 to 3.141.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/commits/selenium-3.141.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-04 01:15:49 +13:00
dependabot[bot]
d290c8bf90
Merge pull request #1722 from Growstuff/dependabot/bundler/dalli-2.7.9
2018-10-31 10:01:29 +00:00
dependabot[bot]
ea286e8300
Bump dalli from 2.7.8 to 2.7.9
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.8 to 2.7.9.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.8...v2.7.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-31 09:47:09 +00:00
dependabot[bot]
3a75e69459
Merge pull request #1720 from Growstuff/dependabot/bundler/rails-assets-leaflet.markercluster-1.4.1
2018-10-31 09:43:39 +00:00
dependabot[bot]
d0ce89a9a5
Bump rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1
...
Bumps rails-assets-leaflet.markercluster from 1.3.0 to 1.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-31 09:20:19 +00:00
dependabot[bot]
37a3e9e9e1
Bump bullet from 5.7.6 to 5.8.1
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.6 to 5.8.1.
- [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/5.7.6...5.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-31 22:16:38 +13:00
dependabot[bot]
825883b323
[Security] Bump loofah from 2.2.2 to 2.2.3
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-31 09:54:56 +13:00
dependabot[bot]
77f5bcffb0
Bump rspec-rails from 3.8.0 to 3.8.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-25 11:59:50 +13:00
dependabot[bot]
122daca7d6
Bump capybara-screenshot from 1.0.21 to 1.0.22
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.21 to 1.0.22.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases )
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.21...v1.0.22 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-23 12:19:16 +13:00
Brenda Wallace
a635032df1
Merge branch 'master' into dev
2018-10-21 16:09:01 +13:00
dependabot[bot]
09c529a6ef
Bump codeclimate-test-reporter from 1.0.8 to 1.0.9
...
Bumps [codeclimate-test-reporter](https://github.com/codeclimate/ruby-test-reporter ) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/codeclimate/ruby-test-reporter/releases )
- [Changelog](https://github.com/codeclimate/ruby-test-reporter/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codeclimate/ruby-test-reporter/compare/v1.0.8...v1.0.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:25:19 +13:00
dependabot[bot]
014b887a1f
Bump jsonapi-resources from 0.9.0 to 0.9.3
...
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources ) from 0.9.0 to 0.9.3.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases )
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.0...v0.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:24:57 +13:00
dependabot[bot]
10f7c864ab
Bump cancancan from 2.2.0 to 2.3.0
...
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan ) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases )
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.2.0...2.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:19:33 +13:00
dependabot[bot]
c6b38105af
Bump platform-api from 2.1.0 to 2.2.0
...
Bumps [platform-api](https://github.com/heroku/platform-api ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/heroku/platform-api/releases )
- [Commits](https://github.com/heroku/platform-api/compare/v2.1.0...v2.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 08:19:07 +13:00
dependabot[bot]
f02c1d80be
Bump selenium-webdriver from 3.14.0 to 3.14.1
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.14.0 to 3.14.1.
- [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[bot] <support@dependabot.com >
2018-10-20 08:18:45 +13:00
Awesome Code
a818a2ad45
Auto corrected by following Ruby Style/UnneededCondition
2018-10-20 06:57:51 +13:00
dependabot[bot]
23525371d9
Bump rack-protection from 2.0.3 to 2.0.4
...
Bumps [rack-protection](https://github.com/sinatra/sinatra ) from 2.0.3 to 2.0.4.
- [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.3...v2.0.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:57 +13:00
dependabot[bot]
0694d37916
Bump factory_bot_rails from 4.10.0 to 4.11.1
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 4.10.0 to 4.11.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.10.0...v4.11.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
ea30f5b7b3
Bump bullet from 5.7.5 to 5.7.6
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [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/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
0c36ea4fef
Bump devise from 4.4.3 to 4.5.0
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.4.3 to 4.5.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.4.3...v4.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
4a91bd977f
Bump rspec-activemodel-mocks from 1.0.3 to 1.1.0
...
Bumps [rspec-activemodel-mocks](https://github.com/rspec/rspec-activemodel-mocks ) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/rspec/rspec-activemodel-mocks/releases )
- [Commits](https://github.com/rspec/rspec-activemodel-mocks/compare/v1.0.3...v1.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
fdf4defb46
Bump font-awesome-sass from 5.0.13 to 5.4.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.0.13 to 5.4.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.13...5.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
cfcbd10844
Bump ruby-units from 2.3.0 to 2.3.1
...
Bumps [ruby-units](https://github.com/olbrich/ruby-units ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/olbrich/ruby-units/releases )
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt )
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
22787fa994
Bump sidekiq from 5.2.1 to 5.2.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.1 to 5.2.2.
- [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.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
Ahmed Shahin
f73cc7f213
Add my name to contributors list
2018-10-20 06:56:19 +13:00
Ahmed Shahin
4b6de08181
Provide message to raise_error
2018-10-20 06:56:19 +13:00
dependabot[bot]
900d51828d
Bump chartkick from 2.3.5 to 3.0.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 2.3.5 to 3.0.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/v2.3.5...v3.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-20 06:56:19 +13:00
dependabot[bot]
89b475940f
Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.2.0.345 to 5.4.0.347.
- [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-10-20 06:56:19 +13:00
dependabot[bot]
d9e7c9a831
Bump factory_bot_rails from 4.10.0 to 4.11.1
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 4.10.0 to 4.11.1.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.10.0...v4.11.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-19 17:00:03 +13:00
dependabot[bot]
0e4005897e
Bump bullet from 5.7.5 to 5.7.6
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [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/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-19 16:59:37 +13:00
dependabot[bot]
1c852d992e
Merge pull request #1688 from Growstuff/dependabot/bundler/devise-4.5.0
2018-10-18 09:34:55 +00:00
dependabot[bot]
c9084618d0
Bump devise from 4.4.3 to 4.5.0
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.4.3 to 4.5.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.4.3...v4.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-18 09:08:22 +00:00
dependabot[bot]
5021061523
Bump rspec-activemodel-mocks from 1.0.3 to 1.1.0
...
Bumps [rspec-activemodel-mocks](https://github.com/rspec/rspec-activemodel-mocks ) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/rspec/rspec-activemodel-mocks/releases )
- [Commits](https://github.com/rspec/rspec-activemodel-mocks/compare/v1.0.3...v1.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-18 22:05:35 +13:00
dependabot[bot]
6e0687c2c3
Bump font-awesome-sass from 5.0.13 to 5.4.1
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.0.13 to 5.4.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.13...5.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-18 15:50:56 +13:00
dependabot[bot]
2f34846c66
Bump ruby-units from 2.3.0 to 2.3.1
...
Bumps [ruby-units](https://github.com/olbrich/ruby-units ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/olbrich/ruby-units/releases )
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt )
- [Commits](https://github.com/olbrich/ruby-units/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-18 14:20:14 +13:00
Brenda Wallace
cf11cbd7d2
Update seeds specs
2018-10-16 15:11:46 +13:00
Brenda Wallace
ac8dff2a28
Update new post spec
2018-10-16 14:29:44 +13:00
Brenda Wallace
918f73d0f0
Update crop edit spec
2018-10-16 14:29:01 +13:00
Brenda Wallace
fb156ec438
Updating edit seeds spec
2018-10-16 14:20:15 +13:00
Brenda Wallace
92939ca204
Spec updates
2018-10-16 14:08:37 +13:00
Brenda Wallace
ec4c6f13aa
Updating new seed view specs
2018-10-16 13:56:10 +13:00
Brenda Wallace
510124758d
Inverse relation ships
2018-10-16 13:26:54 +13:00
Brenda Wallace
de2175ce16
More inverse relationships defined
2018-10-16 13:20:03 +13:00
Brenda Wallace
0d3588a2b2
Add another inverse_of created_alternate_names
2018-10-16 12:47:05 +13:00
Brenda Wallace
03da26f949
Upgrade nokogiri
2018-10-16 12:45:18 +13:00
Brenda Wallace
c1dabfc3d3
Typo fix, requestd_crops to requested_crops
2018-10-16 12:42:49 +13:00
Brenda Wallace
0a65e57d53
Fixed up text in spec
2018-10-16 12:42:15 +13:00
Brenda Wallace
fc0a941fb6
Adding more inverse relationships
2018-10-16 11:32:03 +13:00
Brenda Wallace
0862f34ff3
Merge branch 'dev' into upgrade/rails-5
2018-10-16 10:31:23 +13:00
Brenda Wallace
6c2afb2804
Adding missing inverswe relationship alternatename.creator
2018-10-16 10:16:45 +13:00
Brenda Wallace
bcb466dbf1
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile.lock
spec/controllers/photos_controller_spec.rb
2018-10-16 09:46:14 +13:00
Brenda Wallace
d594e19448
Merge branch 'master' into dev
2018-10-16 09:30:14 +13:00
dependabot[bot]
e4f130fa48
Merge pull request #1705 from Growstuff/dependabot/bundler/sidekiq-5.2.2
2018-10-15 20:10:38 +00:00
dependabot[bot]
42f05a0f3e
Bump sidekiq from 5.2.1 to 5.2.2
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.1 to 5.2.2.
- [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.1...v5.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-10 08:22:23 +00:00
pozorvlak
cdf9be3590
Merge pull request #1704 from codeminator/fix-warning-in-photos-controller-spec
...
Fix Warning in specs: PhotoController
2018-10-10 09:19:33 +01:00
pozorvlak
b5347039c0
Merge branch 'dev' into fix-warning-in-photos-controller-spec
2018-10-10 08:38:18 +01:00
pozorvlak
734f97a3eb
Merge pull request #1687 from Growstuff/dependabot/bundler/chartkick-3.0.1
...
Bump chartkick from 2.3.5 to 3.0.1
2018-10-10 08:37:13 +01:00
pozorvlak
e5ef2df518
Merge branch 'dev' into fix-warning-in-photos-controller-spec
2018-10-10 08:34:23 +01:00
Ahmed Shahin
5dde5610eb
Add my name to contributors list
2018-10-10 08:46:28 +02:00
Ahmed Shahin
ac535d32e8
Provide message to raise_error
2018-10-10 08:42:05 +02:00
Brenda Wallace
7a44e9499d
More markup updates to fit specs
2018-10-08 14:18:19 +13:00
Brenda Wallace
aded3c00fc
More spec updates
2018-10-08 14:17:28 +13:00
Brenda Wallace
fe2536c864
More spec updates
2018-10-08 14:15:44 +13:00
Brenda Wallace
1e7e275684
Adding inverse relationships (except for photos)
2018-10-08 13:43:09 +13:00
Brenda Wallace
74a71be69f
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile.lock
2018-10-08 13:33:54 +13:00
Brenda Wallace
05da2de7e4
Fix up text in checking appended date
2018-10-08 09:48:49 +13:00
Brenda Wallace
fb2f5f464a
Change scenario to description
2018-10-08 09:47:52 +13:00
dependabot[bot]
71badfbc3c
Bump chartkick from 2.3.5 to 3.0.1
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 2.3.5 to 3.0.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/v2.3.5...v3.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-07 08:42:58 +00:00
Brenda Wallace
be7767619c
Merge pull request #1702 from Growstuff/dependabot/bundler/newrelic_rpm-5.4.0.347
...
Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
2018-10-07 21:40:04 +13:00
Brenda Wallace
0390428bcf
Merge pull request #1701 from Growstuff/dev
...
Release to production
2018-10-07 21:39:27 +13:00
dependabot[bot]
d05569fc27
Bump newrelic_rpm from 5.2.0.345 to 5.4.0.347
...
Bumps [newrelic_rpm](https://github.com/newrelic/rpm ) from 5.2.0.345 to 5.4.0.347.
- [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-10-05 02:53:14 +00:00
Brenda Wallace
4690fb4364
Merge pull request #1700 from Growstuff/dependabot/bundler/nokogiri-1.8.5
...
[Security] Bump nokogiri from 1.8.4 to 1.8.5
2018-10-05 15:51:10 +13:00
dependabot[bot]
4bdcb782d9
[Security] Bump nokogiri from 1.8.4 to 1.8.5
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-05 02:37:04 +00:00
Brenda Wallace
1bb70d4bcd
Ordering gems
2018-09-29 15:55:07 +12:00
Brenda Wallace
cd1bf8c268
Code style fix up
2018-09-29 15:53:06 +12:00
Brenda Wallace
9694696570
Code style fix ups
2018-09-29 15:52:42 +12:00
Brenda Wallace
d1d1a61be3
Added inverse to model
2018-09-29 15:52:32 +12:00
Brenda Wallace
5031b37232
Adding \n into specs, because our output has it now
2018-09-29 15:51:35 +12:00
Brenda Wallace
b3ecdb0ae5
Removed include in rubocop, was making rubocop not check files
2018-09-13 23:16:16 +12:00
Brenda Wallace
e2874404e4
Layout linter fix
2018-09-13 23:15:01 +12:00
Brenda Wallace
7c7d261e7e
Fixed last static factorybot attribtue
2018-09-13 23:13:03 +12:00
Brenda Wallace
3ad048b7e8
Fixed linter issue, empty line after guard clause
2018-09-13 23:10:43 +12:00
Brenda Wallace
ee49e8c5db
Fixing unneeded condition
2018-09-13 23:09:13 +12:00
Brenda Wallace
c16ee81c88
Add rubocop-rspec
2018-09-13 22:51:42 +12:00
Brenda Wallace
99a9c0817d
Lint fix
2018-09-13 22:51:22 +12:00
Brenda Wallace
0359655842
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-09-13 22:46:20 +12:00
Brenda Wallace
aad7128a31
Fixed user name generation in member factorybot
2018-09-13 22:44:46 +12:00
Brenda Wallace
f52acd5282
Adding puma to gem bundle
2018-09-13 22:44:32 +12:00
Brenda Wallace
ca0ad08923
Merge remote-tracking branch 'upstream/dev' into dev
2018-09-13 22:39:39 +12:00
Brenda Wallace
ea67df0da3
Added dependabot to contributors again
2018-09-12 10:59:13 +12:00
dependabot[bot]
8a3fcf7939
Merge pull request #1686 from Growstuff/dependabot/bundler/sidekiq-5.2.1
2018-09-11 05:00:52 +00:00
dependabot[bot]
b69759754f
Bump sidekiq from 5.1.3 to 5.2.1
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.1.3 to 5.2.1.
- [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.1.3...v5.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-11 04:12:12 +00:00
Brenda Wallace
ae48bd0564
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-09-11 16:08:15 +12:00
Brenda Wallace
550860178e
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-09-11 16:07:30 +12:00
Brenda Wallace
914c981a1d
Merge pull request #1690 from Growstuff/dependabot/bundler/rubyzip-1.2.2
...
[Security] Bump rubyzip from 1.2.1 to 1.2.2
2018-09-11 16:06:46 +12:00
Brenda Wallace
ef60f74624
Removed extra blank lines
2018-09-11 15:57:09 +12:00
Brenda Wallace
9ee0846a30
Merge remote-tracking branch 'upstream/master' into dependabot/bundler/rubyzip-1.2.2
2018-09-11 15:56:07 +12:00
Brenda Wallace
fb4dca03d2
Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2
2018-09-11 15:51:03 +12:00
Awesome Code
d248f99209
Auto corrected by following Ruby rspec layout
2018-09-11 03:29:48 +00:00
Awesome Code
7301c6cd6c
Auto corrected by following Ruby RSpec/HooksBeforeExamples
2018-09-11 03:02:54 +00:00
Brenda Wallace
a5bb24b2a8
Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2
2018-09-11 14:50:57 +12:00
Brenda Wallace
189d2b49a6
Merge pull request #1647 from Growstuff/dev
...
Release 47
2018-09-11 10:23:11 +12:00
Awesome Code
34470a8457
Auto corrected by following Ruby Layout/LeadingBlankLines
2018-09-10 22:20:20 +00:00
Awesome Code
90f4db4853
Auto corrected by following Ruby rspec layout
2018-09-10 22:20:12 +00:00
Brenda Wallace
a9d463e9be
Merge branch 'dev' into dependabot/bundler/rubyzip-1.2.2
2018-09-11 08:06:59 +12:00
pozorvlak
28503cdca0
Merge pull request #1696 from Growstuff/awesomecode-ruby/factorybot/attributedefinedstatically-22693
...
Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically
2018-09-10 10:48:20 +01:00
Awesome Code
31744491ea
Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically
2018-09-09 21:53:57 +00:00
dependabot[bot]
4ec327f705
[Security] Bump rubyzip from 1.2.1 to 1.2.2
...
Bumps [rubyzip](https://github.com/rubyzip/rubyzip ) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases )
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md )
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-09 08:35:44 +00:00
Cesy
d541f795f6
Merge pull request #1694 from Br3nda/upgrade/elasticsearch
...
Upgrade/elasticsearch
2018-09-09 09:33:09 +01:00
Brenda Wallace
03837e193e
Test coverage
2018-09-09 14:25:40 +12:00
Brenda Wallace
612bfcffcb
Adding codeclimate to env
2018-09-09 13:48:17 +12:00
Brenda Wallace
d0b785bcd3
Pass elasticsearch version from travis.yaml
2018-09-09 13:33:20 +12:00
Brenda Wallace
857c9e9d7a
whitespace fixups
2018-09-09 12:44:52 +12:00
Brenda Wallace
913ac45127
Changed query syntax for elasticsearch
2018-09-09 12:40:40 +12:00
Brenda Wallace
27c4dbedf2
Elasticsearch has dropped the string type and is now using text
2018-09-09 12:18:50 +12:00
Brenda Wallace
4867c68984
Added stdout print when creating/refreshing elasticsearch index
2018-09-09 12:11:10 +12:00
Brenda Wallace
a326f92210
Move elastic search index create to same line as db:create
2018-09-09 11:59:50 +12:00
Brenda Wallace
835e277f49
whitepace fix up
2018-09-09 11:58:43 +12:00
Brenda Wallace
7197843ac3
Reindex elasticsearch rake task
2018-09-09 11:56:37 +12:00
Brenda Wallace
ea1fb90279
Create the search index
2018-09-09 11:55:19 +12:00
Brenda Wallace
53b08422ce
Force new config when installing elasticsearch
2018-09-09 11:08:34 +12:00
Brenda Wallace
a051523354
Upgrade to elasticsearch 6.2.3
2018-09-09 10:56:21 +12:00
Brenda Wallace
5563b183dc
Revert "Remove custom elastic search installer in travis"
...
This reverts commit d629203570 .
2018-09-09 10:52:20 +12:00
Brenda Wallace
69f6c8d5de
Merge branch 'dev' into upgrade/elasticsearch
2018-09-09 10:04:19 +12:00
Brenda Wallace
f69f0861d2
Style fix up
2018-09-09 10:04:02 +12:00
Brenda Wallace
9a0fa34c0a
Style fix up
2018-09-09 09:55:43 +12:00
Brenda Wallace
d629203570
Remove custom elastic search installer in travis
2018-09-09 09:44:43 +12:00
Brenda Wallace
338e705db7
Upgrade elastic search gems
2018-09-09 09:44:27 +12:00
dependabot[bot]
dfc53747d9
Bump unicorn from 5.4.0 to 5.4.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.4.0 to 5.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-07 11:45:52 +12:00
brenda
2b8aac19dd
Revert "Auto corrected by following Ruby Capybara/FeatureMethods"
...
This reverts commit b52763b7c2 .
2018-09-07 10:40:09 +12:00
Awesome Code
b52763b7c2
Auto corrected by following Ruby Capybara/FeatureMethods
2018-09-05 12:06:58 +00:00
dependabot[bot]
45fcb76f30
Merge pull request #1681 from Growstuff/dependabot/bundler/selenium-webdriver-3.14.0
2018-08-07 09:25:36 +00:00
dependabot[bot]
b5c55f42b8
Bump selenium-webdriver from 3.13.0 to 3.14.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.13.0 to 3.14.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.13.0...selenium-3.14.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-07 09:07:48 +00:00
dependabot[bot]
53ddb4ef94
Bump rspec-rails from 3.7.2 to 3.8.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.7.2 to 3.8.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-07 21:05:39 +12:00
dependabot[bot]
4147a571a5
Merge pull request #1668 from Growstuff/dependabot/bundler/active_utils-3.3.12
2018-08-06 11:36:17 +00:00
dependabot[bot]
02f4c7f3ac
Bump active_utils from 3.3.11 to 3.3.12
...
Bumps [active_utils](https://github.com/shopify/active_utils ) from 3.3.11 to 3.3.12.
- [Release notes](https://github.com/shopify/active_utils/releases )
- [Changelog](https://github.com/Shopify/active_utils/blob/master/CHANGELOG.md )
- [Commits](https://github.com/shopify/active_utils/compare/v3.3.11...v3.3.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-06 08:18:44 +00:00
dependabot[bot]
329f77db78
Bump factory_bot_rails from 4.8.2 to 4.10.0
...
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails ) from 4.8.2 to 4.10.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases )
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS )
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v4.8.2...v4.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-06 20:15:13 +12:00
Awesome Code
345fac4358
Auto corrected by following Ruby FactoryBot/StaticAttributeDefinedDynamically
2018-07-21 04:04:00 +00:00
dependabot[bot]
409f24e4e5
Merge pull request #1658 from Growstuff/dependabot/bundler/capybara-screenshot-1.0.21
2018-07-16 09:39:00 +00:00
dependabot[bot]
5dd22d8d1c
Bump capybara-screenshot from 1.0.19 to 1.0.21
...
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot ) from 1.0.19 to 1.0.21.
- [Release notes](https://github.com/mattheworiordan/capybara-screenshot/releases )
- [Changelog](https://github.com/mattheworiordan/capybara-screenshot/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mattheworiordan/capybara-screenshot/compare/v1.0.19...v1.0.21 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-16 09:25:22 +00:00
dependabot[bot]
dbbd7fdeb4
Bump uglifier from 4.1.14 to 4.1.15
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.14 to 4.1.15.
- [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.14...v4.1.15 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-16 21:23:32 +12:00
Brenda Wallace
3c4e1423f9
Merge pull request #1659 from Growstuff/dependabot/bundler/geocoder-1.4.9
...
Bump geocoder from 1.4.7 to 1.4.9
2018-07-15 08:50:20 +12:00
Brenda Wallace
a260aa788a
Merge branch 'dev' into UTFGardenNames
2018-07-12 20:27:40 +12:00
dependabot[bot]
40600215bc
Bump geocoder from 1.4.7 to 1.4.9
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.4.7 to 1.4.9.
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.4.7...v1.4.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-12 08:25:38 +00:00
Brenda Wallace
0bdf42f6c8
Merge pull request #1669 from Growstuff/dependabot/bundler/faker-1.9.1
...
Bump faker from 1.8.7 to 1.9.1
2018-07-12 20:23:20 +12:00
dependabot[bot]
711fb28f49
Bump faker from 1.8.7 to 1.9.1
...
Bumps [faker](https://github.com/stympy/faker ) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-12 07:25:39 +00:00
Brenda Wallace
77f14feae5
Merge pull request #1656 from Growstuff/dependabot/bundler/font-awesome-sass-5.0.13
...
Bump font-awesome-sass from 5.0.9 to 5.0.13
2018-07-04 13:12:36 +12:00
dependabot[bot]
1b6bbfcfac
Bump font-awesome-sass from 5.0.9 to 5.0.13
...
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass ) from 5.0.9 to 5.0.13.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases )
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.0.9...5.0.13 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-03 22:13:14 +00:00
Brenda Wallace
d39af973e0
Merge pull request #1663 from Growstuff/dependabot/bundler/uglifier-4.1.14
...
Bump uglifier from 4.1.13 to 4.1.14
2018-07-04 10:11:34 +12:00
dependabot[bot]
14dd8bbc8b
Bump uglifier from 4.1.13 to 4.1.14
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.13 to 4.1.14.
- [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.13...v4.1.14 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-03 21:03:20 +00:00
Brenda Wallace
72753c2d43
Merge pull request #1660 from Growstuff/dependabot/bundler/chartkick-2.3.5
...
Bump chartkick from 2.3.4 to 2.3.5
2018-07-04 09:01:36 +12:00
Brenda Wallace
b1854bbd4a
Following same syntax in contributors.md
2018-07-04 08:35:14 +12:00
Brenda Wallace
709cd640d2
Adding dependabot-bot and dependabot.
2018-07-04 08:34:34 +12:00
Brenda Wallace
9e7c6584a6
Turning off BundleOutdated in overcommit
2018-07-04 08:27:11 +12:00
dependabot[bot]
1211be2fef
Bump chartkick from 2.3.4 to 2.3.5
...
Bumps [chartkick](https://github.com/ankane/chartkick ) from 2.3.4 to 2.3.5.
- [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/v2.3.4...v2.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-07-03 10:46:22 +00:00
Brenda Wallace
d712b440b4
Merge pull request #1650 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-1.12.11
...
Bump comfortable_mexican_sofa from 1.12.10 to 1.12.11
2018-07-03 22:44:10 +12:00
Brenda Wallace
517cfd85e5
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-03 22:03:58 +12:00
Brenda Wallace
7030c868b6
Fixing deoendabot
2018-07-03 22:01:34 +12:00
Brenda Wallace
d8b39c69ec
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-03 21:01:21 +12:00
Brenda Wallace
e7e997290e
Fixed dependabot username
2018-07-03 20:52:24 +12:00
Daniel O'Connor
5d88b65284
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-02 15:25:39 +09:30
Daniel O'Connor
31d97f4c00
Merge pull request #1653 from Growstuff/dependabot/bundler/newrelic_rpm-5.2.0.345
...
Bump newrelic_rpm from 5.0.0.342 to 5.2.0.345
2018-07-02 15:24:22 +09:30
Daniel O'Connor
ec9f57e6b8
Merge pull request #1649 from Growstuff/dependabot/bundler/selenium-webdriver-3.13.0
...
Bump selenium-webdriver from 3.11.0 to 3.13.0
2018-07-02 15:23:53 +09:30
Daniel O'Connor
dd0e9f74e6
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-02 13:20:41 +09:30
Daniel O'Connor
9d389726f5
Merge branch 'dev' into dependabot/bundler/newrelic_rpm-5.2.0.345
2018-07-02 12:44:26 +09:30
Daniel O'Connor
4fd0096c85
Merge pull request #1651 from Growstuff/dependabot/bundler/rack-protection-2.0.3
...
Bump rack-protection from 2.0.1 to 2.0.3
2018-07-02 12:44:02 +09:30
Daniel O'Connor
28945b6f20
Merge pull request #1652 from Growstuff/dependabot/bundler/uglifier-4.1.13
...
Bump uglifier from 4.1.10 to 4.1.13
2018-07-02 12:40:59 +09:30
Daniel O'Connor
b926f07e2a
Update CONTRIBUTORS.md
2018-07-02 12:39:59 +09:30
Daniel O'Connor
b10719ecab
Merge branch 'dev' into dependabot/bundler/selenium-webdriver-3.13.0
2018-07-02 09:47:13 +09:30
Daniel O'Connor
1527fec441
Merge branch 'dev' into dependabot/bundler/uglifier-4.1.13
2018-07-02 09:46:59 +09:30
Daniel O'Connor
1096fd0e89
Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11
2018-07-02 09:46:39 +09:30
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
Brenda Wallace
748da6c3e6
Comments from deleted members need to show
2018-06-04 16:02:07 +12:00
Brenda Wallace
517cfa3acd
spec fixes
2018-06-04 15:34:50 +12:00
Brenda Wallace
a590b89302
Photos in spec needs to have same owner as item they link to
2018-06-04 15:29:59 +12:00
Brenda Wallace
127b72b279
Updated spec to look for 404 page instead of exception
2018-06-04 12:09:31 +12:00
Brenda Wallace
a221f10113
Move photos owner validation to models
2018-06-04 12:03:11 +12:00
Brenda Wallace
b898d83d21
Fix up notification redirect spec
2018-06-04 11:49:30 +12:00
Brenda Wallace
6913233596
Use factorybot in more tests
2018-06-04 11:39:22 +12:00
Brenda Wallace
02c5571a9a
Notifications need sender and reciever in factory
2018-06-04 11:38:15 +12:00
Brenda Wallace
cc838e19b5
Show a 404 page on record not found
2018-06-04 10:59:34 +12:00
jenkr55
9e182b07aa
Dont allow any kind of newline
2018-05-28 12:46:08 -05:00
jenkr55
f67e8ceb95
Dont allow newlines
2018-05-28 12:29:44 -05:00
jenkr55
a973485c4b
Allow ascii
2018-05-28 12:04:44 -05:00
jenkr55
f1a4bd19aa
New slug regex
2018-05-27 13:06:32 -05:00
jenkr55
8c5817f511
Still works with newline characters
2018-05-20 16:03:06 -05:00
jenkr55
1b1870095f
Allow garden name macrons test description accurate
2018-05-20 15:15:58 -05:00
jenkr55
cc1aaeb5ce
Updating test to allow numbers (description previously inaccurate)
2018-05-20 15:15:18 -05:00
jenkr55
2f5fa635c8
Validate for non-blank garden name
2018-05-20 14:57:57 -05:00
jenkr55
303e259fd4
Dont allow nil or blank names
2018-05-20 14:56:11 -05:00
jenkr55
3b5c953c57
Remove regex not letting utf-8 garden names save
2018-05-20 13:34:38 -05:00
Brenda Wallace
78d9e3c970
Merge pull request #1622 from Growstuff/awesomecode-factorybot/createlist-12138
...
Auto corrected by following FactoryBot/CreateList
2018-05-13 07:30:24 +12:00
Daniel O'Connor
a772bdaa8d
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-05-10 21:35:39 +09:30
Brenda Wallace
0402fee04d
Merge pull request #1637 from Br3nda/fix/remote-currency-methods
...
Remove some old currency methods from application helper
2018-05-08 07:52:36 +12:00
Brenda Wallace
9290e6d27a
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-05-02 20:08:42 +12:00
Brenda Wallace
7a1499d854
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-05-01 13:47:44 +12:00
Brenda Wallace
152cdace75
Removed spec for currency helpers
2018-05-01 13:47:25 +12:00
Brenda Wallace
ed3ae8bbd6
Remove some old currency methods from application helper
2018-05-01 13:47:25 +12:00
Brenda Wallace
81adae77f8
Merge pull request #1639 from Growstuff/bundle-update-2018-04-29-130926
...
Bundle Update on 2018-04-29
2018-04-29 18:30:55 +12:00
deppbot
681b5bbd8c
Bundle Update on 2018-04-29
2018-04-29 13:09:27 +08:00
Brenda Wallace
4e6ffc1a63
Removed spec for currency helpers
2018-04-28 22:21:35 +12:00
Brenda Wallace
1bbf0a3c18
Simplifying show_inactive_tickbox_path method
2018-04-28 22:11:02 +12:00
Brenda Wallace
cd910e74bc
Don't need to throw exception on planting save error
2018-04-28 22:05:50 +12:00
Brenda Wallace
9cfdb93aa3
Remove some old currency methods from application helper
...
Conflicts:
app/helpers/application_helper.rb
2018-04-28 21:50:15 +12:00
Brenda Wallace
90f8b9e042
Fixed last crop spec for rails5 ugprade
2018-04-28 21:30:08 +12:00
Brenda Wallace
f8a404a88b
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
Gemfile
Gemfile.lock
app/models/crop.rb
app/models/forum.rb
app/models/photo.rb
app/models/planting.rb
app/models/seed.rb
db/schema.rb
spec/models/garden_spec.rb
spec/models/planting_spec.rb
2018-04-28 21:25:06 +12:00
Brenda Wallace
832cfde28d
Merge pull request #1635 from Growstuff/bundle-update-2018-04-26-092357
...
Bundle Update on 2018-04-26
2018-04-28 21:15:22 +12:00
Brenda Wallace
aa9841dc7d
Pinned elastic search to 5.0.0. or later
2018-04-28 18:34:26 +12:00
pozorvlak
caa59df3bd
Merge pull request #1625 from Growstuff/dev
...
Release 46
2018-04-27 17:04:31 +01:00
Brenda Wallace
102eaf3d6b
Merge branch 'dev' into bundle-update-2018-04-26-092357
2018-04-26 17:39:03 +12:00
Brenda Wallace
61ebd5fe99
Merge pull request #1632 from Br3nda/feature/i18n
...
i18n for plantings#index
2018-04-26 17:38:32 +12:00
Brenda Wallace
7e0e936509
Merge branch 'dev' into bundle-update-2018-04-26-092357
2018-04-26 17:27:13 +12:00
Brenda Wallace
d3faa75d1d
Merge branch 'dev' into feature/i18n
2018-04-26 17:26:55 +12:00
Brenda Wallace
1575ee1ddd
Merge pull request #1620 from Br3nda/feature/status
...
Badges for ready to harvest, days to finished
2018-04-26 17:26:36 +12:00
deppbot
5b5eacb738
Bundle Update on 2018-04-26
2018-04-26 09:23:58 +08:00
Brenda Wallace
85eea89792
i18n for plantings#index
2018-04-23 15:40:56 +12:00
Brenda Wallace
fc46685ab9
Renamed should_be_finshed? to late?
2018-04-23 13:44:53 +12:00
Brenda Wallace
db0c60be0d
Rename zombie to super_late
2018-04-23 13:33:38 +12:00
Brenda Wallace
91e851c802
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-23 13:00:53 +12:00
Brenda Wallace
9112d4e2bb
Merge pull request #1630 from jenkr55/ProfileGardenDisplayImprovements
...
Profile garden display improvements
2018-04-22 15:33:42 +12:00
jenkr55
eed0b257fa
Fixing test because I removed this line
2018-04-21 22:03:31 -05:00
jenkr55
25bba9c126
format fixes
2018-04-21 21:55:29 -05:00
jenkr55
028c2a28a5
unneeded class
2018-04-21 21:52:55 -05:00
jenkr55
fa28fe25b6
Fixing responsive design issues
2018-04-21 21:43:19 -05:00
jenkr55
77978a76f2
Fixing notes display bug on harvest card
2018-04-21 21:27:40 -05:00
jenkr55
7be10957ec
WIP different profile page
2018-04-21 21:05:58 -05:00
jenkr55
c94d08c816
Moving bio to be by other profile information
2018-04-21 20:09:23 -05:00
Brenda Wallace
9fdc9e76df
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-04-22 12:14:23 +12:00
Brenda Wallace
eba03d0662
Merge pull request #1627 from jenkr55/InActiveFixes
...
Fixing broken "in-active" checkbox
2018-04-22 12:11:34 +12:00
Brenda Wallace
53d7cddea1
Merge branch 'dev' into InActiveFixes
2018-04-22 08:54:27 +12:00
Brenda Wallace
89cfd49616
Merge pull request #1626 from Br3nda/bundle-update
...
Bundle upgrade
2018-04-22 08:52:08 +12:00
jenkr55
ef74cc293d
Rubocop
2018-04-21 10:51:19 -05:00
jenkr55
0b191049b2
Undo this
2018-04-21 10:46:27 -05:00
jenkr55
e767ea6b38
Fixing planting wrapping issue
2018-04-21 10:36:33 -05:00
jenkr55
6cbf7d0bba
Fixing parmas issue for owner
2018-04-21 10:29:13 -05:00
jenkr55
cb5d490b1c
Fixing params not being passed to plantings controller
2018-04-21 10:26:19 -05:00
jenkr55
585e45487a
Fixing button layout issue
2018-04-21 09:16:17 -05:00
jenkr55
6310c51879
Only show data prompt when there are plantings
2018-04-21 09:08:02 -05:00
Brenda Wallace
4c33e5ea2d
Merge remote-tracking branch 'origin/feature/status' into feature/status
2018-04-21 22:11:52 +12:00
Brenda Wallace
caa5bcec4b
Only show finish button if can edit planting
2018-04-21 21:55:33 +12:00
Brenda Wallace
55bfd50123
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-04-21 21:18:30 +12:00
Brenda Wallace
86781f3491
Bundle upgrade
2018-04-21 21:14:18 +12:00
Brenda Wallace
48bf7bb2f4
Merge branch 'dev' into feature/status
2018-04-21 17:41:10 +12:00
Brenda Wallace
6677f8641f
If not crop lifespan data, use parent data
2018-04-21 17:40:22 +12:00
Brenda Wallace
e5cf8b6091
added spec for finished_predicted_at
2018-04-21 17:25:04 +12:00
Brenda Wallace
a7acf72f56
Merge branch 'master' into dev
2018-04-21 17:05:14 +12:00
Brenda Wallace
78f021c2f2
style fix up
2018-04-21 16:26:40 +12:00
Brenda Wallace
34145f7b64
Translation of string in haml
2018-04-21 16:19:51 +12:00
Brenda Wallace
ef9bb01fc9
Wrapped a long line
2018-04-21 15:34:18 +12:00
Brenda Wallace
e103e6be35
Reducing complexity in planting predictions code
2018-04-21 15:32:04 +12:00
Brenda Wallace
4ad4dd0c7f
Style fix up
2018-04-21 15:17:51 +12:00
Brenda Wallace
4df3354020
Style fix up
2018-04-21 15:17:17 +12:00
Brenda Wallace
6077d4da34
Fixed bug in garden spec
2018-04-21 15:01:33 +12:00
Brenda Wallace
34b6b54616
Name goes on garden, not planting
2018-04-21 14:33:39 +12:00
Brenda Wallace
87d43f1eb2
Move planting delete action into the bar
2018-04-21 14:26:27 +12:00
Brenda Wallace
5cc647ee9b
test that expects a garden name, set to that name
2018-04-21 14:22:20 +12:00
Brenda Wallace
948c32d1d5
test that expects a garden name, set to that name
2018-04-21 14:19:40 +12:00
Brenda Wallace
2e4378f025
Add css class to show finished/zombie/harvesting etc
2018-04-21 14:17:50 +12:00
Brenda Wallace
548fb3d3fd
Badges feature specs
2018-04-21 14:00:00 +12:00
Brenda Wallace
9966eddd37
Giving gardens unique names to stop test collisions
2018-04-21 13:52:49 +12:00
Brenda Wallace
aae7688a0e
Classes for planting badge colours
2018-04-21 13:05:15 +12:00
Brenda Wallace
9b16abd373
Render perenial progress bar the same as others
2018-04-21 13:04:31 +12:00
Brenda Wallace
87b04f60f7
Order garden's plantings by planted_at
2018-04-21 13:03:46 +12:00
Brenda Wallace
a8509acd49
Zombie status needs 90 days
2018-04-21 13:02:51 +12:00
Brenda Wallace
ca8dae4b78
Moving the planting buttons lower
2018-04-21 13:02:09 +12:00
Brenda Wallace
1b3e00fba0
Colours for badges on plantings
2018-04-21 13:00:24 +12:00
Brenda Wallace
935aebcb0d
Tidy up visual link between planting thumbnail and crop name
2018-04-21 12:38:32 +12:00
Brenda Wallace
4fe8cd566b
USe finished not finished?
...
because some plants have finished_at in the past but haven't had their .finished set to true yet
2018-04-21 12:37:00 +12:00
Brenda Wallace
9188bd384d
Futher simplifying planting badges
2018-04-21 11:36:48 +12:00
Brenda Wallace
8ce0717c0f
Fixing up planting helper predictions
2018-04-21 11:36:02 +12:00
Brenda Wallace
4c7529eb8e
Merge remote-tracking branch 'origin/feature/status' into feature/status
2018-04-21 11:14:32 +12:00
Brenda Wallace
f8b76e9c84
Reducing complexity in planting predictions
2018-04-21 11:12:25 +12:00
Brenda Wallace
16341da7bd
Merge branch 'dev' into feature/status
2018-04-21 10:55:40 +12:00
Brenda Wallace
0d7542a43d
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-04-21 10:55:28 +12:00
Brenda Wallace
8dead992d3
Merge pull request #1624 from Br3nda/fix/awesome
...
Revert "Auto corrected by following Style/ExpandPathArguments"
2018-04-21 10:55:11 +12:00
Brenda Wallace
cdde3994b2
Revert "Auto corrected by following Style/ExpandPathArguments"
...
This reverts commit a5b84403bb .
2018-04-21 10:35:28 +12:00
Brenda Wallace
44196f7d65
Merge remote-tracking branch 'origin/feature/status' into feature/status
2018-04-21 10:24:13 +12:00
Brenda Wallace
dc62ab05ad
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-21 10:21:40 +12:00
Brenda Wallace
15e64226c8
Merge branch 'dev' into feature/status
2018-04-21 10:21:05 +12:00
Brenda Wallace
c860f7c14b
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
2018-04-21 10:20:38 +12:00
Brenda Wallace
944af28e3c
Merge pull request #1623 from Growstuff/awesomecode-style/expandpatharguments-12138
...
Auto corrected by following Style/ExpandPathArguments
2018-04-21 10:20:18 +12:00
Awesome Code
a5b84403bb
Auto corrected by following Style/ExpandPathArguments
2018-04-20 22:19:28 +00:00
Awesome Code
afc4441ce1
Auto corrected by following FactoryBot/CreateList
2018-04-20 22:19:04 +00:00
Brenda Wallace
b7d4781aef
Split the planting&harvest predictions into files
2018-04-21 10:18:18 +12:00
Brenda Wallace
c2ff3790db
set finished false on planting factory
...
some code+tests doesn't cope with nil
2018-04-21 09:22:35 +12:00
Brenda Wallace
a2f2e24aa1
Merge remote-tracking branch 'upstream/dev' into feature/status
2018-04-21 09:07:10 +12:00
pozorvlak
f1a40e4305
Merge pull request #1621 from jenkr55/SecondCommentButton
...
Show second comment button when many comments on a post
2018-04-20 10:51:18 +01:00
jenkr55
4120069e4c
Fixing trailing whitespace
2018-04-19 12:17:36 -05:00
jenkr55
18a7306fd0
Merge branch 'SecondCommentButton' of github.com:jenkr55/growstuff into SecondCommentButton
2018-04-19 12:11:03 -05:00
jenkr55
b3962bc9bc
Comment button same style
2018-04-19 12:10:19 -05:00
Brenda Wallace
7a112aeecf
Grammar correction in method name
2018-04-19 13:49:54 +12:00
Jennifer Kruse
296daa7a56
Merge branch 'dev' into SecondCommentButton
2018-04-18 20:47:53 -05:00
Brenda Wallace
5bf75fa36f
Only show finish prediction badges if we have enough data
2018-04-19 13:45:47 +12:00
Brenda Wallace
279c922b34
Rename update predictions methods to have !
2018-04-19 13:45:29 +12:00
Brenda Wallace
3ed90b8d04
Moving predictions to own file
2018-04-19 13:44:39 +12:00
jenkr55
634dc936f9
Show second comment button when many comments
2018-04-18 19:32:24 -05:00
Brenda Wallace
2a8c4d4829
Add finished and finished_at to plantings factory
2018-04-17 10:06:40 +12:00
Brenda Wallace
3ee2537438
Only show time to finished if not finished
2018-04-17 10:03:59 +12:00
Brenda Wallace
934bd9adb8
Fixed bug in spec, wasn't really on member's garden#index
2018-04-16 22:11:36 +12:00
Brenda Wallace
d043613bde
Model specs for harvest time and zombies
2018-04-16 21:14:47 +12:00
Brenda Wallace
d1603a6e7f
Badges showing finished and harvest status
2018-04-16 21:06:20 +12:00
Brenda Wallace
79e0bc5206
Merge pull request #1615 from Growstuff/dev
...
Release 45
2018-04-13 11:25:40 +12:00
pozorvlak
61183509b0
Merge pull request #1612 from Growstuff/Br3nda-patch-1
...
Pick the first photo
2018-04-12 15:34:22 +01:00
Brenda Wallace
6c1bbe9f1c
Merge branch 'dev' into Br3nda-patch-1
2018-04-12 14:15:49 +12:00
Brenda Wallace
bab41143fa
Merge branch 'master' into dev
2018-04-12 11:01:53 +12:00
Brenda Wallace
3c7688d2ed
Merge branch 'dev' into Br3nda-patch-1
2018-04-09 09:57:24 +12:00
Brenda Wallace
ef20d1a333
Merge pull request #1613 from jenkr55/OnlyShowPlantingSuggestionIfMatch
...
Only show planting suggestion if there's a match
2018-04-09 09:57:04 +12:00
jenkr55
9c0ddb61e7
Prevent error when @matching_plantings is nil
2018-04-08 10:17:06 -05:00
Jennifer Kruse
19acb238fd
Merge branch 'dev' into OnlyShowPlantingSuggestionIfMatch
2018-04-08 09:49:29 -05:00
jenkr55
d38167fd14
Only show planting suggestion if theres a match
2018-04-08 09:47:15 -05:00
Brenda Wallace
6b68e9ee4d
Style fix
2018-04-08 10:04:43 +12:00
Brenda Wallace
3e2b4f4183
Pick the first photo
2018-04-08 09:56:19 +12:00
Brenda Wallace
65bb523d16
Merge pull request #1609 from jenkr55/FixVariousWrappingIssues
...
Fix various wrapping issues
2018-04-08 09:03:26 +12:00
jenkr55
efa8c513ea
Adding myself as a contributor
2018-04-07 14:59:14 -05:00
jenkr55
43813d1318
Fixing various wrapping issues
2018-04-07 14:58:07 -05:00
Cesy
7e2aec9ec3
Merge pull request #1608 from Growstuff/dev
...
Release 44
2018-04-06 07:23:07 +01:00
Brenda Wallace
952224b2e1
Merge branch 'master' into dev
2018-04-03 17:46:37 +12:00
Brenda Wallace
26b1a3a6ca
Merge pull request #1605 from Br3nda/feature/ownable
...
Adding counter caches and ownable concern
2018-04-03 08:54:15 +12:00
Brenda Wallace
03c9151ecd
Merge branch 'dev' into feature/ownable
2018-04-03 08:46:34 +12:00
pozorvlak
1dd3d658eb
Merge pull request #1606 from Br3nda/fix/dependents
...
Set the behaviour of dependent models when crops are deleted from the database:
- plantings, seeds and harvests are deleted
- child crops are orphaned.
2018-04-02 15:52:10 +01:00
pozorvlak
c3b694ea7d
Merge branch 'dev' into fix/dependents
2018-04-02 15:39:16 +01:00
pozorvlak
a3e2b892d1
Merge pull request #1596 from Br3nda/fix/coverage
...
Adding codeclimate coverage
2018-04-02 15:36:48 +01:00
pozorvlak
d0f6d63d36
Merge branch 'dev' into fix/dependents
2018-04-02 15:26:07 +01:00
pozorvlak
879ce26de7
Merge branch 'dev' into fix/coverage
2018-04-02 15:21:51 +01:00
pozorvlak
98e27b5af4
Merge pull request #1602 from Br3nda/fix/ordering
...
Fix ordering of recent plantings on crops#show
2018-04-02 15:21:29 +01:00
pozorvlak
a7cfecf82c
Merge branch 'dev' into feature/ownable
2018-04-02 14:47:48 +01:00
pozorvlak
d0f28d4bef
Merge branch 'dev' into fix/ordering
2018-04-02 14:43:40 +01:00
pozorvlak
2c090757cc
Merge pull request #1601 from Br3nda/feature/fluid-layout
...
Feature/fluid layout
2018-04-02 14:40:44 +01:00
Brenda Wallace
af0c9a490b
Redirect :back deprecated. updating follows controller
2018-04-02 16:28:34 +12:00
Brenda Wallace
59cca1b8cb
Upgraded controller specs for rails 5
2018-04-02 16:18:46 +12:00
Brenda Wallace
75e401162e
More dependent declared on relationships
2018-04-02 16:12:40 +12:00
Brenda Wallace
7f8bdfe48f
Updated rubocop todo
2018-04-02 16:09:41 +12:00
Brenda Wallace
c967f7432e
Seed's parent planting is optional
2018-04-02 16:04:52 +12:00
Brenda Wallace
5dbb3a1487
Mark cms specs as pending
2018-04-02 15:59:38 +12:00
Brenda Wallace
0235690f82
More dependent declared on relationships
2018-04-02 15:58:36 +12:00
Brenda Wallace
a00237dfcb
Style fixes after rubocop upgrade
2018-04-02 15:48:16 +12:00
Brenda Wallace
11fd95e2b8
Upgrading rubocop and haml_lint to match hound
2018-04-02 15:45:06 +12:00
Brenda Wallace
91ee0150f1
Adding dependent clauses to models
2018-04-02 15:37:51 +12:00
Brenda Wallace
d19c9ab669
Remove duplicate scripts yield in layout
2018-04-02 15:31:20 +12:00
Brenda Wallace
5683f1939d
Fixed up planting model, parent is not required
2018-04-02 15:17:28 +12:00
Brenda Wallace
6149d20390
Ignore highcharts.js
2018-04-02 15:09:02 +12:00
Brenda Wallace
e43740bd3d
Two more application name renames
2018-04-02 15:05:46 +12:00
Brenda Wallace
84e47b721b
removed duplicate crop chart methods
2018-04-02 11:36:16 +12:00
Brenda Wallace
f061a1d9c7
Allow planting to have null parent_seed
2018-04-02 11:33:43 +12:00
Brenda Wallace
41ea871c80
Comment out comfy admin for now
2018-04-02 11:20:28 +12:00
Brenda Wallace
49d3f24ac8
[Corrected] Use the -> { ... } lambda literal syntax for single line lambdas.
2018-04-02 11:19:40 +12:00
Brenda Wallace
4d21e132b9
Timeline is in a different controller now
2018-04-02 11:18:56 +12:00
Brenda Wallace
7cda0aacc5
Passing class_name as string in members.requested_crops
2018-04-02 11:16:50 +12:00
Brenda Wallace
2e339ce45d
Adding rails version to new migrations
2018-04-02 11:04:31 +12:00
Brenda Wallace
700073e893
Removed duplicate gardens/timeline code
2018-04-02 11:02:22 +12:00
Brenda Wallace
fa32537c3b
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
.rubocop_todo.yml
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/members.js.erb
app/assets/stylesheets/predictions.sass
app/controllers/crops_controller.rb
app/controllers/orders_controller.rb
app/controllers/plantings_controller.rb
app/models/account.rb
app/models/account_type.rb
app/models/member.rb
app/models/order.rb
app/models/order_item.rb
app/models/product.rb
app/views/gardens/show.html.haml
app/views/layouts/application.html.haml
config/initializers/assets.rb
config/routes.rb
db/schema.rb
package-lock.json
spec/controllers/account_types_controller_spec.rb
spec/controllers/admin/orders_controller_spec.rb
spec/controllers/comments_controller_spec.rb
spec/controllers/gardens_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/member_controller_spec.rb
spec/controllers/order_items_controller_spec.rb
spec/controllers/orders_controller_spec.rb
spec/controllers/photo_associations_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/controllers/seeds_controller_spec.rb
spec/controllers/shop_controller_spec.rb
spec/features/crops/crop_detail_page_spec.rb
spec/models/member_spec.rb
spec/models/post_spec.rb
spec/views/crops/_planting_advice.html.haml_spec.rb
spec/views/home/_crops.html.haml_spec.rb
spec/views/orders/show.html.haml_spec.rb
spec/views/posts/show.html.haml_spec.rb
spec/views/shop/index_spec.rb
2018-04-02 10:59:13 +12:00
Brenda Wallace
106d187e67
Add dependent clauses on crop model
2018-04-02 10:29:10 +12:00
Brenda Wallace
8521047803
Merge branch 'dev' into feature/ownable
2018-04-02 10:23:07 +12:00
Brenda Wallace
e173d0c130
Merge branch 'dev' into fix/ordering
2018-04-02 10:22:20 +12:00
Brenda Wallace
53197f27eb
Merge branch 'dev' into feature/fluid-layout
2018-04-02 10:22:03 +12:00
Brenda Wallace
2460f73673
Merge branch 'dev' into fix/coverage
2018-04-02 10:21:22 +12:00
Brenda Wallace
324dcfc821
Merge pull request #1598 from Growstuff/bundle-update-2018-03-22-131347
...
Bundle Update on 2018-03-22
2018-04-02 10:21:04 +12:00
Brenda Wallace
e3bb43477b
Adding counter caches and ownable concern
2018-04-02 10:13:19 +12:00
Brenda Wallace
2d309b7645
Removing jasmine, we have no jasmine specs
2018-04-02 09:58:02 +12:00
Brenda Wallace
a59f7dd137
Merge branch 'dev' into fix/coverage
2018-04-02 09:50:11 +12:00
Brenda Wallace
1fb3c4e0f9
Regnerated and secured code climate key
2018-04-02 09:47:04 +12:00
Brenda Wallace
b64a294245
Removed duplicate margins in css
2018-04-01 18:45:35 +12:00
Brenda Wallace
31d2aa052a
More bundle updates
2018-04-01 14:16:50 +12:00
Brenda Wallace
b7f78d5dc9
Fix ordering of recent plantings on crops#show
2018-04-01 13:05:23 +12:00
Brenda Wallace
f1afe1ca79
Expanding layout to use full screen
2018-04-01 12:44:59 +12:00
Brenda Wallace
e029ef17ab
Merge remote-tracking branch 'upstream/dev' into dev
2018-04-01 09:21:37 +12:00
Brenda Wallace
d5c8b9ae27
Merge branch 'dev' into bundle-update-2018-03-22-131347
2018-03-31 18:15:25 +13:00
Brenda Wallace
f907ba9e4b
Merge pull request #1599 from Growstuff/dev
...
Release 43
2018-03-30 16:14:06 +13:00
Brenda Wallace
25070f73d7
Merge pull request #1591 from Br3nda/feature/photos-helper
...
Use photos helpers to find photos
2018-03-26 18:14:32 +13:00
Brenda Wallace
2fe6012342
Merge branch 'dev' into feature/photos-helper
2018-03-23 15:03:01 +13:00
deppbot
61468b3587
Bundle Update on 2018-03-22
2018-03-22 13:13:48 +08:00
Brenda Wallace
58c4d82087
Merge pull request #1590 from Growstuff/dev
...
Release 42
2018-03-22 15:01:52 +13:00
deppbot
c80685bf0d
Security Update on 2018-03-20 ( #1597 )
...
* Security Update on 2018-03-20
* Ordered gems, to please rubocop
2018-03-22 14:14:19 +13:00
Brenda Wallace
69018f2c5c
Merge remote-tracking branch 'upstream/dev' into dev
2018-03-22 11:53:29 +13:00
Brenda Wallace
00ea96a73e
Can't rename GROWSTUFF_ELASTICSEARCH
2018-03-20 11:35:01 +13:00
Brenda Wallace
a1e33ae36e
Only set up database and assets in test run, not linter run
2018-03-20 11:13:11 +13:00
Brenda Wallace
7f24927dc9
Clean up errors on undefined shell vars
2018-03-20 11:06:37 +13:00
Brenda Wallace
a178d3d42a
Fix ES install on travis
2018-03-19 18:02:26 +13:00
Brenda Wallace
6089198f5c
fixed path to scripts
2018-03-19 17:52:25 +13:00
Brenda Wallace
715ff4d41d
Merge branch 'dev' into fix/coverage
2018-03-19 17:47:01 +13:00
Brenda Wallace
5992c974c7
Adding codeclimate coverage
2018-03-19 17:08:04 +13:00
Brenda Wallace
511e89fa58
Merge branch 'dev' into feature/photos-helper
2018-03-19 13:39:02 +13:00
Daniel O'Connor
13d8a29773
Merge pull request #1592 from Br3nda/fix/layout
...
Layout fixes for mobile and smaller screens
2018-03-19 10:38:12 +10:30
Brenda Wallace
dc09a6ea91
Merge branch 'dev' into fix/layout
2018-03-16 14:55:03 +13:00
Brenda Wallace
f8e83cdb9c
Merge branch 'dev' into feature/photos-helper
2018-03-16 14:54:53 +13:00
deppbot
64a8cfb59f
Security Update on 2018-03-16 ( #1593 )
2018-03-16 14:54:36 +13:00
Brenda Wallace
2f81d6c78d
Layout fixes for mobile and smaller screens
2018-03-15 23:01:51 +13:00
Brenda Wallace
ece7113c89
DRY photo helper spec
2018-03-15 22:56:32 +13:00
Brenda Wallace
8941c577e4
Specs for photos helper
2018-03-14 22:25:30 +13:00
Brenda Wallace
1bf1076076
Photos helper
2018-03-14 19:28:18 +13:00
Brenda Wallace
8906fd38ae
For seeds, use planting photo if no seeds photo
2018-03-14 15:21:40 +13:00
Daniel O'Connor
d5be92ac8b
Merge pull request #1588 from Br3nda/fix/photo-order-1547
...
Fix/photo order 1547
2018-03-13 00:22:35 +10:30
Brenda Wallace
40d71ae070
Merge branch 'dev' into fix/photo-order-1547
2018-03-12 11:41:12 +13:00
Brenda Wallace
2f45041f8c
Fixed ordering of photos on crops#show
2018-03-12 08:56:39 +13:00
Brenda Wallace
f9d4e1d6ae
Ancestry of food. Seeds -> Planting -> Seeds -> Planting ( #1550 )
...
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
2018-03-12 08:39:32 +13:00
Brenda Wallace
80203ad215
Merge pull request #1585 from Growstuff/dev
...
Release 41
2018-03-11 14:03:50 +13:00
Brenda Wallace
8c51d7bdd5
Merge branch 'master' into dev
2018-02-18 13:09:56 +13:00
Cesy
64e3b3b4d4
Merge pull request #1565 from Growstuff/awesomecode-style/andor-8234
...
Auto corrected by following Style/AndOr
2018-02-16 08:47:02 +00:00
Brenda Wallace
978523fd94
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-11 08:50:50 +13:00
Brenda Wallace
97f63d1147
Merge pull request #1583 from Growstuff/dev
...
Production hotfix
2018-02-11 08:42:49 +13:00
Brenda Wallace
1a9ff5eb4c
Merge branch 'master' into dev
2018-02-11 08:14:44 +13:00
Brenda Wallace
72b1494db9
Merge pull request #1582 from Br3nda/hotfix-migration
...
Don't update flickr photos in migration
2018-02-11 08:14:00 +13:00
Brenda Wallace
83bba916a4
Don't update flickr photos in migration
2018-02-10 18:41:11 +13:00
Brenda Wallace
64179850ff
Merge pull request #1563 from Growstuff/dev
...
Release 40
2018-02-10 09:04:55 +13:00
Brenda Wallace
9cdf2e899f
Merge pull request #1569 from Br3nda/remove/paid-accounts
...
Removing shop, products, accounts, orders
2018-02-09 11:09:36 +13:00
Brenda Wallace
2eacf346a8
Merge remote-tracking branch 'origin/remove/paid-accounts' into remove/paid-accounts
2018-02-09 10:53:47 +13:00
Brenda Wallace
aab91e2fa9
Removed active merchant
2018-02-09 10:53:05 +13:00
Brenda Wallace
2217d87b5a
Added back the member's last login
2018-02-09 10:53:05 +13:00
Brenda Wallace
44b2251896
Re-instated the member-since text on profiles
2018-02-09 10:53:05 +13:00
Brenda Wallace
f5e20cd2d2
Re-gen rubocop todo
2018-02-09 10:53:05 +13:00
Brenda Wallace
42de726405
Removing shop, products, accounts, orders
2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1
Revert "Auto corrected by following Style/StringLiterals"
...
This reverts commit ab56a3c6b3 .
2018-02-09 07:58:47 +13:00
Brenda Wallace
6b6ed7e31c
Merge remote-tracking branch 'origin/remove/paid-accounts' into remove/paid-accounts
2018-02-09 07:47:53 +13:00
Brenda Wallace
564901f93f
Merge branch 'dev' into remove/paid-accounts
2018-02-09 07:46:51 +13:00
Brenda Wallace
f8127eeec3
Revert "Auto corrected by following Style/StringLiterals"
...
This reverts commit ab56a3c6b3 .
2018-02-09 07:44:48 +13:00
Brenda Wallace
33fb2408d6
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-07 14:25:41 +13:00
Awesome Code
ab56a3c6b3
Auto corrected by following Style/StringLiterals
2018-02-07 10:20:26 +13:00
Brenda Wallace
ef4b4d0c46
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-07 08:41:30 +13:00
Brenda Wallace
44ba29137d
Merge branch 'dev' into remove/paid-accounts
2018-02-07 08:41:17 +13:00
deppbot
ed2fcc2ada
Bundle Update on 2018-02-07
2018-02-07 08:40:54 +13:00
Brenda Wallace
0b5c45d08f
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-05 16:13:15 +13:00
Brenda Wallace
54c880a66c
Removed active merchant
2018-02-05 15:40:37 +13:00
Brenda Wallace
0699677d05
Added back the member's last login
2018-02-05 14:42:41 +13:00
Brenda Wallace
3c411f15b8
Re-instated the member-since text on profiles
2018-02-05 14:42:05 +13:00
Brenda Wallace
dcf5286275
Re-gen rubocop todo
2018-02-05 14:38:08 +13:00
Brenda Wallace
7e1e2bef91
Removing shop, products, accounts, orders
2018-02-05 14:32:59 +13:00
Brenda Wallace
5cda14f87a
Don't update flickr meta data on db rollback
2018-02-05 12:52:59 +13:00
Brenda Wallace
88da0da616
Re-fetches from flickr
2018-02-05 12:52:59 +13:00
Meir Taffel
a69afd87e7
Add date_taken to photos
2018-02-05 12:52:59 +13:00
Brenda Wallace
57bfafccc7
Merge branch 'dev' into awesomecode-style/andor-8234
2018-02-05 12:28:08 +13:00
deppbot
24931381af
Bundle Update on 2018-02-03
2018-02-04 08:25:59 +13:00
deppbot
742c7e30a9
Bundle Update on 2018-01-31
2018-01-31 13:12:08 +13:00
Daniel O'Connor
2f3e368ede
Merge branch 'dev' into awesomecode-style/andor-8234
2018-01-29 11:45:51 +10:30
Daniel O'Connor
502a20cf10
Merge pull request #1564 from Growstuff/awesomecode-rspec/leadingsubject-8234
...
Auto corrected by following RSpec/LeadingSubject
2018-01-29 11:45:07 +10:30
Brenda Wallace
b2cf022522
Removed extra blank lines
2018-01-29 13:01:49 +13:00
Shiny
3d4598e4e1
style clean up
2018-01-29 12:56:41 +13:00
Awesome Code
94db28b3a9
Auto corrected by following Style/AndOr
2018-01-28 23:47:38 +00:00
Awesome Code
767477df66
Auto corrected by following RSpec/LeadingSubject
2018-01-28 23:47:27 +00:00
Brenda Wallace
7f87ee1018
Fixed default_photo for seeds - uses own photos, not the crop
2018-01-29 09:55:06 +13:00
deppbot
093a948922
Bundle Update on 2018-01-28
2018-01-29 09:54:30 +13:00
deppbot
be1553410f
Bundle Update on 2018-01-24
2018-01-29 09:54:20 +13:00
Shiny
caf41e80c9
Patching paperclip gem
2018-01-24 15:07:06 +13:00
deppbot
2eff7d6716
Bundle Update on 2018-01-21
2018-01-23 09:00:34 +13:00
Shiny
df5006c61c
Disable jshint
...
this is on by default
2018-01-23 09:00:34 +13:00
Brenda Wallace
1e0565dd9b
Tell hound to ignore the bootstrap plugin file
2018-01-23 09:00:34 +13:00
Brenda Wallace
3453a648fa
Latest versions of bootstrap accessibility plugin
2018-01-23 09:00:34 +13:00
Awesome Code
e8d9314cff
Auto corrected by following Style/Lambda
2018-01-23 09:00:34 +13:00
Brenda Wallace
92e56cfc1e
Fixed up a spec, use sign_in member instead of stubing
2018-01-23 09:00:34 +13:00
Brenda Wallace
3dc356eb29
order gardens by name on plantings form
2018-01-23 09:00:34 +13:00
Brenda Wallace
56ed61b2b3
Lock pg < 1.0.0 for now
2018-01-23 09:00:34 +13:00
Brenda Wallace
16ad5384d1
Moved gardens chart to dedicated controller
2018-01-23 09:00:34 +13:00
Brenda Wallace
cf93489af7
Fixed crops chart permissions by moving to another controller
2018-01-23 09:00:34 +13:00
Brenda Wallace
86b9a3650b
Move application.js loading last again
2018-01-23 09:00:34 +13:00
Brenda Wallace
625a035f44
Scope js variables so they are not global
2018-01-23 09:00:34 +13:00
Brenda Wallace
196d37dee9
Re-instated the extra fields on crop.json
2018-01-23 09:00:34 +13:00
Shiny
6f613635d2
Update crop_detail_page_spec.rb
2018-01-23 09:00:34 +13:00
Awesome Code
46267b2a1d
Auto corrected by following Style/MutableConstant
2018-01-23 09:00:34 +13:00
Awesome Code
8c8d549cb1
Auto corrected by following RSpec/NotToNot
2018-01-23 09:00:34 +13:00
Awesome Code
d9cc1dcae8
Auto corrected by following RSpec/MultipleSubjects
2018-01-23 09:00:34 +13:00
Brenda Wallace
9db4736229
Permissions (and specs) for charts json
2018-01-23 09:00:34 +13:00
pozorvlak
04a7c41f63
Only deploy from the Elasticsearch build job
...
Fixes #1099 , or at least works around it, though a better solution would
be to rewrite our deployment system using Travis build stages or Heroku
build pipelines.
The Elasticsearch job was picked because it's the one most likely to
fail, and I can't work out how to deploy only if all three jobs pass.
2018-01-23 09:00:34 +13:00
Brenda Wallace
78b8be1fc2
Use .presence to find finished ts in timeline
2018-01-23 09:00:34 +13:00
Brenda Wallace
b6e9539127
Use predicted finish times to put current plantings on the timeline
2018-01-23 09:00:34 +13:00
Brenda Wallace
33276874a8
add google js to gardens#show
2018-01-23 09:00:34 +13:00
Brenda Wallace
9adb3d1e4e
Removed d3 graph tests
2018-01-23 09:00:34 +13:00
Awesome Code
3391f6c392
Auto corrected by following Style/RescueStandardError
2018-01-23 09:00:34 +13:00
Awesome Code
a13acbe087
Auto corrected by following Style/ParallelAssignment
2018-01-23 09:00:34 +13:00
Awesome Code
0c8240d4e8
Auto corrected by following Style/OrAssignment
2018-01-23 09:00:34 +13:00
Brenda Wallace
5ea7ae8af0
Added Harvested for chart
2018-01-23 09:00:34 +13:00
Brenda Wallace
eb1b890eec
Add planted_from chart
2018-01-23 09:00:34 +13:00
Brenda Wallace
4821bf3b07
Wrapped thre crops show js in a document.ready
2018-01-23 09:00:34 +13:00
Brenda Wallace
b83db1d4e7
Fix predictions, it wasn't showing nil
2018-01-23 09:00:34 +13:00
Awesome Code
dea7ce241b
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-23 09:00:34 +13:00
Awesome Code
8d166f1fe6
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
2018-01-23 09:00:34 +13:00
Brenda Wallace
49253b59ee
Fixing up prediction specs
2018-01-23 09:00:34 +13:00
Brenda Wallace
ca16b2c407
Removed ignore of highcharts
2018-01-23 09:00:34 +13:00
Brenda Wallace
427a0187e1
updated prediction spec
2018-01-23 09:00:34 +13:00
Brenda Wallace
b1096cd021
Moved chart includes to application.js, attempting to fix json parse error
2018-01-23 09:00:34 +13:00
Awesome Code
020d024e4b
Auto corrected by following EmptyLine
2018-01-23 09:00:34 +13:00
Brenda Wallace
070a4605d0
Add a green border around predictions boxes
2018-01-23 09:00:34 +13:00
Brenda Wallace
1f8413bf3e
Remove highcharts.js, we're not using it
2018-01-23 09:00:34 +13:00
Brenda Wallace
59c3edcf82
Add timeline to gardens
2018-01-23 09:00:34 +13:00
Brenda Wallace
1bf05f81ab
Convert to use chartkick gem
...
Conflicts:
Gemfile
Gemfile.lock
config/initializers/assets.rb
2018-01-23 09:00:34 +13:00
Brenda Wallace
e6e88fa0c7
Fixed up tabulation
2018-01-23 09:00:34 +13:00
Brenda Wallace
308e834713
Wrap long line
2018-01-23 09:00:34 +13:00
Brenda Wallace
121deb4f48
Fix ordering of crops' parent on form
2018-01-23 09:00:34 +13:00
Brenda Wallace
4b65f28461
Added new line at end of file
2018-01-23 09:00:34 +13:00
Brenda Wallace
87708f1765
Tabulation and jsdoc fixes
2018-01-23 09:00:34 +13:00
Brenda Wallace
2cf335a064
Removed unused variables in js
2018-01-23 09:00:34 +13:00
Brenda Wallace
b205f35399
Wrapped a long line
2018-01-23 09:00:34 +13:00
Brenda Wallace
a4c06207e3
more JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
580fac6aa1
removed 2 unused variable in js
2018-01-23 09:00:34 +13:00
Brenda Wallace
4a696af9ba
Fix up JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
d2a060ad49
added JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
d898f926d5
added JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
49444edc61
contributors/commits update
2018-01-23 09:00:34 +13:00
Brenda Wallace
a4c7de381e
converted variable to camel case
2018-01-23 09:00:34 +13:00
Brenda Wallace
61408d7e4e
Some js cleanups
2018-01-23 09:00:34 +13:00
Brenda Wallace
9906036faf
Add bootstrap js to codeclimate excludes
2018-01-23 09:00:34 +13:00
Brenda Wallace
e009d9532a
Updating javascript style
2018-01-23 09:00:34 +13:00
Brenda Wallace
9f1c064900
Use the old "var" syntax, and max line 120
2018-01-23 09:00:34 +13:00
Brenda Wallace
8d3d8f3c91
Adding package lock, and eslint
2018-01-23 09:00:34 +13:00
deppbot
0feed2d359
Bundle Update on 2017-12-24
2018-01-23 09:00:34 +13:00
Brenda Wallace
d9bdc46099
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/members.js.erb
2018-01-21 21:20:43 +13:00
Daniel O'Connor
ed18932a5d
Merge pull request #1544 from Br3nda/fix/scope-js
...
Scope js variables so they are not global
2018-01-21 16:35:54 +10:30
Brenda Wallace
8cdefb6fcc
Scope js variables so they are not global
2018-01-21 18:39:00 +13:00
Shiny
0938e2839a
Merge pull request #1531 from Growstuff/awesomecode-rspec/multiplesubjects-7391
...
Auto corrected by following RSpec/MultipleSubjects
2018-01-21 17:33:13 +13:00
Daniel O'Connor
4e080c7fcd
Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391
2018-01-20 16:23:02 +10:30
Daniel O'Connor
0cdaa12000
Merge pull request #1535 from Growstuff/awesomecode-style/mutableconstant-7391
...
Auto corrected by following Style/MutableConstant
2018-01-20 16:22:32 +10:30
Shiny
505c084f47
Merge branch 'dev' into awesomecode-style/mutableconstant-7391
2018-01-20 17:28:49 +13:00
Daniel O'Connor
a53fa7781c
Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391
2018-01-18 14:07:34 +10:30
Daniel O'Connor
75d4740a91
Merge pull request #1532 from Growstuff/awesomecode-rspec/nottonot-7391
...
Auto corrected by following RSpec/NotToNot
2018-01-17 20:21:25 +10:30
Shiny
16c54d1c61
Merge branch 'dev' into awesomecode-style/mutableconstant-7391
2018-01-15 14:25:05 +13:00
Shiny
09045fabfc
Merge branch 'dev' into awesomecode-rspec/nottonot-7391
2018-01-15 14:24:44 +13:00
Shiny
a2bea8aaf4
Merge branch 'dev' into awesomecode-rspec/multiplesubjects-7391
2018-01-15 14:24:38 +13:00
pozorvlak
0491ec1e4c
Merge pull request #1527 from Br3nda/charts-with-specs
...
Charts specs
2018-01-14 22:54:10 +00:00
Shiny
4f0c004e50
Update crop_detail_page_spec.rb
2018-01-14 12:04:32 +13:00
Awesome Code
7fb2690306
Auto corrected by following Style/MutableConstant
2018-01-13 22:51:04 +00:00
Awesome Code
273e4c07d8
Auto corrected by following RSpec/NotToNot
2018-01-13 22:49:49 +00:00
Awesome Code
b6aef19be6
Auto corrected by following RSpec/MultipleSubjects
2018-01-13 22:49:36 +00:00
Shiny
d18b7df611
Merge branch 'dev' into charts-with-specs
2018-01-14 10:06:06 +13:00
Shiny
5f28e3e02d
Merge pull request #1526 from pozorvlak/deploy_only_once
...
Only deploy from the Elasticsearch build job
2018-01-13 23:30:50 +13:00
Shiny
6efdcb74d3
Merge branch 'dev' into charts-with-specs
2018-01-13 22:58:57 +13:00
Shiny
d32d068527
Merge branch 'dev' into deploy_only_once
2018-01-13 22:58:15 +13:00
Shiny
09771d323a
Merge pull request #1521 from Growstuff/awesomecode-style/orassignment-7269
...
Auto corrected by following Style/OrAssignment
2018-01-13 22:57:58 +13:00
Shiny
c618f7a690
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-13 22:19:45 +13:00
Brenda Wallace
3a4443a4fe
Permissions (and specs) for charts json
2018-01-13 22:15:27 +13:00
Shiny
238f87f616
Merge branch 'dev' into deploy_only_once
2018-01-13 22:11:34 +13:00
pozorvlak
2a2bef71da
Merge pull request #1518 from Growstuff/awesomecode-factorybot/dynamicattributedefinedstatically-7220
...
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
2018-01-12 11:51:54 +00:00
pozorvlak
b576b4b83e
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-12 11:38:49 +00:00
pozorvlak
e8bcce2ad3
Only deploy from the Elasticsearch build job
...
Fixes #1099 , or at least works around it, though a better solution would
be to rewrite our deployment system using Travis build stages or Heroku
build pipelines.
The Elasticsearch job was picked because it's the one most likely to
fail, and I can't work out how to deploy only if all three jobs pass.
2018-01-12 11:31:28 +00:00
pozorvlak
723c4d4345
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-12 11:22:08 +00:00
pozorvlak
a8eee7624a
Merge pull request #1522 from Growstuff/awesomecode-style/parallelassignment-7269
...
Auto corrected by following Style/ParallelAssignment
2018-01-12 11:21:46 +00:00
pozorvlak
c7a3911694
Merge branch 'dev' into awesomecode-style/parallelassignment-7269
2018-01-12 09:57:26 +00:00
Shiny
6ccfa7f008
Merge pull request #1515 from Br3nda/timeline
...
Garden Timeline
2018-01-12 10:59:15 +13:00
Brenda Wallace
b831c29c97
Use .presence to find finished ts in timeline
2018-01-12 09:27:09 +13:00
Brenda Wallace
cc1d3b4f43
Use predicted finish times to put current plantings on the timeline
2018-01-12 08:07:38 +13:00
Brenda Wallace
150a0dd99e
Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5
...
Conflicts:
spec/controllers/photo_associations_controller_spec.rb
2018-01-12 07:57:02 +13:00
Brenda Wallace
29be61c790
Merge branch 'timeline' into upgrade/rails-5
2018-01-12 07:56:09 +13:00
Brenda Wallace
c442bdbd45
add google js to gardens#show
2018-01-12 07:53:34 +13:00
Shiny
bf2b32ffaa
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-11 16:13:34 +13:00
Shiny
cba0a40246
Merge branch 'dev' into awesomecode-style/parallelassignment-7269
2018-01-11 16:13:24 +13:00
Shiny
dd536d607b
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-11 16:13:10 +13:00
Brenda Wallace
f4e87a974d
Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5
...
Conflicts:
app/views/gardens/show.html.haml
spec/controllers/photo_associations_controller_spec.rb
2018-01-11 16:10:36 +13:00
Brenda Wallace
2d813e49de
add google js to gardens#show
2018-01-11 15:36:27 +13:00
Shiny
43c2ac7244
Merge branch 'dev' into upgrade/rails-5
2018-01-11 15:00:28 +13:00
Shiny
31d3f17d78
Merge branch 'dev' into upgrade/rails-5
2018-01-11 14:59:57 +13:00
Shiny
d1e3322075
Merge branch 'dev' into timeline
2018-01-11 14:58:48 +13:00
Shiny
091ed0e1be
Merge pull request #1514 from Br3nda/charts
...
Use ChartKick gem for charts
2018-01-11 14:58:04 +13:00
Shiny
fb00f6a23a
Merge branch 'dev' into timeline
2018-01-11 13:12:29 +13:00
Shiny
01d6232bcf
Merge branch 'dev' into charts
2018-01-11 13:11:32 +13:00
Daniel O'Connor
3e5de8bce4
Merge branch 'dev' into upgrade/rails-5
2018-01-11 10:04:56 +10:30
Daniel O'Connor
609b468675
Merge branch 'dev' into upgrade/rails-5
2018-01-11 10:04:21 +10:30
Daniel O'Connor
b172c5f242
Merge branch 'dev' into awesomecode-style/orassignment-7269
2018-01-11 10:01:38 +10:30
Daniel O'Connor
8afff39c09
Merge pull request #1523 from Growstuff/awesomecode-style/rescuestandarderror-7269
...
Auto corrected by following Style/RescueStandardError
2018-01-11 10:00:50 +10:30
Brenda Wallace
f2b88a94ef
Merge branch 'charts' into upgrade/rails-5
2018-01-11 09:32:31 +13:00
Brenda Wallace
26a5ba70ef
Merge branch 'charts' into timeline
2018-01-11 09:32:14 +13:00
Brenda Wallace
7dab57f9ba
Removed d3 graph tests
2018-01-11 09:31:59 +13:00
Brenda Wallace
0d35b4ca6d
Updating rubocop todo
2018-01-11 09:26:48 +13:00
Awesome Code
1a4e0bd48a
Auto corrected by following Style/RescueStandardError
2018-01-10 20:18:17 +00:00
Awesome Code
e865e93665
Auto corrected by following Style/ParallelAssignment
2018-01-10 20:18:10 +00:00
Awesome Code
bd32647178
Auto corrected by following Style/OrAssignment
2018-01-10 20:17:58 +00:00
Shiny
a931f26b00
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-11 09:15:00 +13:00
Brenda Wallace
350787d4e4
Merge branch 'charts' into upgrade/rails-5
2018-01-11 09:12:20 +13:00
Brenda Wallace
7b59480928
Merge branch 'charts' into timeline
2018-01-11 09:12:06 +13:00
Brenda Wallace
390282f9f2
Added Harvested for chart
2018-01-11 09:03:13 +13:00
Brenda Wallace
8e0b7d9ded
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/crops.js.erb
spec/controllers/comments_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/models/post_spec.rb
spec/views/home/_crops.html.haml_spec.rb
2018-01-11 08:34:20 +13:00
Brenda Wallace
56a76004df
Merge branch 'charts' into timeline
2018-01-11 08:31:09 +13:00
Brenda Wallace
4af36f68b4
Merge remote-tracking branch 'origin/charts' into charts
2018-01-11 08:30:38 +13:00
Brenda Wallace
ad6601b356
Add planted_from chart
2018-01-11 08:29:20 +13:00
Brenda Wallace
15594c0209
Wrapped thre crops show js in a document.ready
2018-01-11 08:26:59 +13:00
Shiny
34715b5a2a
Merge branch 'dev' into charts
2018-01-10 16:37:32 +13:00
Shiny
6641ae8257
Merge pull request #1519 from Growstuff/awesomecode-rspec/emptylineafterfinallet-7220
...
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-10 16:37:07 +13:00
Shiny
ca860db074
Merge branch 'dev' into awesomecode-rspec/emptylineafterfinallet-7220
2018-01-09 21:52:49 +13:00
Shiny
5230dec20e
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-09 19:00:04 +13:00
Shiny
3029bdcb0d
Merge pull request #1517 from Growstuff/awesomecode-emptyline-7220
...
Auto corrected by following EmptyLine
2018-01-09 18:53:28 +13:00
Brenda Wallace
6d56f3f655
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/views/layouts/application.html.haml
2018-01-09 15:55:28 +13:00
Brenda Wallace
dc86404b6f
Fix predictions, it wasn't showing nil
2018-01-09 15:53:40 +13:00
Awesome Code
e46f530dc3
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-09 02:00:40 +00:00
Awesome Code
3ece584390
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
2018-01-09 01:59:43 +00:00
Brenda Wallace
a2e4863f00
Fixing up prediction specs
2018-01-09 14:37:21 +13:00
Brenda Wallace
2d58099f2d
Merge remote-tracking branch 'origin/charts' into charts
2018-01-09 14:33:50 +13:00
Brenda Wallace
c5c6f7ad47
Removed ignore of highcharts
2018-01-09 14:31:03 +13:00
Brenda Wallace
2c3fe3c204
updated prediction spec
2018-01-09 13:18:58 +13:00
Brenda Wallace
1fbbc50940
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-01-09 13:11:33 +13:00
Shiny
b0afbe571f
Merge branch 'dev' into charts
2018-01-09 13:09:52 +13:00
Brenda Wallace
74ff648f90
Moved chart includes to application.js, attempting to fix json parse error
2018-01-09 12:51:21 +13:00
Awesome Code
a5fa033f2d
Auto corrected by following EmptyLine
2018-01-08 23:46:57 +00:00
Awesome Code
29a9643f00
trigger awesomecode.io notification
2018-01-08 23:46:00 +00:00
Brenda Wallace
9172d21f1d
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/assets/stylesheets/predictions.sass
2018-01-08 18:14:24 +13:00
Brenda Wallace
f3ec7e0c4e
Add a green border around predictions boxes
2018-01-08 18:12:57 +13:00
Brenda Wallace
59122d6938
Merge branch 'charts' into timeline
2018-01-08 18:03:40 +13:00
Brenda Wallace
d8cce280e2
Remove highcharts.js, we're not using it
2018-01-08 18:03:20 +13:00
Brenda Wallace
c569961029
Add timeline to gardens
2018-01-08 11:30:06 +13:00
Brenda Wallace
34280123e5
Convert to use chartkick gem
...
Conflicts:
Gemfile
Gemfile.lock
config/initializers/assets.rb
2018-01-08 11:28:59 +13:00
Brenda Wallace
865fe106ad
Unique member name on notifications spec
2018-01-07 22:10:27 +13:00
Brenda Wallace
386dc5ad7f
Use factory bot in specs
2018-01-07 19:37:03 +13:00
Brenda Wallace
8e59e68dd7
Add valid DNS entry to feature spec, so it doesn't fail
2018-01-07 19:30:52 +13:00
Brenda Wallace
52e3f03bb5
Add timeline to gardens
2018-01-07 19:25:05 +13:00
Brenda Wallace
73ffbb0272
crop creator is optional
...
doesn't get set when crop has just been requested
2018-01-07 18:44:03 +13:00
Brenda Wallace
9e5aba75d8
Added full path to jpeg in spec, so does'nt throw asset pipeline errors
2018-01-07 18:35:28 +13:00
Brenda Wallace
ac16347f0d
Small change to plantings model, so feature spec passes again
2018-01-07 18:23:42 +13:00
Brenda Wallace
bf34feacba
Convert to use chartkick gem
2018-01-07 17:25:16 +13:00
Brenda Wallace
482d15e36d
Fixed spec to specify login name before checking
2018-01-06 16:48:28 +13:00
Brenda Wallace
ca40d07148
Fixed up crops view spec
2018-01-06 16:42:18 +13:00
Brenda Wallace
f02d328d1c
commented out a cms link
2018-01-06 15:34:51 +13:00
Brenda Wallace
a9043b8f5a
specify login name and post body in spec
...
don't rely on factory to produce predictable results, specify what we're
gonna be looking for in spec
2018-01-06 15:10:25 +13:00
Brenda Wallace
4800f405ea
Two more fixes to tests for slug generation
2018-01-06 12:35:05 +13:00
Brenda Wallace
987400526e
Use distinct for plant parts
2018-01-06 12:32:04 +13:00
Brenda Wallace
c95630e249
Fixed api request specs after rails 5 upgrade
2018-01-06 12:19:42 +13:00
Brenda Wallace
dd980d3f41
Harvests#edit needs to respond with something
2018-01-06 12:06:26 +13:00
Brenda Wallace
22fd422a6d
Look for eq false in member spec
2018-01-06 11:49:35 +13:00
Brenda Wallace
d642e7cf40
set login name on member so we know what to look for in slug spec
2018-01-06 11:48:45 +13:00
Brenda Wallace
5eae80bc6d
Specify login name in spec, so we know what to look for
...
Becuase we're using the faker gem now
2018-01-06 11:38:47 +13:00
Brenda Wallace
e5beb066a0
Moved members.create_account_and_garden to private
2018-01-06 11:32:49 +13:00
Brenda Wallace
7bb49f337f
Fixing up member's account model creation, post rails 5 upgrade
2018-01-06 11:31:04 +13:00
Brenda Wallace
fcbb57e659
Respond with data on gardens#edit, so non-html formats don't break specs
2018-01-06 10:47:04 +13:00
Brenda Wallace
a0fe19651e
Plant parts model using distinct query
2018-01-06 09:31:39 +13:00
Brenda Wallace
19382a8a36
Random login name generator was running out of names
...
So here's a name plus a random number instead
It might collide sometimes alas
2018-01-06 09:23:34 +13:00
Brenda Wallace
62fd16e6b2
Notifications don't have a post if they are a message
2018-01-06 09:01:18 +13:00
Brenda Wallace
a2190dc984
Fixed a matcher in posts controller spec
2018-01-06 08:54:44 +13:00
Brenda Wallace
462654f26e
Fixed gardens controller specs
2018-01-06 08:51:11 +13:00
Brenda Wallace
641d227a87
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/application.js
package-lock.json
2018-01-06 08:46:52 +13:00
Brenda Wallace
a0cc9c0a00
fixed photo controller specs
2018-01-06 08:41:34 +13:00
pozorvlak
ace0d7ab77
Merge pull request #1505 from Br3nda/js/cleanup
...
Js clean up
2018-01-05 11:35:17 +00:00
Brenda Wallace
4e5aa8077c
Re-wrote harvests#update controller spec
2018-01-05 21:34:11 +13:00
Brenda Wallace
2b69db77bf
Use faker gem for Member factorybot
2018-01-05 21:33:21 +13:00
Brenda Wallace
2f9610a60f
Http positional arguments in rails 5
2018-01-04 21:28:48 +13:00
Brenda Wallace
46cfe527bc
add in gem 'rails-controller-testing'
2018-01-04 16:38:09 +13:00
Brenda Wallace
fefc218b4c
Merge branch 'js/cleanup' of github.com:Br3nda/growstuff into js/cleanup
2018-01-04 15:12:30 +13:00
Brenda Wallace
53c9f89bc1
Fixed up tabulation
2018-01-04 15:11:36 +13:00
Brenda Wallace
79f6f7097a
updated npm package.json
2018-01-04 15:01:09 +13:00
Brenda Wallace
090bc02269
belongs_to defaults to required. setting some to optional
2018-01-04 14:55:36 +13:00
Brenda Wallace
2fd13e9b7c
Updated new path to jquery autocomplete
2018-01-04 14:44:52 +13:00
Brenda Wallace
2109ee1561
Migrations need to specify a version
2018-01-04 14:42:25 +13:00
Brenda Wallace
79cf7b452c
removing some cms stuff
2018-01-04 14:31:24 +13:00
Brenda Wallace
9d2732fffa
removing comfortable mexican sofa for now
2018-01-04 14:29:09 +13:00
Brenda Wallace
e3a3c22e69
Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5
2018-01-04 14:05:41 +13:00
Shiny
ba2e4b5dce
Merge branch 'dev' into upgrade/rails-5
2018-01-04 14:03:19 +13:00
pozorvlak
965fb28ab3
Merge branch 'dev' into js/cleanup
2018-01-03 11:07:35 +00:00
pozorvlak
196707e6e8
Merge pull request #1508 from Br3nda/fix/1502
...
Fix/1502 Missing ordering, crops form
2018-01-03 11:07:11 +00:00
Brenda Wallace
7bc91e415a
Re-instate active_median gem
2018-01-03 19:09:32 +13:00
Brenda Wallace
d456d045cd
Changed order of photo association relationship declarations
2018-01-03 17:24:51 +13:00
Brenda Wallace
4917ab9ae8
Fixed order->member relationship, after change to paranoia gem
2018-01-03 17:21:40 +13:00
Brenda Wallace
46d56fde31
Application job for Rails 5
2018-01-03 17:20:08 +13:00
Brenda Wallace
65d5b2d61a
Application mailer for rails 5
2018-01-03 17:18:41 +13:00
Brenda Wallace
b6c9b13d4d
Models inherit from application record
2018-01-03 17:16:14 +13:00
Brenda Wallace
f4af682d45
Updated code for Rail 5
2018-01-03 17:12:17 +13:00
Brenda Wallace
f1c8743623
Config for rails 5
2018-01-03 17:10:50 +13:00
Brenda Wallace
26f525e88a
Upgrade gems for rails 5
...
Note: Unlocks elastic search gem, and removes debuggers
2018-01-03 17:06:54 +13:00
Brenda Wallace
00130b3c0a
Merge remote-tracking branch 'origin/fix/1502' into fix/1502
2018-01-03 15:12:31 +13:00
Brenda Wallace
d86de897c7
Wrap long line
2018-01-03 15:12:09 +13:00
Brenda Wallace
466a9d6d8a
Merge remote-tracking branch 'upstream/dev' into dev
2018-01-03 15:10:08 +13:00
Shiny
0db3b3d532
Merge branch 'dev' into fix/1502
2018-01-03 15:10:00 +13:00
Brenda Wallace
a39c304fac
Fix ordering of crops' parent on form
2018-01-03 15:06:55 +13:00
Brenda Wallace
ee1617c7c3
Added new line at end of file
2018-01-03 14:43:29 +13:00
Brenda Wallace
0a71bfe99f
Tabulation and jsdoc fixes
2018-01-03 14:40:22 +13:00
Brenda Wallace
56b0562785
Removed unused variables in js
2018-01-03 14:24:08 +13:00
Brenda Wallace
2d98a7e793
Wrapped a long line
2018-01-03 14:21:29 +13:00
Brenda Wallace
978317f47a
more JSDoc
2018-01-03 14:20:01 +13:00
Brenda Wallace
4570fda384
removed 2 unused variable in js
2018-01-03 13:03:10 +13:00
Brenda Wallace
122a7f17e2
Fix up JSDoc
2018-01-03 13:01:48 +13:00
Brenda Wallace
591c95dca2
added JSDoc
2018-01-03 12:56:52 +13:00
Brenda Wallace
e910bfd50f
added JSDoc
2018-01-03 12:54:33 +13:00
Brenda Wallace
7c25161574
contributors/commits update
2018-01-03 12:48:13 +13:00
Brenda Wallace
0db2d6b346
converted variable to camel case
2018-01-03 12:42:20 +13:00
Brenda Wallace
5584da02c3
Some js cleanups
2018-01-03 12:35:30 +13:00
Brenda Wallace
7464668021
Add bootstrap js to codeclimate excludes
2018-01-03 12:02:21 +13:00
Brenda Wallace
29dcc01cde
Merge remote-tracking branch 'upstream/dev' into js/cleanup
2018-01-03 11:54:09 +13:00
Brenda Wallace
a836d6432f
Updating javascript style
2018-01-03 11:52:47 +13:00
Brenda Wallace
4e0f7e9086
Use the old "var" syntax, and max line 120
2018-01-03 11:49:06 +13:00
Brenda Wallace
93eba14af9
Adding package lock, and eslint
2018-01-03 11:28:12 +13:00
Shiny
7d51ba98ec
Merge pull request #1500 from Growstuff/bundle-update-2017-12-24-080947
...
Bundle Update on 2017-12-24
2017-12-24 16:43:34 +13:00
deppbot
4ba210cf81
Bundle Update on 2017-12-24
2017-12-24 08:09:48 +08:00
Cesy
c08beb5291
Merge pull request #1495 from Growstuff/dev
...
Release 37
2017-12-22 09:54:32 +00:00
pozorvlak
269f3164b7
Merge pull request #1497 from Br3nda/feature/admin-nicer
...
Nicer admin interface
2017-12-18 11:33:02 +00:00
Shiny
9d47b2b029
Merge branch 'dev' into feature/admin-nicer
2017-12-18 15:10:36 +13:00
Daniel O'Connor
81e26aaf02
Merge pull request #1496 from Br3nda/feature/ordering
...
Feature/ordering
2017-12-18 09:30:51 +10:30
Shiny
d62322b498
Merge branch 'dev' into feature/admin-nicer
2017-12-18 06:59:33 +13:00
Shiny
ebb2f90294
Merge branch 'dev' into feature/ordering
2017-12-18 06:59:17 +13:00
Shiny
72922a160d
Merge pull request #1498 from Growstuff/bundle-update-2017-12-18-000857
...
Bundle Update on 2017-12-18
2017-12-18 06:58:50 +13:00
deppbot
0699716c19
Bundle Update on 2017-12-18
2017-12-18 00:08:58 +08:00
Brenda Wallace
4c35987cb7
Ignore long method in ability.rb
2017-12-17 17:57:19 +13:00
Brenda Wallace
54e0806f38
don't check role is there's no member
2017-12-17 17:55:14 +13:00
Brenda Wallace
99828c7c01
Updated spec for new admin#index
2017-12-17 17:54:13 +13:00
Brenda Wallace
25d2773464
Use nested module/class definitions instead of compact style.
2017-12-17 17:50:30 +13:00
Brenda Wallace
233a30a045
Haml code style fix up
2017-12-17 17:49:05 +13:00
Brenda Wallace
01a7463ae8
Split up ability.rb into methods
2017-12-17 12:47:41 +13:00
Brenda Wallace
8a446ecbfc
Member admin
2017-12-17 12:45:19 +13:00
Brenda Wallace
efc60e6313
Nicer layout on editing roles
2017-12-17 12:11:55 +13:00
Brenda Wallace
406b2dbf04
Make admin index a bit nicer
2017-12-17 12:06:03 +13:00
Brenda Wallace
ac056b4eb5
Merge remote-tracking branch 'upstream/dev' into dev
2017-12-17 12:05:42 +13:00
Brenda Wallace
2394f4d237
One view for showing photos on an item
2017-12-17 11:40:55 +13:00
Brenda Wallace
2a4fd57050
Merge remote-tracking branch 'upstream/dev' into feature/ordering
2017-12-17 10:18:25 +13:00
Shiny
5c885d675e
Merge branch 'master' into dev
2017-12-17 10:05:25 +13:00
Shiny
0b08691160
Merge pull request #1474 from Br3nda/feature/photos-1457
...
Polymorphic relationship to photos
2017-12-17 10:04:30 +13:00
Brenda Wallace
b1052a2dbf
Order posts by most recent
2017-12-17 10:01:51 +13:00
Brenda Wallace
95a923ff5f
Order the plantings on the front page
2017-12-17 10:01:51 +13:00
deppbot
c8e34b640e
Bundle Update on 2017-12-14
2017-12-17 10:01:51 +13:00
Brenda Wallace
6f2b4b13cd
Only show photo pagination if there are photos
2017-12-17 09:55:52 +13:00
Brenda Wallace
970da53873
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-17 09:15:24 +13:00
Brenda Wallace
3aa2f0bd3b
Paginate photos on seeds#show (inc feature specs)
2017-12-17 08:55:08 +13:00
Shiny
8c1514bc04
Merge branch 'dev' into feature/photos-1457
2017-12-15 17:13:12 +13:00
Daniel O'Connor
d2e39f58d5
Merge pull request #1494 from Br3nda/fix/ordering
...
More ordering fixes
2017-12-15 12:57:08 +10:30
Brenda Wallace
3d3a3b669e
Order posts by most recent
2017-12-15 13:28:41 +13:00
Brenda Wallace
8697e56323
Order the plantings on the front page
2017-12-15 13:26:48 +13:00
Shiny
472b2eb192
Merge branch 'dev' into feature/photos-1457
2017-12-15 12:10:36 +13:00
Cesy
1698157d8d
Merge pull request #1492 from Growstuff/bundle-update-2017-12-14-201051
...
Bundle Update on 2017-12-14
2017-12-14 12:25:49 +00:00
deppbot
ff652ae234
Bundle Update on 2017-12-14
2017-12-14 20:10:52 +08:00
Shiny
b4fcf004cd
Merge pull request #1484 from Growstuff/dev
...
Release 36
2017-12-14 19:37:02 +13:00
Brenda Wallace
25e9ef892d
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-14 08:45:40 +13:00
Shiny
82149d4565
Merge branch 'dev' into feature/photos-1457
2017-12-14 08:44:31 +13:00
Brenda Wallace
fcd3e36e36
Removed commented out code
2017-12-14 08:42:51 +13:00
pozorvlak
b783448ec3
Merge pull request #1485 from Br3nda/planting-harvests
...
Show photos of a planting's harvests
2017-12-13 12:08:23 +00:00
pozorvlak
e8b5850bfe
Merge branch 'dev' into planting-harvests
2017-12-13 10:57:40 +00:00
pozorvlak
bca72680c4
Merge pull request #1490 from Br3nda/dependabot/npm_and_yarn/coffeelint-2.0.7
...
Bump coffeelint from 1.16.0 to 2.0.7
2017-12-13 10:57:18 +00:00
pozorvlak
358eb96684
Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7
2017-12-13 10:29:18 +00:00
pozorvlak
05807d41f4
Merge pull request #1491 from Br3nda/flickr-auth-fix
...
Fix Growstuff::OauthSignupAction not found error when connecting flickr
2017-12-13 10:27:16 +00:00
Shiny
96f1995768
Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7
2017-12-13 23:26:07 +13:00
Shiny
deefbbce71
Merge branch 'dev' into planting-harvests
2017-12-13 23:25:56 +13:00
Brenda Wallace
f8e51f4b45
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-13 22:35:29 +13:00
Brenda Wallace
1c8b75b7cb
add and show photos for seeds
...
close #1457
2017-12-13 22:34:16 +13:00
Brenda Wallace
1f66df0743
Fixed link to associated flickr, twitter, facebook accountss
...
fixes #1479
2017-12-13 22:23:22 +13:00
Brenda Wallace
72f52230a1
Fix Growstuff::OauthSignupAction not found error when connecting flickr account
2017-12-13 22:19:41 +13:00
Shiny
700fba58e8
Merge branch 'dev' into feature/photos-1457
2017-12-13 21:52:55 +13:00
Daniel O'Connor
acecbe93c1
Merge pull request #1487 from Growstuff/bundle-update-2017-12-11-160933
...
Bundle Update on 2017-12-11
2017-12-13 16:20:36 +10:00
dependabot[bot]
bafe2b7fd1
Bump coffeelint from 1.16.0 to 2.0.7
...
Bumps [coffeelint](https://github.com/clutchski/coffeelint ) from 1.16.0 to 2.0.7.
- [Commits](https://github.com/clutchski/coffeelint/commits )
2017-12-12 11:00:57 +00:00
Shiny
3be1454a69
Merge branch 'dev' into bundle-update-2017-12-11-160933
2017-12-12 12:36:54 +13:00
Shiny
232e5d50ac
Merge branch 'dev' into planting-harvests
2017-12-12 12:36:33 +13:00
pozorvlak
7207a39039
Merge pull request #1486 from Br3nda/cleanup/routes
...
Convert hashes in routes
2017-12-11 10:47:18 +00:00
deppbot
291f865f7f
Bundle Update on 2017-12-11
2017-12-11 16:09:34 +08:00
Brenda Wallace
47e82eb0a7
Convert hashes in routes
2017-12-10 19:50:08 +13:00
Brenda Wallace
08dc2a0513
Show photos of a planting's harvests
2017-12-09 22:24:51 +13:00
Brenda Wallace
4f64698403
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-09 20:59:56 +13:00
Brenda Wallace
14551b6ec8
Merge remote-tracking branch 'upstream/dev' into feature/photos-1457
...
Conflicts:
spec/models/crop_spec.rb
2017-12-09 20:59:20 +13:00
Shiny
5d44196947
Merge branch 'master' into dev
2017-12-09 13:28:10 +13:00
Shiny
1c41cb7b66
Merge pull request #1483 from Growstuff/bundle-update-2017-12-08-121126
...
Bundle Update on 2017-12-08
2017-12-09 08:25:36 +13:00
Shiny
c3c55eaa09
Merge branch 'dev' into bundle-update-2017-12-08-121126
2017-12-09 08:15:28 +13:00
pozorvlak
98aa9521fe
Merge pull request #1482 from Br3nda/ordering
...
Fixes to ordering
2017-12-08 12:04:48 +00:00
Shiny
96bb345ca9
Merge branch 'dev' into ordering
2017-12-08 20:20:27 +13:00
Shiny
9de991a075
Merge branch 'dev' into bundle-update-2017-12-08-121126
2017-12-08 20:19:39 +13:00
Shiny
f76619864c
Merge pull request #1477 from Br3nda/upgrade-rubocop
...
Rubocop upgrade (and some style fixes)
2017-12-08 20:19:08 +13:00
deppbot
ec149997b0
Bundle Update on 2017-12-08
2017-12-08 12:11:27 +08:00
Brenda Wallace
ac07f18b2d
Show most recent seeds first
2017-12-07 15:00:16 +13:00
Brenda Wallace
4ce3e8968f
crops#show order posts by most recent first
2017-12-07 14:58:57 +13:00
Brenda Wallace
cd35538b83
Order forums by name
2017-12-07 13:42:48 +13:00
Shiny
0f317f624e
Merge branch 'dev' into feature/photos-1457
2017-12-07 13:40:19 +13:00
Brenda Wallace
35d8461811
Order recent plantings by when they were planted
2017-12-07 13:39:32 +13:00
Brenda Wallace
8d03a3ffa8
Most recent photos is a crop's default photo
2017-12-06 21:47:01 +13:00
Brenda Wallace
2b0f199329
change string replacement for performance reasons
2017-12-06 15:19:34 +13:00
Brenda Wallace
24f18f78da
use bare percent literals
2017-12-06 14:33:51 +13:00
Brenda Wallace
3cc637017d
Avoid {} for multiline
2017-12-06 14:29:21 +13:00
Brenda Wallace
37f9dcd7dd
for simple loops, use Integer.times
2017-12-06 14:26:58 +13:00
Brenda Wallace
f516ef2e57
Don't use :: for method calls
2017-12-06 14:24:17 +13:00
Brenda Wallace
182c626226
Prefer if/unless modifier
2017-12-06 14:23:12 +13:00
Brenda Wallace
ea2fcd09dc
Fixed last old style word array
2017-12-06 14:18:51 +13:00
Brenda Wallace
878fc7ebcd
Use symbol procs
2017-12-06 14:17:34 +13:00
Brenda Wallace
3fdc23098e
Use perl names for cli script variables
2017-12-06 14:16:47 +13:00
Brenda Wallace
515325c44e
Fixed up % delimiters
2017-12-06 14:14:31 +13:00
Brenda Wallace
25b1836146
Removed nil comparison
2017-12-06 14:13:01 +13:00
Brenda Wallace
c925c95398
Use next, instead of a if wrapper
2017-12-06 14:11:27 +13:00
Brenda Wallace
2d00206abf
Converted sprintf to format
2017-12-06 14:10:26 +13:00
Brenda Wallace
f499f245de
Added new line after block end, for rubocpo
2017-12-06 14:08:05 +13:00
Brenda Wallace
35414391c3
modified spec to please rubocop
2017-12-06 14:07:18 +13:00
Brenda Wallace
1f7f4f52d1
Updated ability_spec.rb to use block end new lines
2017-12-06 14:02:48 +13:00
Brenda Wallace
b4efeee904
Merge remote-tracking branch 'origin/upgrade-rubocop' into upgrade-rubocop
2017-12-06 11:23:03 +13:00
Brenda Wallace
5b588bf9e9
Rubocop change namespace of some cops
2017-12-06 11:21:25 +13:00
Daniel O'Connor
07611e9a5d
Merge branch 'dev' into upgrade-rubocop
2017-12-05 11:38:52 +10:30
Daniel O'Connor
baa89a790f
Merge pull request #1480 from Growstuff/bundle-update-2017-12-05-081300
...
Bundle Update on 2017-12-05
2017-12-05 11:38:18 +10:30
deppbot
00395ae68b
Bundle Update on 2017-12-05
2017-12-05 08:13:00 +08:00
Shiny
41e26a2c74
Merge branch 'dev' into feature/photos-1457
2017-12-03 21:09:04 +13:00
Shiny
d7eb5e0014
Merge pull request #1472 from Growstuff/dev
...
Release 35
2017-12-02 21:16:29 +13:00
deppbot
f08d02f4c5
Bundle Update on 2017-12-02
2017-12-02 20:32:08 +13:00
Brenda Wallace
a6a7f789a3
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
Brenda Wallace
c4c659f159
DRY specs, and use create_list in crops model spec
2017-11-30 13:37:47 +13:00
Brenda Wallace
14b16b0d8c
Moved photo.items's item lookup to a class method
2017-11-30 11:23:34 +13:00
Brenda Wallace
697779e67c
Don't add item to photo is already there
2017-11-30 10:15:05 +13:00
Brenda Wallace
35ce8b84db
Adding a unique index on the items <--> photos table
2017-11-30 09:56:47 +13:00
Brenda Wallace
ccbdfe51f6
Modified a spec to avoid a chicken and an egg
2017-11-29 22:30:11 +13:00
Brenda Wallace
ff57176d60
Simplified the photos controller a bit
2017-11-29 22:13:03 +13:00
Brenda Wallace
12700d6268
Added polymorphic relationship to photos
2017-11-29 21:41:22 +13:00
Brenda Wallace
6ed7376c58
Name garden in spec to ensure it's ordered first
2017-11-29 20:59:37 +13:00
Brenda Wallace
c8a200bf19
Changed selector in view spec
...
it was having trouble finding the link
2017-11-29 20:59:37 +13:00
Brenda Wallace
a62b668781
Fix up duplicate order item in controller spec, and DRY
2017-11-29 20:59:37 +13:00
Brenda Wallace
09f82d5995
Tidy up home/crops partial view
2017-11-29 20:59:37 +13:00
Brenda Wallace
8d0bec34a6
Crops controller spec, use let, other cleanup
2017-11-29 20:59:37 +13:00
Brenda Wallace
d7ec4eacee
Fix sort on plant parts
2017-11-29 20:59:37 +13:00
Brenda Wallace
3a3f4eefbf
Added sort to members controller
2017-11-29 20:59:37 +13:00
Brenda Wallace
9e00023332
Fixed post ordering
2017-11-29 20:59:37 +13:00
Brenda Wallace
3058160a59
Removed an orderng spec for gardens
2017-11-29 20:59:37 +13:00
Brenda Wallace
e3886ce5b5
Fixed up unescaped model attribute
2017-11-29 20:59:37 +13:00
Brenda Wallace
48f8085e2d
Fix seeds order
2017-11-29 20:59:37 +13:00
Brenda Wallace
594e466fd4
Fixed photos ordering
2017-11-29 20:59:37 +13:00
Brenda Wallace
b813669d71
Updated shop controller specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
d0b8ae3411
Delete follows records when a member is deleted
2017-11-29 20:59:37 +13:00
Brenda Wallace
9c993e9f47
Plantings controller ordering and specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
d5fece87d0
Tests for comments#index (and bugfix)
2017-11-29 20:59:37 +13:00
Brenda Wallace
33816d4312
Use faker gem, in account types - and add controller specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
00e6aeed5c
seed.tradable was back to front logic. fixed
2017-11-29 20:59:37 +13:00
Brenda Wallace
0205b345d0
A planting's photo is their most recent photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
9f8a32e9f8
Feature plantings need to be ordered
2017-11-29 20:59:37 +13:00
Brenda Wallace
7357524271
Garden's default photo should be the most recent photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
6aa689b0d8
Removed some model ordering specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
962b3b574d
Fixed up planting spec to not care about ordering
2017-11-29 20:59:37 +13:00
Brenda Wallace
d77d1d9a77
spec for notifications needs to be agnostic about the order
2017-11-29 20:59:37 +13:00
Brenda Wallace
4bed6da422
Crop validation methods can be private
2017-11-29 20:59:37 +13:00
Brenda Wallace
023c870d49
Fix up crop.recent
2017-11-29 20:59:37 +13:00
Brenda Wallace
9aff65e956
Added ordering to finding first photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
0446c0a405
Add ordering back into controller #index
2017-11-29 20:59:37 +13:00
Brenda Wallace
7719d1f896
Remote default ordering scopes, and clean up models
2017-11-29 20:59:37 +13:00
Brenda Wallace
17fd6f61a5
Added polymorphic relationship to photos
2017-11-29 20:14:27 +13:00
Brenda Wallace
c9558e4d51
Merge branch 'master' into dev
...
Conflicts:
Gemfile.lock
2017-11-29 10:46:08 +13:00
deppbot
8a679670e4
Bundle Update on 2017-11-29
2017-11-29 07:00:25 +13:00
pozorvlak
a7586e9d2b
Merge pull request #1448 from Br3nda/fix/1211
...
upgrade leaflet-rails
2017-11-27 20:42:22 +00:00
Shiny
811011419e
Exit if we can't cd
2017-11-26 09:39:43 +13:00
Shiny
dae3ea2789
removed some debug
2017-11-25 19:41:41 +13:00
Shiny
49aa6bb846
Update .travis.yml
2017-11-25 19:41:03 +13:00
Brenda Wallace
c154a9b845
Upgraded leaflet maskercluster
2017-11-25 19:34:05 +13:00
Shiny
ad14ecb41b
Merge branch 'dev' into fix/1211
2017-11-25 17:03:23 +13:00
deppbot
08a73ce503
Bundle Update on 2017-11-24
2017-11-25 09:53:29 +13:00
Brenda Wallace
6663f3ade4
Add id and type back to photos#new
2017-11-24 19:02:54 +13:00
deppbot
451030761d
Bundle Update on 2017-11-21
2017-11-24 19:02:54 +13:00
Brenda Wallace
d4e4ca6519
Move planting's add photo button to _actions.haml
2017-11-24 19:02:54 +13:00
Brenda Wallace
284f0cddcd
Fix gardens actions, and add specs
...
A bug slipped into all garden display pages - and there were no tests that caught it.
This adds feature specs for gardens#index, which would have detected the un-initialised
variable in haml
2017-11-24 19:02:54 +13:00
Logan Gingerich
4ced7ee7e9
Whitespace fix, spec fix, and spec addition
2017-11-24 19:02:54 +13:00
Logan Gingerich
b60510e016
deleted line 70 on plantings view to clean up logic
2017-11-24 19:02:54 +13:00
Logan Gingerich
e85daa405b
Moved add photo button from garden show view to garden actions
2017-11-24 19:02:54 +13:00
Logan Gingerich
9ab83f7bbc
Adds a more prominent add photo button to garden and planting show views
2017-11-24 19:02:54 +13:00
Brenda Wallace
329e0106bb
Path remains same after sign out for our test cases
2017-11-24 19:02:54 +13:00
Brenda Wallace
4743fc7a63
Feature spec for showing item details on photo adding page
2017-11-24 19:02:54 +13:00
Brenda Wallace
c66a5b12a5
Reduced the tests of signout on photos/new
2017-11-24 19:02:54 +13:00
Brenda Wallace
f98bb32612
Shaved some yaks to remove a rescue from a controller
2017-11-24 19:02:54 +13:00
Brenda Wallace
771443ee85
Removed rescue in a controller
2017-11-24 19:02:54 +13:00
Brenda Wallace
1322ebd8e3
Use the ||= operator
2017-11-24 19:02:54 +13:00
Brenda Wallace
9e98db423e
Tidy up photos logic, and test of signin/out on photos#new
2017-11-24 19:02:54 +13:00
Logan Gingerich
305702f644
Refactored and specs updated
2017-11-24 19:02:54 +13:00
Logan Gingerich
1f4f806bb0
Now displays correctly for planting, harvest or garden
2017-11-24 19:02:54 +13:00
Logan Gingerich
6a17ba547f
fixes #1433 Says what item you're adding a photo to on photos#new
2017-11-24 19:02:54 +13:00
deppbot
3ffdc61428
Bundle Update on 2017-11-18
2017-11-24 19:02:54 +13:00
milesgould
bb6e9e32e6
De-deprecate controller and view specs
...
We deprecated controller and view specs on the grounds that they were
brittle, and were a poorer measure of user experience than feature
specs. However, feature specs have their own problems: they're much
slower to run, and flakier (see #901 ). We also ran into a few cases
where feature specs erroneously passed because they were checking for
the presence of a string that occurred in the error page!
Hence, we're cautiously un-deprecating controller and view specs.
Fixes #1132
2017-11-24 19:02:54 +13:00
Brenda Wallace
229396d9e7
Add id and type back to photos#new
2017-11-22 22:06:41 +13:00
Daniel O'Connor
0fa02272b0
Merge pull request #1465 from Growstuff/bundle-update-2017-11-21-121132
...
Bundle Update on 2017-11-21
2017-11-22 16:36:46 +10:30
deppbot
a91b8605c4
Bundle Update on 2017-11-21
2017-11-21 12:11:33 +08:00
pozorvlak
f1107b518c
Merge pull request #1460 from Br3nda/fix/gardens-index
...
Fix gardens actions, and add specs
2017-11-20 11:21:07 +00:00
Shiny
52d93a7ccd
Merge branch 'dev' into fix/1211
2017-11-19 18:22:02 +13:00
Brenda Wallace
d3df1e8f33
Move planting's add photo button to _actions.haml
2017-11-19 18:02:09 +13:00
Shiny
eb77715b70
Merge branch 'dev' into fix/gardens-index
2017-11-19 16:35:56 +13:00
Shiny
252910694d
Merge branch 'master' into dev
2017-11-19 16:34:58 +13:00
Brenda Wallace
bd063be3a9
Fix gardens actions, and add specs
...
A bug slipped into all garden display pages - and there were no tests that caught it.
This adds feature specs for gardens#index, which would have detected the un-initialised
variable in haml
2017-11-19 16:31:17 +13:00
Shiny
9a6d827b6d
Merge branch 'dev' into fix/1211
2017-11-19 11:14:09 +13:00
Logan Gingerich
ede5187369
Whitespace fix, spec fix, and spec addition
2017-11-19 11:13:41 +13:00
Logan Gingerich
610a5b7a48
deleted line 70 on plantings view to clean up logic
2017-11-19 11:13:41 +13:00
Logan Gingerich
1fa71c1546
Moved add photo button from garden show view to garden actions
2017-11-19 11:13:41 +13:00
Logan Gingerich
7574eb554e
Adds a more prominent add photo button to garden and planting show views
2017-11-19 11:13:41 +13:00
Shiny
eea7e19ecf
Merge branch 'dev' into fix/1211
2017-11-18 22:27:04 +13:00
Brenda Wallace
dafaffcd73
Path remains same after sign out for our test cases
2017-11-18 22:25:58 +13:00
Brenda Wallace
3e149a5d1d
Feature spec for showing item details on photo adding page
2017-11-18 22:25:58 +13:00
Brenda Wallace
c20d9b78c5
Reduced the tests of signout on photos/new
2017-11-18 22:25:58 +13:00
Brenda Wallace
7906d50d13
Shaved some yaks to remove a rescue from a controller
2017-11-18 22:25:58 +13:00
Brenda Wallace
faed8b019e
Removed rescue in a controller
2017-11-18 22:25:58 +13:00
Brenda Wallace
c8974a869f
Use the ||= operator
2017-11-18 22:25:58 +13:00
Brenda Wallace
3969f410f1
Tidy up photos logic, and test of signin/out on photos#new
2017-11-18 22:25:58 +13:00
Logan Gingerich
6304f230a5
Refactored and specs updated
2017-11-18 22:25:58 +13:00
Logan Gingerich
73524b8883
Now displays correctly for planting, harvest or garden
2017-11-18 22:25:58 +13:00
Logan Gingerich
fd9fc38def
fixes #1433 Says what item you're adding a photo to on photos#new
2017-11-18 22:25:58 +13:00
deppbot
949c7c31d8
Bundle Update on 2017-11-18
2017-11-18 15:27:04 +13:00
pozorvlak
e34dcd03bc
Merge pull request #1454 from pozorvlak/dedeprecate_view_specs
...
De-deprecate controller and view specs
2017-11-17 17:05:07 +00:00
pozorvlak
929229379e
Merge pull request #1455 from Growstuff/dev
...
Release 34
2017-11-17 16:55:01 +00:00
milesgould
d8bf8ae4df
De-deprecate controller and view specs
...
We deprecated controller and view specs on the grounds that they were
brittle, and were a poorer measure of user experience than feature
specs. However, feature specs have their own problems: they're much
slower to run, and flakier (see #901 ). We also ran into a few cases
where feature specs erroneously passed because they were checking for
the presence of a string that occurred in the error page!
Hence, we're cautiously un-deprecating controller and view specs.
Fixes #1132
2017-11-17 16:51:24 +00:00
pozorvlak
ac0e52f15d
Merge pull request #1412 from Br3nda/api
...
Basic read only api - members, gardens, plantings, crops, photos, harvests, seeds
2017-11-17 16:44:41 +00:00
Shiny
c7f427fe8a
Merge branch 'dev' into api
2017-11-18 00:48:03 +13:00
Shiny
50fd9ae9b0
Merge branch 'master' into dev
2017-11-18 00:44:44 +13:00
Brenda Wallace
efe39da878
Removed un-used method, to reduce class size
2017-11-18 00:43:17 +13:00
Brenda Wallace
1cd3c64590
Reducing class line count
2017-11-18 00:43:17 +13:00
Brenda Wallace
b591529892
Reinstated test of first harvest prediction display
2017-11-18 00:43:17 +13:00
Brenda Wallace
cef236d8f8
Reducing crop class size
2017-11-18 00:43:17 +13:00
Brenda Wallace
5ad0068142
Run existing crop specs with annual crop
2017-11-18 00:43:17 +13:00
Brenda Wallace
b8a5ff9acf
Don't show lifespan of perennials
2017-11-18 00:43:17 +13:00
deppbot
90653aa57f
Bundle Update on 2017-11-15
2017-11-18 00:43:17 +13:00
Shiny
80a4739f34
Underscore prefix on our last unused args ( #1442 )
2017-11-18 00:43:17 +13:00
Brenda Wallace
a6cc530fe5
Updating specs to use same owner for garden and planting
2017-11-18 00:43:17 +13:00
Brenda Wallace
97f19a0038
If a harvest has a planting, it must have the same owner
2017-11-18 00:43:17 +13:00
Brenda Wallace
140611d868
Get planting factory's owner from its garden
2017-11-18 00:43:17 +13:00
Brenda Wallace
3fa5ffc544
Planting's owner must be the same as its garden's owner
2017-11-18 00:43:17 +13:00
deppbot
eeafb4caa5
Bundle Update on 2017-11-12
2017-11-18 00:43:17 +13:00
Brenda Wallace
c747d46ab5
Request spec for seeds api
2017-11-17 23:22:10 +13:00
Brenda Wallace
3009ed2d83
Merge branch 'api' of github.com:Br3nda/growstuff into api
2017-11-17 23:16:16 +13:00
Shiny
f68a15c04e
Merge branch 'dev' into api
2017-11-17 22:02:12 +13:00
Brenda Wallace
06295fb9e9
Merge branch 'api' of github.com:Br3nda/growstuff into api
2017-11-17 22:02:06 +13:00
Brenda Wallace
c4a1806a87
Request spec for photos api
2017-11-17 22:01:37 +13:00
Brenda Wallace
fa5e151af0
Request spec for photos api
2017-11-17 22:00:32 +13:00
Brenda Wallace
13e8d1f5a5
Merge remote-tracking branch 'upstream/dev' into api
2017-11-17 21:51:39 +13:00
Brenda Wallace
c1836cc78e
Removed un-used method, to reduce class size
2017-11-17 21:50:59 +13:00
Brenda Wallace
28fdb6e1ed
Reducing class line count
2017-11-17 21:50:59 +13:00
Brenda Wallace
67dec795a0
Reinstated test of first harvest prediction display
2017-11-17 21:50:59 +13:00
Brenda Wallace
86ea8eab39
Reducing crop class size
2017-11-17 21:50:59 +13:00
Brenda Wallace
8884056ff3
Run existing crop specs with annual crop
2017-11-17 21:50:59 +13:00
Brenda Wallace
d01a5d7976
Don't show lifespan of perennials
2017-11-17 21:50:59 +13:00
pozorvlak
66c08650ba
Merge pull request #1445 from Br3nda/feature/planting-garden-owner-match
...
planting owner needs to match garden owner
2017-11-15 17:49:00 +00:00
Shiny
521873b656
Merge branch 'dev' into feature/planting-garden-owner-match
2017-11-15 09:27:41 +13:00
Shiny
83fea92353
Merge branch 'dev' into fix/1211
2017-11-15 09:27:17 +13:00
deppbot
2060d9ab9e
Bundle Update on 2017-11-15
2017-11-15 09:26:47 +13:00
Shiny
1795b27152
Merge branch 'dev' into feature/planting-garden-owner-match
2017-11-13 23:09:04 +13:00
Shiny
1317ce9db0
Merge branch 'dev' into fix/1211
2017-11-13 23:08:38 +13:00
Shiny
93193c9fba
Merge branch 'dev' into api
2017-11-13 23:00:33 +13:00
Brenda Wallace
e489831241
Debugging phantom on travis
2017-11-13 23:00:05 +13:00
Shiny
df7a9448b0
Underscore prefix on our last unused args ( #1442 )
2017-11-13 09:54:55 +00:00
Brenda Wallace
3d4f5c6917
upgrade leaflet-rails
2017-11-13 21:49:00 +13:00
Brenda Wallace
1b4d77e017
Requests spec for member api
2017-11-13 20:03:39 +13:00
Brenda Wallace
08e7c7dd29
Request specs for harvests api
2017-11-13 19:19:18 +13:00
Brenda Wallace
5fec826c41
Add more attributes to crops
2017-11-13 19:19:18 +13:00
Brenda Wallace
c29234c40c
Request specs for crops api
2017-11-13 19:19:18 +13:00
Brenda Wallace
2f0cb5c815
DRY the api specs
2017-11-13 19:19:18 +13:00
Brenda Wallace
b6cbfe25d2
Factory girl becomes factory bot
2017-11-13 19:19:18 +13:00
Brenda Wallace
d8f5876518
Added predictions to planting api, and added specs
2017-11-13 19:19:18 +13:00
Brenda Wallace
ae2cbf0bec
requests spec for modifying immutable gardens on api
2017-11-13 19:19:18 +13:00
Brenda Wallace
c9d5c42814
Plantings have many harvests
2017-11-13 19:19:18 +13:00
Brenda Wallace
b60f47f502
Add more relationships to members on the api
2017-11-13 19:19:18 +13:00
Brenda Wallace
d86e0af5ad
Request for for getting api gardens#index
2017-11-13 19:19:18 +13:00
Brenda Wallace
fc0058d677
all our api controllers inheriting from base
2017-11-13 19:19:18 +13:00
Brenda Wallace
41110f96d1
Put immutable on every resource
2017-11-13 19:19:18 +13:00
Brenda Wallace
33822abf93
crops have harvests
2017-11-13 19:19:18 +13:00
Brenda Wallace
5877da95a6
Added a base resource, a little more DRY
2017-11-13 19:19:18 +13:00
Brenda Wallace
88a119deac
Add a default paginator for api responses
2017-11-13 19:19:18 +13:00
Brenda Wallace
d07fd1a277
Added seeds and harvests to api, and tidied up resources
2017-11-13 19:19:18 +13:00
Brenda Wallace
c96695258b
Basic read only api
2017-11-13 19:19:18 +13:00
Brenda Wallace
2fbba52bc8
Updating specs to use same owner for garden and planting
2017-11-13 19:18:14 +13:00
Brenda Wallace
a2ae429f6b
If a harvest has a planting, it must have the same owner
2017-11-13 19:18:14 +13:00
Brenda Wallace
7ca76e69cf
Get planting factory's owner from its garden
2017-11-13 19:18:14 +13:00
Brenda Wallace
c6824b1262
Planting's owner must be the same as its garden's owner
2017-11-13 19:18:14 +13:00
Shiny
2a74c057f3
Merge branch 'master' into dev
2017-11-12 09:30:45 +13:00
deppbot
85cc9e77c6
Bundle Update on 2017-11-12
2017-11-12 09:29:21 +13:00
pozorvlak
a0d6d154f0
Merge pull request #1439 from Growstuff/dev
...
Release 32
2017-11-10 16:25:42 +00:00
pozorvlak
7e9707e3b0
Merge pull request #1437 from Br3nda/feature/harvest-predictions
...
Feature/harvest predictions
2017-11-10 11:59:00 +00:00
Brenda Wallace
4fe0dba28e
Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions
2017-11-09 18:30:18 +13:00
Shiny
328037b8c0
Merge branch 'master' into dev
2017-11-09 18:19:57 +13:00
Brenda Wallace
e4ab5114f7
Remove duplicate setting of medians in migration
2017-11-09 17:51:18 +13:00
Brenda Wallace
a5d43af899
Drop the plantings.days_before_maturity column
...
it's not used anywhere
2017-11-09 17:43:00 +13:00
Brenda Wallace
2d384c9851
Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions
2017-11-09 17:36:50 +13:00
Brenda Wallace
205247b136
Shorter condition in haml view (progress)
2017-11-09 17:36:37 +13:00
Brenda Wallace
963a182981
simplified logic in planting's first/last harvest fetcher
2017-11-09 17:36:33 +13:00
Daniel O'Connor
1090db6d21
Merge pull request #1438 from Growstuff/bundle-update-2017-11-08-201231
...
Bundle Update on 2017-11-08
2017-11-09 09:27:31 +11:00
deppbot
f187b31653
Bundle Update on 2017-11-08
2017-11-08 20:12:32 +08:00
Brenda Wallace
809dd81378
"Changed last_harvest" to "days_to_last_harvest"
2017-11-08 17:17:58 +13:00
Brenda Wallace
62beec23a1
"Changed first_harvest" to "days_to_first_harvest"
2017-11-08 17:17:15 +13:00
Brenda Wallace
a60a5ce591
Added a space, to please hound
2017-11-07 09:46:19 +13:00
Brenda Wallace
7206f99510
Updated spec to match new crop detail page text
2017-11-07 08:39:45 +13:00
Brenda Wallace
bf6475da57
annual? perennial!=true
2017-11-06 23:15:08 +13:00
Brenda Wallace
c5971cd46b
A little bit of eager loading
2017-11-06 23:13:36 +13:00
Brenda Wallace
2f47eeb7b3
Bug fix. Can only predict if we have harvested_at and planted_at
2017-11-06 23:12:28 +13:00
Brenda Wallace
928749aaad
Changed a "Pictures" header to "Photos" to be consistent
2017-11-06 23:11:39 +13:00
Brenda Wallace
1d64d4d1d2
Clearer message that predctions are for days after planting
2017-11-06 23:10:55 +13:00
Brenda Wallace
1e86cf7662
Update planting medians after updating record
...
So changes to the planted_at are re-calculated
2017-11-06 23:07:44 +13:00
Brenda Wallace
941dab7c4a
Crop.annual? method
2017-11-06 23:00:16 +13:00
Brenda Wallace
2696d12771
Removed duplicate display of last harvest
2017-11-06 22:59:04 +13:00
Brenda Wallace
6bf87c243c
Feature spec for crop predictions on crop#show
2017-11-06 22:38:48 +13:00
Brenda Wallace
ec63d8086f
Moved crop predictions to own haml file
2017-11-06 22:36:47 +13:00
Brenda Wallace
470aacd1c9
Fixed %w for an array of words
2017-11-06 09:11:27 +13:00
Brenda Wallace
9997c365d8
Update robocop todo - to reflect progress
2017-11-05 20:44:41 +13:00
Brenda Wallace
eaa65fda9e
update median_last_harvest too, with specs
2017-11-05 20:28:51 +13:00
Brenda Wallace
e844eade94
Changed model validators message to please Hound
2017-11-05 20:09:21 +13:00
Brenda Wallace
35e7b6a5b4
Removed an ignore from rubocop
2017-11-05 19:55:00 +13:00
Brenda Wallace
6c33c335d8
Default ordering for harvests are gone, so order it in spec
2017-11-05 19:26:50 +13:00
Brenda Wallace
26537943e3
Removed pending spec
2017-11-05 18:00:49 +13:00
Brenda Wallace
136c082003
Smaller photos on crop page. Fits in the predictions data
2017-11-05 17:47:19 +13:00
Brenda Wallace
b3fd8e32d0
Fixed ordering of Harvests - don't order in scope.
2017-11-05 17:42:59 +13:00
Brenda Wallace
9b1b22afa8
Bugfix and specs for first and last harvest
2017-11-05 17:33:58 +13:00
Brenda Wallace
996706ee78
Tests for planting lifespan predictions when there's no crop data
2017-11-05 17:29:42 +13:00
Brenda Wallace
9d11bcc039
Can't calculate first harvest if there are no harvests
2017-11-05 16:20:51 +13:00
Brenda Wallace
b1684b0156
Set prediction data for existing planting and crops
2017-11-05 14:16:00 +13:00
Brenda Wallace
ec00baef0d
Updated feature spec to look for new annual/perennial text
2017-11-05 14:07:33 +13:00
Brenda Wallace
eb585611fe
Fixed spec to call update_lifespan_medians
2017-11-05 14:05:54 +13:00
Brenda Wallace
9280049a84
Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions
2017-11-05 13:45:08 +13:00
Brenda Wallace
53d7fd1479
Displaying predicted first harvest on plantings and crops
2017-11-05 13:43:00 +13:00
Brenda Wallace
4cc0f77bd0
Predicting first harvest - updating medians
2017-11-05 13:42:30 +13:00
Brenda Wallace
5e5773aa59
feature spec for displaying annual/perennial on crops#show
2017-11-05 12:52:02 +13:00
deppbot
2422939b4f
Bundle Update on 2017-11-04
2017-11-04 20:10:52 +13:00
Brenda Wallace
d5a1a683f1
Rubocop fix
2017-11-04 15:44:56 +13:00
Brenda Wallace
f5bb47e4ca
DRY plantings controller a bit more - update crop means in one place
2017-11-04 15:36:51 +13:00
Brenda Wallace
8359218294
Update crop medians after deletion of planting (not before)
2017-11-04 11:53:40 +13:00
Brenda Wallace
285e6edc61
crop -> sci_names needs dependent:destroy so we don't get orphans
2017-11-04 11:51:19 +13:00
Brenda Wallace
f2fac9db1b
Time.zone.local
2017-11-04 11:39:53 +13:00
Brenda Wallace
cabc4fd030
%i-literals should be delimited by ( and )
2017-11-04 10:29:31 +13:00
Brenda Wallace
20fe9e4cc5
Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions
2017-11-04 10:09:53 +13:00
pozorvlak
fac24c5e99
Merge pull request #1423 from Growstuff/dev
...
Release 31
2017-11-03 08:32:35 +00:00
Logan Gingerich
fa600bea9e
changed spec to reflect factorybot change
2017-11-03 14:53:20 +13:00
Logan Gingerich
99e7fb1f7d
Name added to contributors and spec added
2017-11-03 14:53:20 +13:00
Logan Gingerich
81e22d6fb2
fixes #1419 - Allows brackets in garden names
2017-11-03 14:53:20 +13:00
Logan Gingerich
10a8df47a9
Factorygirl to factorybot - fixes #1413 ( #1425 )
...
* FactoryGirl Changed to FactoryBot
file fix
changes based on comments received
Bundle Update on 2017-10-29
style update to align hash literal
added package-lock
* indentation fixes with rubocop
* name added to contributors
2017-11-01 15:03:31 +00:00
pozorvlak
b0a4df629c
Merge pull request #1429 from Br3nda/delimiters
...
Stop hound and codeclimate fighing over delimiter styles
2017-11-01 10:00:44 +00:00
Brenda Wallace
0b8357a261
Merge branch 'delimiters' into feature/harvest-predictions
2017-11-01 15:14:06 +13:00
Brenda Wallace
7104781d1b
Rubocop array fix ups
2017-11-01 15:13:32 +13:00
Brenda Wallace
267f27b3f8
rubocop fix up
2017-11-01 14:48:42 +13:00
Brenda Wallace
31a37bf6dc
No progress bar for perennials
2017-11-01 14:27:03 +13:00
Brenda Wallace
d1951b8b65
Edit and show perennial plants
2017-11-01 14:22:39 +13:00
Brenda Wallace
cd99769311
Wrapped a long line
2017-11-01 14:02:56 +13:00
Brenda Wallace
71cb3f8c5f
Rubocop fixes
2017-11-01 13:57:49 +13:00
Brenda Wallace
d540342acb
removed the days_before_maturity specs because function no longer exists
2017-11-01 13:57:49 +13:00
Brenda Wallace
f66b0768e2
Changed how db schema is loaded in travis
2017-11-01 13:57:49 +13:00
Brenda Wallace
251f44b0c7
Updated tests of progress bar
2017-11-01 13:57:49 +13:00
Brenda Wallace
adf07ce5ef
Planting feature specs passing
2017-11-01 13:57:49 +13:00
Brenda Wallace
54b204c636
fixed typo
2017-11-01 13:57:49 +13:00
Brenda Wallace
ff446c2139
Updated spec, new message when not enough data to predict progress
2017-11-01 13:57:49 +13:00
Brenda Wallace
62d84d7af4
planting progress is 100% if finished
2017-11-01 13:57:49 +13:00
Brenda Wallace
92fa09a1d3
Mark harvest predictions as pending
2017-11-01 13:57:49 +13:00
Brenda Wallace
b09c4aa7a1
Update display, to show predicted finish date
2017-11-01 13:57:49 +13:00
Brenda Wallace
692ab59285
Display expected finished date
2017-11-01 13:57:49 +13:00
Brenda Wallace
302bdba150
fixes search
2017-11-01 13:57:49 +13:00
Brenda Wallace
aa3057056f
rubocop fix up
2017-11-01 13:57:49 +13:00
Brenda Wallace
9ef40532ad
removed old percentage grow specs
2017-11-01 13:57:49 +13:00
Brenda Wallace
70ba8c8421
Updating planting model specs, for predictions
2017-11-01 13:57:49 +13:00
Brenda Wallace
3b81affbe5
include child records when reading plantings from db
2017-11-01 13:57:49 +13:00
Brenda Wallace
9703d4e983
Remove harvest preductions for now
2017-11-01 13:57:49 +13:00
Brenda Wallace
22e1718ce6
Rubocop fix ups
2017-11-01 13:57:49 +13:00
Brenda Wallace
b90b4e42fb
Updated progress bar to use new predictions
2017-11-01 13:57:49 +13:00
Brenda Wallace
202f557e32
Delete the old predictions code
2017-11-01 13:57:49 +13:00
Brenda Wallace
8364c8c688
updated schema
2017-11-01 13:57:49 +13:00
Brenda Wallace
3a286cd240
Show median lifespan of a crop
2017-11-01 13:57:49 +13:00
Brenda Wallace
41dbf6fb1b
Moved crop search out of crop model file
2017-11-01 13:57:49 +13:00
Brenda Wallace
47ecbe3f94
Call the predictions update on planting modifications from controller
2017-11-01 13:57:49 +13:00
Brenda Wallace
0f066ab302
Cleaning up models as adding predictions
2017-11-01 13:57:49 +13:00
Brenda Wallace
8e94ddb4bf
Moved planting predictions to crop
2017-11-01 13:57:49 +13:00
Brenda Wallace
a9cedc6a8a
Add active median gem
2017-11-01 13:57:49 +13:00
Brenda Wallace
7d6c49d8c3
Set harvest preductions on plantings
2017-11-01 13:57:49 +13:00
Brenda Wallace
0d8ca89b14
harvested_at and harvest_predicted_at added to plantings
2017-11-01 13:57:49 +13:00
Brenda Wallace
82a37d69bc
Ensure harvests are same crop, and after the planting was planted
2017-11-01 13:57:49 +13:00
Shiny
4533d35fe7
Merge branch 'dev' into delimiters
2017-11-01 13:27:26 +13:00
deppbot
4b445907d5
Bundle Update on 2017-11-01
2017-11-01 13:27:10 +13:00
Brenda Wallace
fce6395d21
Stop hound and codeclimate fighing over delimiter styles
2017-11-01 13:21:42 +13:00
deppbot
2946dca5fc
Bundle Update on 2017-10-29
2017-10-30 20:20:50 +13:00
Shiny
9eb6d84e5a
Merge branch 'master' into dev
2017-10-28 10:43:34 +13:00
Brenda Wallace
96b4742e78
Dev is almost always on port 3000
2017-10-28 10:38:51 +13:00
pozorvlak
68c14a695e
Merge pull request #1416 from Br3nda/feature/more-crop-photos
...
All crop photos
2017-10-27 12:57:43 +01:00
Brenda Wallace
e42ec4f8ae
Test crop photo display when not signed in
2017-10-27 23:43:23 +13:00
Brenda Wallace
f7b75157e7
Feature spec for harvest photos
2017-10-27 23:34:37 +13:00
Brenda Wallace
7e27b6deef
Merge branch 'feature/more-crop-photos' of github.com:Br3nda/growstuff into feature/more-crop-photos
2017-10-27 23:33:01 +13:00
Shiny
cd69ea1487
Merge branch 'dev' into feature/more-crop-photos
2017-10-27 23:32:46 +13:00
Brenda Wallace
4cdcbdac19
Merge remote-tracking branch 'origin/feature/more-crop-photos' into feature/more-crop-photos
2017-10-26 20:32:55 +13:00
Brenda Wallace
f3d03c00b2
Merge remote-tracking branch 'upstream/dev' into feature/more-crop-photos
2017-10-26 20:31:23 +13:00
deppbot
d9aa9df7fe
Bundle Update on 2017-10-26
2017-10-26 10:42:31 +13:00
pozorvlak
494dd1d658
Merge pull request #1411 from Growstuff/dev
...
Release 30
2017-10-25 08:16:42 +01:00
Shiny
af60489459
Merge branch 'dev' into feature/more-crop-photos
2017-10-24 10:32:57 +13:00
Brenda Wallace
a3a88c48de
Randomise the crops on the homepage
2017-10-23 22:09:34 +01:00
Brenda Wallace
f3e88f5aae
Include harvest photos on crop page
2017-10-24 09:34:10 +13:00
Brenda Wallace
1e81dac699
All crop photos; crops-> photos route
2017-10-24 09:34:03 +13:00
Brenda Wallace
705240014a
Link harvest thumbnails to harvests
...
to be consistent with the rest of the site
2017-10-23 11:07:27 +01:00
Brenda Wallace
78aa049502
Fixed comment model spec
2017-10-23 10:44:37 +01:00
Brenda Wallace
97c7277a73
fixed up ambigous regex and use of expect in specs
2017-10-23 10:44:37 +01:00
Brenda Wallace
0e0af44d9f
post show specs, use expect syntax, and more tests for js injection
2017-10-23 10:44:37 +01:00
Brenda Wallace
45af8d5f4f
Converting to expect syntax
2017-10-23 10:44:37 +01:00
deppbot
a1ee822690
Bundle Update on 2017-10-22
2017-10-23 14:55:15 +13:00
Brenda Wallace
b6e61eba7a
Merge branch 'master' into dev-conflict-fix
2017-10-22 11:30:43 +13:00
Brenda Wallace
b356d86931
Allow inline style on the progress bar width
2017-10-21 22:48:37 +01:00
Brenda Wallace
34f91c2189
Wrap garden overview buttons to right of photo on small screens
2017-10-21 22:48:37 +01:00
Brenda Wallace
faf3f60e78
small screen gardens overview
2017-10-21 22:48:37 +01:00
Brenda Wallace
e3113fd53d
Re-work gardens#index to show planting progress
2017-10-21 22:48:37 +01:00
Brenda Wallace
68768c4d6a
Fixed redirection after planting is deleted
2017-10-21 22:48:37 +01:00
pozorvlak
da7fec5e0b
Merge pull request #1405 from Br3nda/fix-1379
...
Display messages even when member is deleted
2017-10-20 16:10:51 +01:00
Brenda Wallace
191c8e4e9d
Display messages even when member is deleted
2017-10-20 23:44:51 +13:00
deppbot
edc763cd8c
Bundle Update on 2017-10-19
2017-10-20 23:23:02 +13:00
Brenda Wallace
fdfb116d92
Ignore one Style/ClassAndModuleChildren
2017-10-19 08:22:40 +13:00
Brenda Wallace
888e0669a0
Added hound config
2017-10-19 08:22:40 +13:00
Brenda Wallace
d55e2b5466
Update heroku maintenance script
...
maintenance is just an attribute now
2017-10-19 08:22:40 +13:00
Brenda Wallace
c28ae4fe83
Use ! to indicate the method changes class variables
2017-10-19 08:22:40 +13:00
Brenda Wallace
4b4669459e
Fixed duplicated code in growstuff member link markdown
2017-10-19 08:22:40 +13:00
Brenda Wallace
77902ad300
Moved member look up to a method (less duplicate code)
2017-10-19 08:22:40 +13:00
Brenda Wallace
f314fcd919
Fixed members link in growstuff markdown
2017-10-19 08:22:40 +13:00
Brenda Wallace
8171c12a5b
Fixed links to crops in growstuff markdown
2017-10-19 08:22:40 +13:00
Brenda Wallace
08b6b46bfa
Removed some rubocop todos
2017-10-19 08:22:40 +13:00
Brenda Wallace
bf189092ea
More simplification of growstuff markup
2017-10-19 08:22:40 +13:00
Brenda Wallace
a539a47044
Reduced complexity of growstuff_markdown
2017-10-19 08:22:40 +13:00
Brenda Wallace
e29ac8827a
Another code style fixup
2017-10-19 08:22:40 +13:00
Brenda Wallace
c5cee72ae5
Migrate to new heroku platform api - maintenance mode trigger
2017-10-19 08:22:40 +13:00
deppbot
5396550a8a
Bundle Update on 2017-10-16
2017-10-19 08:22:40 +13:00
deppbot
76d2fb37b4
Bundle Update on 2017-09-28
2017-10-19 08:22:40 +13:00
deppbot
a42676ef0a
Bundle Update on 2017-09-25
2017-10-19 08:22:40 +13:00
Brenda Wallace
3f3fc6a4ca
Only install elastic search in travis on the matix that tests elasticsearch
2017-10-19 08:22:40 +13:00
Brenda Wallace
c710a8b1ef
Outputs which version of elasticsearch we are running on travis
2017-10-19 08:22:40 +13:00
Brenda Wallace
6ada0c4f84
Install elastic search 2.4.0 when running on travis
2017-10-19 08:22:40 +13:00
Brenda Wallace
2e5a2455d6
Sleep before tests
...
as suggested here https://docs.travis-ci.com/user/database-setup/#ElasticSearch
2017-10-19 08:22:40 +13:00
Brenda Wallace
d89d4cea39
Further gem updates
2017-10-19 08:22:40 +13:00
Brenda Wallace
01a82ac993
Use floats, so the percentage calc works
2017-10-19 08:22:40 +13:00
Brenda Wallace
68660b3c65
update from erubi to erubis gem broke stuff - rolling back
2017-10-19 08:22:40 +13:00
Brenda Wallace
67b4f3558e
Set required executable to jshint linting
2017-10-19 08:22:40 +13:00
Brenda Wallace
63b973833f
Don't need to create database if just running linters
2017-10-19 08:22:40 +13:00
Brenda Wallace
4b19f73eb8
Remove git guilt
2017-10-19 08:22:40 +13:00
Brenda Wallace
9b4d6044ef
Specify the executable in the npm installed linters
2017-10-19 08:22:40 +13:00
Brenda Wallace
9c70ffe051
Specify the executable in the npm installed linters
2017-10-19 08:22:40 +13:00
Brenda Wallace
e7a1d2345d
Bundle update and change to platform-api instead of heroku
2017-10-19 08:22:40 +13:00
Brenda Wallace
c7585f1931
Use string.start_with? instead of a regexp
2017-10-19 08:22:40 +13:00
Brenda Wallace
63b76d175d
Changed regex to matches? to appease rubocop
2017-10-19 08:22:40 +13:00
Brenda Wallace
1d5d2cc704
Added xmlrpc gem to solve rake errors on travis
2017-10-19 08:22:40 +13:00
Brenda Wallace
9477b4f9c7
Bump ruby version to 2.4.1
2017-10-19 08:22:40 +13:00
deppbot
a42a61abdd
Bundle Update on 2017-08-03
2017-10-19 08:22:40 +13:00
pozorvlak
62eaa07862
Merge pull request #1401 from Br3nda/fix/codestyle
...
Another code style fixup
2017-10-18 10:52:38 +01:00
pozorvlak
f26420c380
Merge branch 'dev' into fix/codestyle
2017-10-18 10:41:03 +01:00
pozorvlak
6de13b7327
Merge pull request #1402 from Br3nda/fix/heroku-deploys
...
Update heroku maintenance script - maintenance is just an attribute now
2017-10-18 10:34:33 +01:00
Brenda Wallace
310f631f40
Ignore one Style/ClassAndModuleChildren
2017-10-18 20:45:27 +13:00
Brenda Wallace
bec59aba43
Merge remote-tracking branch 'origin/fix/codestyle' into fix/codestyle
2017-10-18 19:27:36 +13:00
Brenda Wallace
c86902967d
Merge remote-tracking branch 'upstream/dev' into fix/codestyle
2017-10-18 19:27:08 +13:00
Brenda Wallace
361e3df692
Added hound config
2017-10-18 19:26:36 +13:00
Shiny
ce18bef892
Merge branch 'dev' into fix/codestyle
2017-10-18 14:01:57 +13:00
Shiny
ac2b0d04ea
Merge branch 'dev' into fix/heroku-deploys
2017-10-18 13:40:52 +13:00
Brenda Wallace
9d0b48b84c
Update heroku maintenance script
...
maintenance is just an attribute now
2017-10-18 13:37:54 +13:00
Brenda Wallace
d8f41b5ca0
Use ! to indicate the method changes class variables
2017-10-18 12:20:28 +13:00
Brenda Wallace
b5fbfaf515
Fixed duplicated code in growstuff member link markdown
2017-10-18 12:13:05 +13:00
Brenda Wallace
ce9a71cdad
Moved member look up to a method (less duplicate code)
2017-10-18 12:10:59 +13:00
Brenda Wallace
42a10bcd80
Fixed members link in growstuff markdown
2017-10-18 12:10:04 +13:00
Brenda Wallace
33656a4104
Fixed links to crops in growstuff markdown
2017-10-18 12:05:22 +13:00
pozorvlak
ca200c1f30
Merge pull request #1400 from Br3nda/fix/heroku-deploys
...
Migrate to new heroku platform api - maintenance mode trigger
2017-10-17 14:52:16 +01:00
Brenda Wallace
ccd352d699
Removed some rubocop todos
2017-10-17 22:33:22 +13:00
Brenda Wallace
bd396dabfe
More simplification of growstuff markup
2017-10-17 22:29:02 +13:00
Brenda Wallace
1279dd63bc
Reduced complexity of growstuff_markdown
2017-10-17 22:20:17 +13:00
Brenda Wallace
8d681dd90a
Another code style fixup
2017-10-17 17:29:48 +13:00
Brenda Wallace
dfd0e1dbf5
Migrate to new heroku platform api - maintenance mode trigger
2017-10-17 16:23:12 +13:00
deppbot
0d555542c2
Bundle Update on 2017-10-16
2017-10-16 18:46:50 +13:00
deppbot
99a69cd492
Bundle Update on 2017-09-28
2017-10-16 14:52:16 +13:00
deppbot
e8e9aa23b2
Bundle Update on 2017-09-25
2017-09-25 09:34:12 +13:00
pozorvlak
2fafc6f3e4
Merge pull request #1391 from Br3nda/feature/bundle-update-and-heroku-api-change
...
Bundle update and change to platform-api instead of heroku
2017-09-24 14:59:44 +01:00
Brenda Wallace
6b1714eb05
Only install elastic search in travis on the matix that tests elasticsearch
2017-09-24 18:50:23 +13:00
Brenda Wallace
8e5c52e85e
Outputs which version of elasticsearch we are running on travis
2017-09-24 18:40:50 +13:00
Brenda Wallace
c749f4a813
Install elastic search 2.4.0 when running on travis
2017-09-24 18:35:39 +13:00
Brenda Wallace
5ed5f9ec7e
Sleep before tests
...
as suggested here https://docs.travis-ci.com/user/database-setup/#ElasticSearch
2017-09-24 15:17:39 +13:00
Brenda Wallace
f4658df208
Further gem updates
2017-09-24 14:28:51 +13:00
Brenda Wallace
e21b95a353
Use floats, so the percentage calc works
2017-09-13 22:21:15 +12:00
Brenda Wallace
19205cb6a8
update from erubi to erubis gem broke stuff - rolling back
2017-09-13 22:08:21 +12:00
Brenda Wallace
17521cde17
Set required executable to jshint linting
2017-09-13 22:01:33 +12:00
Brenda Wallace
5f7d48c633
Don't need to create database if just running linters
2017-09-05 14:30:03 +12:00
Brenda Wallace
94bb3bf6bb
Remove git guilt
2017-09-05 14:22:52 +12:00
Brenda Wallace
c9aacd0110
Specify the executable in the npm installed linters
2017-09-05 14:20:28 +12:00
Brenda Wallace
ca5f14bb37
Specify the executable in the npm installed linters
2017-09-05 14:19:24 +12:00
Brenda Wallace
43da004ccb
Bundle update and change to platform-api instead of heroku
2017-09-05 13:58:56 +12:00
Cesy
2704fcf515
Merge pull request #1387 from Br3nda/ruby-2-4-1
...
Bump ruby version to 2.4.1
2017-09-04 11:21:40 +01:00
Shiny
1af19335d7
Merge branch 'dev' into ruby-2-4-1
2017-09-01 13:00:46 +12:00
Shiny
4d33c32866
Merge branch 'master' into dev
2017-09-01 12:20:15 +12:00
Brenda Wallace
01333bf965
Use string.start_with? instead of a regexp
2017-09-01 12:11:57 +12:00
Brenda Wallace
a145abff56
Changed regex to matches? to appease rubocop
2017-08-31 21:27:22 +12:00
Brenda Wallace
9732553d3b
Added xmlrpc gem to solve rake errors on travis
2017-08-31 21:04:55 +12:00
Brenda Wallace
9142613b6b
Bump ruby version to 2.4.1
2017-08-22 13:49:43 +12:00
Cesy
7132c95b61
Merge pull request #1382 from Growstuff/bundle-update-2017-08-03-163455
...
Bundle Update on 2017-08-03
2017-08-21 09:40:49 +01:00
Shiny
38b2d8de0f
Merge branch 'dev' into master
2017-08-20 17:25:01 +12:00
Shiny
8f76ccf836
Merge branch 'dev' into bundle-update-2017-08-03-163455
2017-08-20 17:21:38 +12:00
ancyentMariner
491982f8f3
added security contact info to readme
...
udpated to actual email address
added name to contributors
2017-08-20 17:21:14 +12:00
deppbot
58e6411bbe
Bundle Update on 2017-08-03
2017-08-03 16:34:56 +08:00
Daniel O'Connor
ac7e116eae
Merge pull request #1375 from Growstuff/bundle-update-2017-07-25-161454
...
Bundle Update on 2017-07-25
2017-08-03 14:17:43 +09:30
deppbot
1526257a0d
Bundle Update on 2017-07-25
2017-07-25 16:14:55 +08:00
deppbot
7234848c5f
Bundle Update on 2017-07-22
2017-07-24 06:57:44 +12:00
deppbot
6e453707b9
Bundle Update on 2017-07-18
2017-07-20 21:24:40 +12:00
Daniel O'Connor
dac2d1d4c2
Merge pull request #1367 from Growstuff/bundle-update-2017-06-28-101508
...
Bundle Update on 2017-06-28
2017-07-17 23:31:09 +09:30
deppbot
6c4c1ff8ba
Bundle Update on 2017-06-25
2017-06-30 07:06:28 +12:00
deppbot
93d1bfd05d
Bundle Update on 2017-06-22
2017-06-30 07:06:28 +12:00
deppbot
6167e291d2
Bundle Update on 2017-06-18
2017-06-30 07:06:28 +12:00
Cesy Avon
deb1e27176
Making rubocop happy
2017-06-30 07:06:28 +12:00
Cesy Avon
82bb6c2f3b
Putting jquery-ui-rails back so things work
2017-06-30 07:06:28 +12:00
Cesy Avon
24d9d714b2
Bundle update
2017-06-30 07:06:28 +12:00
Cesy Avon
d9ad55db7c
Removing any locks on versions that don't have comments explaining why
2017-06-30 07:06:28 +12:00
deppbot
4dad76e635
Bundle Update on 2017-06-15
2017-06-30 07:06:28 +12:00
deppbot
252791b47d
Bundle Update on 2017-06-12
2017-06-30 07:06:28 +12:00
deppbot
aa849c2e1f
Bundle Update on 2017-06-28
2017-06-28 10:15:09 +08:00
Shiny
b03a59cb93
Merge branch 'master' into dev
2017-06-25 12:09:34 +12:00
deppbot
e761ecc356
Bundle Update on 2017-06-25
2017-06-25 12:08:30 +12:00
deppbot
69b887ba79
Bundle Update on 2017-06-22
2017-06-22 08:09:01 +12:00
deppbot
e4c2f777ac
Bundle Update on 2017-06-18
2017-06-19 23:06:24 +12:00
Daniel O'Connor
f0cb635b42
Merge pull request #1362 from cesy/bundleupdate2
...
Upgrade and unpin some gems
2017-06-16 07:52:55 +09:30
Cesy Avon
4116e201b5
Making rubocop happy
2017-06-15 15:28:50 +00:00
Cesy Avon
5788c0c5ce
Putting jquery-ui-rails back so things work
2017-06-15 15:28:50 +00:00
Cesy Avon
6f6e0a58a3
Bundle update
2017-06-15 15:28:50 +00:00
Cesy Avon
15b49672ee
Removing any locks on versions that don't have comments explaining why
2017-06-15 15:28:14 +00:00
Daniel O'Connor
9e2c7d0748
Merge pull request #1361 from Growstuff/bundle-update-2017-06-15-181612
...
Bundle Update on 2017-06-15
2017-06-15 20:04:07 +09:30
deppbot
5ff0e2c565
Bundle Update on 2017-06-15
2017-06-15 18:16:13 +08:00
Cesy
d40665fb08
Merge pull request #1360 from Growstuff/bundle-update-2017-06-12-143439
...
Bundle Update on 2017-06-12
2017-06-12 09:03:45 +01:00
Cesy
3b6a42b8f2
Merge pull request #1343 from Growstuff/dev
...
Release 26
2017-06-12 09:01:10 +01:00
deppbot
cf3772af43
Bundle Update on 2017-06-12
2017-06-12 14:34:40 +08:00
Cesy
2f30343303
Merge pull request #1341 from Br3nda/issue-1044-account-deletion
...
Issue 1044 account deletion
2017-06-11 19:01:00 +01:00
Brenda Wallace
8de7e7a00b
remove pending admin deletion specs. covered by model spec
2017-06-09 23:35:04 +12:00
Brenda Wallace
46efcf3e61
Spec for Forum owners and Crop creators deleting their accounts
2017-06-09 23:25:40 +12:00
Brenda Wallace
7968f3e407
Marked some un-written specs as pending
2017-06-09 23:00:38 +12:00
Brenda Wallace
639232bc87
Removal from newsletter spec is in model spec
2017-06-09 22:55:11 +12:00
Brenda Wallace
e0bc1c936a
Spec for comments by deleted members
2017-06-09 22:54:36 +12:00
Brenda Wallace
910a9673dc
Unsubscribes newsletter before member destroying
2017-06-09 22:39:07 +12:00
Brenda Wallace
582dd2c9fd
Checks the deleted members are not found
2017-06-09 21:28:47 +12:00
Brenda Wallace
1a743d7592
Filled in spec for link to delete member's account
2017-06-09 21:17:12 +12:00
Shiny
174040aa1b
Merge branch 'dev' into issue-1044-account-deletion
2017-06-09 21:04:41 +12:00
deppbot
4471ac64e4
Bundle Update on 2017-06-09
2017-06-09 21:03:03 +12:00
Daniel O'Connor
a8bb6c9f58
Merge pull request #1357 from cesy/bundleupdate0
...
Bundle update 2017-06-08
2017-06-09 09:55:12 +09:30
Daniel O'Connor
7d7053f558
Merge branch 'dev' into bundleupdate0
2017-06-09 09:54:24 +09:30
Daniel O'Connor
6f59896d96
Merge pull request #1358 from cesy/bundleupdate
...
Rails 4.2.7->4.2.8
2017-06-09 09:53:45 +09:30
Cesy Avon
e8cf19cc9d
Bundle update 2017-06-08
2017-06-08 16:20:11 +00:00
Cesy Avon
5a3d15d101
Bundle update
2017-06-08 16:19:00 +00:00
Cesy Avon
142be72fc3
Upgrading Rails
2017-06-08 16:07:30 +00:00
Brenda Wallace
c6331fc449
Spec checks deleted member doesn't appear in interesting queries
2017-06-04 19:31:27 +12:00
Brenda Wallace
e8455cd943
Merge remote-tracking branch 'origin/issue-1044-account-deletion' into issue-1044-account-deletion
2017-06-04 19:27:37 +12:00
Brenda Wallace
080e728905
Spec checks you can't log in after deleting your account
2017-06-04 19:21:58 +12:00
Shiny
db532fcc8f
Merge branch 'dev' into issue-1044-account-deletion
2017-06-04 13:00:30 +12:00
deppbot
e78d899528
Bundle Update on 2017-06-03
2017-06-04 12:55:47 +12:00
Brenda Wallace
1f916b8314
Post says Member Deleted when they are
2017-06-02 22:51:48 +12:00
Brenda Wallace
1cdcaac41e
comment says "Member Deleted" when they are
2017-06-02 22:50:48 +12:00
Brenda Wallace
bbc3ca749f
Removed author_exists scope. It is part of default
2017-06-02 22:43:25 +12:00
Brenda Wallace
20b980a162
Helpful comment explains why we use act_as_paranoid
2017-06-02 22:42:03 +12:00
Brenda Wallace
37897ad595
Merge remote-tracking branch 'origin/issue-1044-account-deletion' into issue-1044-account-deletion
2017-06-02 22:40:56 +12:00
Brenda Wallace
72f805e135
Doesn't need check the :deleted field in registraions
2017-06-02 22:40:39 +12:00
Shiny
1bb4f601a1
Merge branch 'dev' into issue-1044-account-deletion
2017-06-02 22:35:07 +12:00
Brenda Wallace
fb012c073e
leaves a record of orders and payments intact when members deleted
2017-06-02 22:34:19 +12:00
Brenda Wallace
3dfd9eedca
Updating member deletion specs
2017-06-02 21:49:28 +12:00
Brenda Wallace
75d2c0ea3c
destroy member if password correct
2017-06-02 20:49:30 +12:00
Brenda Wallace
08996c4157
removed members#destroy. this should be on the registrations controller
2017-06-02 20:48:43 +12:00
Brenda Wallace
c48e24845e
Remove owner_exists scope
2017-06-02 20:28:32 +12:00
Cesy Avon
61f93df6ff
Feature specs for member deletion
2017-06-02 19:48:59 +12:00
deppbot
34e5e0850d
Bundle Update on 2017-05-31
2017-05-31 18:27:23 +12:00
Shiny
7621da7041
Merge branch 'dev' into issue-1044-account-deletion
2017-05-30 20:39:44 +12:00
Brenda Wallace
8bcc5104e5
Delegate planting predictions
2017-05-29 22:45:14 +12:00
Brenda Wallace
4bbeca9f3e
only look up other plantings finishing, if we have a crop
2017-05-29 22:45:14 +12:00
Brenda Wallace
54748ac20d
Removed current_date variable from planting_predictions
2017-05-29 22:45:14 +12:00
Brenda Wallace
3c8b80574a
Small DRY of planting models -> predict added
2017-05-29 22:45:14 +12:00
Brenda Wallace
288ad782d2
Planted? = true when planted today
2017-05-29 22:45:14 +12:00
Brenda Wallace
5d97a7edac
Move setting of days_before_maturity back to plant model
2017-05-29 22:45:14 +12:00
Brenda Wallace
ff1c835cda
Moving the planting predictions to own service
2017-05-29 22:45:14 +12:00
Daniel O'Connor
479f61b224
Merge pull request #1352 from Br3nda/admin-typo
...
Fixed admin typo
2017-05-29 19:18:59 +09:30
Brenda Wallace
ac94b8b6d3
Fixed admin typo
2017-05-29 17:52:08 +12:00
Shiny
fedc7a7fb6
Merge branch 'dev' into issue-1044-account-deletion
2017-05-29 16:17:59 +12:00
Brenda Wallace
9f9df07390
DRY photos controller more
2017-05-29 16:17:43 +12:00
Brenda Wallace
e5a705aeae
Responders on the roles controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
fb0f74c4d8
Changed location we direct to after garden destroy
2017-05-29 16:17:43 +12:00
Brenda Wallace
963aafd5ab
Added missing respond_with to crops controller
...
This tells rails what to use in json responses
2017-05-29 16:17:43 +12:00
Brenda Wallace
efe2f49e7f
More DRY Harvests controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
a7178b6da7
changed spec to expect responder gem flash
2017-05-29 16:17:43 +12:00
Brenda Wallace
2da3cd6673
Fixed location to redirect to afver comment add/update
2017-05-29 16:17:43 +12:00
Brenda Wallace
5d50f9aec2
DRY the admin controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
cfb43ba07c
DRY the homes controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
3811417d70
More DRY comments controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
9b3c77a0e6
More DRY comments controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
b5636af3be
Add responders to alternate names controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
3e93fb5e2e
Add responders on products controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
c22c92e9f4
Validates min price on product
...
the database has this constraint already. Adding so the ruby models
match.
2017-05-29 16:17:43 +12:00
Brenda Wallace
97a763660a
DRY the products controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
8a25ecc635
DRY the roles controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
ee52c14b95
Put rubocop word array settings back
2017-05-29 16:17:43 +12:00
Brenda Wallace
3178e44843
DRY some of the places_controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
f510dfd8d9
Removed fixed issues from rubocop_todo
2017-05-29 16:17:43 +12:00
Brenda Wallace
7ad13d3eff
Don't restrict crop search to approved
2017-05-29 16:17:43 +12:00
Brenda Wallace
e0c7e8c15b
Removed route comments and extras on plant_parts controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
5e91effb12
More DRY the plant_parts controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
9560da90ab
Add Scientific names to the menu
2017-05-29 16:17:43 +12:00
Brenda Wallace
9e1ed8e9eb
add flash responders to plants parts controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
15592d01d0
Small dry of plant_parts controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
15d93e6c33
Move includes(:photos) before pagination
2017-05-29 16:17:43 +12:00
Brenda Wallace
484e20ba83
Don't attempt to create blank altnames or scinames
2017-05-29 16:17:43 +12:00
Brenda Wallace
d341e977c3
Fix up check of pending crops in view
2017-05-29 16:17:43 +12:00
Brenda Wallace
e7d7ee396e
Further DRY of saving crops
2017-05-29 16:17:43 +12:00
Brenda Wallace
adf585852a
Revert "Wikipedia url is always required"
...
This reverts commit ba5ad00f5c .
2017-05-29 16:17:43 +12:00
Brenda Wallace
de5b56235e
Small style change to reduce size of crops#show
2017-05-29 16:17:43 +12:00
Brenda Wallace
318ef46ae8
crops pending approval, fetched in one method (DRY)
2017-05-29 16:17:43 +12:00
Brenda Wallace
b982793fbf
Wikipedia url is always required
...
The form says it's required, so it should be required.
2017-05-29 16:17:43 +12:00
Brenda Wallace
6fef56ebb7
DRY the crops controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
fa586c15aa
Dry the scientific names controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
51be3db970
Use a guard clasue in shop controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
5d654175a9
A bunch of single line methods
2017-05-29 16:17:43 +12:00
Brenda Wallace
e9003ad32a
Small dry of crops controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
38c3320731
Rubocop fix up in accounts controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
e6b556851a
More DRYing of members controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
a30285ef49
DRY some of the members controller
2017-05-29 16:17:43 +12:00
Brenda Wallace
4f67f17551
DRY the shop controller
2017-05-29 16:17:43 +12:00
Shiny
8f66009d0d
Merge branch 'dev' into issue-1044-account-deletion
2017-05-29 15:56:17 +12:00
Daniel O'Connor
cdd12fd4dd
Merge pull request #1348 from Br3nda/inactive-plantings
...
Inactive plantings show as tiny thumbnails
2017-05-29 10:52:37 +09:30
Daniel O'Connor
3ff0018a12
Merge branch 'dev' into inactive-plantings
2017-05-29 09:46:03 +09:30
Daniel O'Connor
0b0f479752
Merge pull request #1346 from Br3nda/bugfix-brokenurl-crop-rss
...
Fixed url in crop rss feed
2017-05-29 09:44:04 +09:30
Shiny
b7148b99dc
Merge branch 'dev' into issue-1044-account-deletion
2017-05-28 20:54:02 +12:00
Brenda Wallace
8076e58a97
Owner must exist so we can see photos
2017-05-28 19:32:34 +12:00
Shiny
251d390c23
Merge branch 'dev' into bugfix-brokenurl-crop-rss
2017-05-28 18:52:03 +12:00
Brenda Wallace
f380f222a9
Move edit link to top of card
2017-05-28 18:51:01 +12:00
Brenda Wallace
eacdab45ba
Removed planting.with_dates
2017-05-28 18:44:26 +12:00
Brenda Wallace
dcb949e7b3
Fixed bug - error when planting has no finished_at
2017-05-28 18:10:53 +12:00
Brenda Wallace
ebf1468652
Fix up small haml nexting bug
2017-05-28 18:07:19 +12:00
Brenda Wallace
4726b57c47
Inactive plantings show as tiny thumbnails
2017-05-28 17:13:04 +12:00
deppbot
f422336aff
Bundle Update on 2017-05-28
2017-05-28 14:23:17 +12:00
Brenda Wallace
2c622af49c
Fixed url in crop rss feed
2017-05-27 14:30:24 +12:00
Brenda Wallace
0b684eb05e
Checks owner exists, in default_scopes of many models
2017-05-26 23:00:06 +12:00
Brenda Wallace
9c4a45bc29
Merge remote-tracking branch 'origin/issue-1044-account-deletion' into issue-1044-account-deletion
2017-05-26 21:25:00 +12:00
Brenda Wallace
00f7551c0a
Merge remote-tracking branch 'upstream/dev' into issue-1044-account-deletion
2017-05-26 21:24:41 +12:00
Shiny
ee7b915313
Merge branch 'dev' into issue-1044-account-deletion
2017-05-26 21:24:29 +12:00
Daniel O'Connor
af0871cd0a
Merge pull request #1344 from Growstuff/bundle-update-2017-05-25-051814
...
Bundle Update on 2017-05-25
2017-05-25 11:49:55 +09:30
deppbot
60d074a0de
Bundle Update on 2017-05-25
2017-05-25 05:18:15 +08:00
Shiny
c2ba2719de
Merge branch 'master' into dev
2017-05-24 13:26:06 +12:00
Shiny
afb0b9e387
Merge branch 'dev' into issue-1044-account-deletion
2017-05-24 13:25:21 +12:00
pozorvlak
e4e4d9600e
Merge pull request #1340 from Br3nda/fix-1334
...
Display seeds for trade, on homepage, as thumbnails.
2017-05-24 00:35:28 +01:00
Brenda Wallace
a6964a8f4e
Update specs to join before checking member is destroyed.
2017-05-21 21:59:28 +12:00
Brenda Wallace
b538330785
Form to delete your own account
2017-05-21 21:51:44 +12:00
Brenda Wallace
aee90268a5
Fixed old migration - to work under act_as_paranoid
2017-05-21 21:50:52 +12:00
Brenda Wallace
cabf849774
Deleting of users
2017-05-21 21:29:09 +12:00
Brenda Wallace
7251f3308b
Merge branch 'fix-1334' into issue-1044-account-deletion
2017-05-21 11:46:30 +12:00
Brenda Wallace
121d3d99fe
Tests for retrieving data of deleted members
2017-05-21 11:36:07 +12:00
Brenda Wallace
c4938e00e4
Member acts as paranoid
2017-05-21 11:33:12 +12:00
Brenda Wallace
4a926415db
Call destroy, to mark a member as deleted
2017-05-21 11:32:54 +12:00
Brenda Wallace
7d4c9011aa
Member.deleted_at column added
2017-05-21 11:31:53 +12:00
Brenda Wallace
b5b2582335
default scope says members deleted :false
2017-05-21 11:17:42 +12:00
Brenda Wallace
7d2a2b96a2
Only show gardens of members who are not deleted
2017-05-21 11:17:09 +12:00
Brenda Wallace
e2fe04a44b
Form and controller method to mark members as deleted
2017-05-20 22:01:20 +12:00
Brenda Wallace
18c02bf33b
Add deleted column to members table
2017-05-20 22:00:15 +12:00
Brenda Wallace
6c0b1018bc
Updated spec for homepage seeds
2017-05-20 17:16:03 +12:00
Brenda Wallace
15e2b4f595
Seeds on home page looking like thumbnails
2017-05-20 17:01:07 +12:00
Brenda Wallace
6e7bf11ec8
Seeds delegate name and default_photo to their crop
2017-05-20 17:00:49 +12:00
Brenda Wallace
5f9b0890fb
Move seed.interesting to a scope
2017-05-20 16:58:49 +12:00
Brenda Wallace
4841c52bcd
order crop.plant_parts by plant_parts.name
2017-05-20 15:46:37 +12:00
Brenda Wallace
7baabca827
Unique is un-necesary when declaring relationship to plant_parts
2017-05-20 15:46:37 +12:00
Brenda Wallace
9a19007b85
More railsy order by in models
2017-05-20 15:46:37 +12:00
Brenda Wallace
677f850e21
Removed extra blank line
2017-05-20 15:46:37 +12:00
Brenda Wallace
d771bc3688
More railsy syntax in default scopes
2017-05-20 15:46:37 +12:00
Brenda Wallace
1dfc58c120
Remove default scope from harvest.
...
Causes an ORDER clause to be added in queries even when not selecting
from that table. E.g. if we 're looking for PlantParts that have a
Harvest
2017-05-20 15:46:37 +12:00
Brenda Wallace
6f58f266a6
Moving has_photos scope to PhotoCapable
...
-
2017-05-20 15:46:37 +12:00
deppbot
e38395b6ba
Bundle Update on 2017-05-19
2017-05-20 07:07:27 +12:00
Daniel O'Connor
944d477dbc
Merge pull request #1338 from Growstuff/bundle-update-2017-05-16-135240
...
Bundle Update on 2017-05-16
2017-05-16 16:45:08 +09:30
deppbot
cbf7ac0126
Bundle Update on 2017-05-16
2017-05-16 13:52:41 +08:00
Cesy
1ad171f37b
Merge pull request #1335 from Growstuff/dev
...
Release 25
2017-05-15 20:43:16 +01:00
deppbot
06896dacd5
Bundle Update on 2017-05-13
2017-05-14 18:20:44 +12:00
Shiny
ff90d6430d
Merge branch 'master' into dev
2017-05-13 11:35:26 +12:00
Brenda Wallace
4dbdbc4285
Pull haml gem back to version 4
2017-05-13 11:31:32 +12:00
deppbot
0f1c8e0658
Bundle Update on 2017-05-03
2017-05-13 11:31:32 +12:00
Daniel O'Connor
c9ec116c9b
Merge pull request #1333 from Br3nda/garden-photos-fixup
...
Fix up of photo display on garden#show
2017-05-11 17:25:51 +09:30
Brenda Wallace
e61c3f619b
Revert "Only show first 5 photos on gardens#show"
...
This reverts commit 93b25a5c32 .
2017-05-07 16:10:14 +12:00
Brenda Wallace
93b25a5c32
Only show first 5 photos on gardens#show
2017-05-07 14:41:14 +12:00
Brenda Wallace
f7ca32d888
Moved garden photos to right/bottom
2017-05-06 13:30:57 +12:00
Brenda Wallace
d57c46066a
updated view spec to find glypicon
2017-05-06 13:27:23 +12:00
Brenda Wallace
1e6cb2cfe4
don't eager load harvests
2017-05-06 12:15:03 +12:00
Brenda Wallace
67ae80056a
Removed unnecesary div wrap
2017-05-06 12:08:23 +12:00
Brenda Wallace
13fa3c69e8
fixes places
...
card -> thumbnail
2017-05-06 12:06:28 +12:00
Brenda Wallace
caad557b2a
Updating specs to click glypicons
2017-05-06 12:03:57 +12:00
Brenda Wallace
0f030d2c27
Planting thumbnail links to planting
...
fixes #1308
2017-05-06 11:48:17 +12:00
Brenda Wallace
66d548c9c1
Added some glypicons to gardenshow
2017-05-06 11:47:24 +12:00
Brenda Wallace
c168bb4a2b
More fix up to alignment and thumbnail row counts gardens#show
2017-05-06 11:39:02 +12:00
Brenda Wallace
811db2961a
Quick fix up of photo display on garden#show
2017-05-05 23:38:19 +12:00
Brenda Wallace
42cea2ebde
Fixed spec for days_before_maturity
2017-04-28 20:48:25 +12:00
Brenda Wallace
ccc5eb3c9a
Make calc_and_set_days_before_maturity public
2017-04-28 20:48:25 +12:00
Brenda Wallace
0e71a4fcb3
Removed un-needed rubocop ignores
2017-04-28 20:48:25 +12:00
Brenda Wallace
4ea681984f
Call calc_and_set_days_before_maturity from controller
2017-04-28 20:48:25 +12:00
Brenda Wallace
dadc5b96c6
Reduced duplicate code further, with responders gem
...
This makes locale-friendly flash notices
2017-04-28 20:48:25 +12:00
Brenda Wallace
787fca138b
Added helpful comment about days_until_maturity
2017-04-28 20:48:25 +12:00
Brenda Wallace
b820615081
Moved planting maturity to planting model. simplified controller
2017-04-28 20:48:25 +12:00
Cesy
812a6f5ec2
Merge pull request #1328 from Growstuff/dev
...
release 24
2017-04-28 07:31:21 +01:00
Shiny
f1b42ec699
Merge branch 'master' into dev
2017-04-25 13:14:40 +12:00
Brenda Wallace
26c17ea19c
Plantings Thumbnails, fit to box
2017-04-25 10:58:17 +12:00
Brenda Wallace
acc75f80bf
include harvests when retrieving data for plantings#index
2017-04-25 10:58:17 +12:00
Daniel O'Connor
a79a65363f
Merge pull request #1326 from Br3nda/plantings-validators
...
Plantings validators
2017-04-24 17:47:41 +09:30
Shiny
dfeb4804e7
Merge branch 'dev' into plantings-validators
2017-04-23 19:35:37 +12:00
deppbot
9d20fafd06
Bundle Update on 2017-04-23
2017-04-23 19:35:23 +12:00
Shiny
e9a5ef0058
Merge branch 'dev' into plantings-validators
2017-04-22 20:50:29 +12:00
Brenda Wallace
d2378376e4
Plantings validators
...
Adding garden presence true.
Checks crop presence before crop approved
2017-04-22 20:48:48 +12:00
Daniel O'Connor
4b1b5d8a18
Merge pull request #1323 from Growstuff/bundle-update-2017-04-20-122131
...
Bundle Update on 2017-04-20
2017-04-20 15:27:04 +09:30
deppbot
a0770e80e7
Bundle Update on 2017-04-20
2017-04-20 12:21:32 +08:00
Brenda Wallace
f08e740ac6
Removed owner_matches?
...
it's not used anymore
2017-04-19 08:22:03 +00:00
Brenda Wallace
5f23bcfad6
Photo#show for signed in and not signed in, and other members
2017-04-19 08:22:03 +00:00
Brenda Wallace
3cd7b86c99
Photos#show links to items
2017-04-19 08:22:03 +00:00
Brenda Wallace
bd53d4a271
updating view spec - link to delete photo has changed
2017-04-19 08:22:03 +00:00
Brenda Wallace
16d88730ec
controller specs for PhotoAssociations
2017-04-19 08:22:03 +00:00
Brenda Wallace
5ad88eb6bd
Responsive image on photos#show
2017-04-19 08:22:03 +00:00
Brenda Wallace
b617eb3140
Deleting photo's association with another item
2017-04-19 08:22:03 +00:00
Brenda Wallace
acc4d3ad84
Only delete own associations
2017-04-19 08:22:03 +00:00
Brenda Wallace
beb3f7e2b8
Don't overwrite edited photo titles
2017-04-19 08:22:03 +00:00
Brenda Wallace
ab46a8dd96
UI for removing photos from plantings
2017-04-19 08:22:03 +00:00
Brenda Wallace
b6b578d7e6
Layout change on photos
2017-04-19 08:22:03 +00:00
Brenda Wallace
4d07cf80fa
Editing title of photos
2017-04-19 08:22:03 +00:00
Brenda Wallace
93f6b65d8d
bugfix: Only show harvests if we have some
2017-04-19 08:22:03 +00:00
Brenda Wallace
b40a6723e1
gardens#show Include crop, owner, harvesss and garden in query
2017-04-19 08:22:03 +00:00
Brenda Wallace
2058d28b37
Include owner in query, because we need it later
2017-04-19 08:22:03 +00:00
Brenda Wallace
682c6d6f5e
Reduced query count by .includes() on plantings
2017-04-19 08:22:03 +00:00
Brenda Wallace
2be55acc92
Route for flickr auth callback -- Fixes #1106
2017-04-19 08:22:03 +00:00
Brenda Wallace
a9a040182c
Rubocop compliance for members controller
2017-04-19 08:22:03 +00:00
Shiny
f39fe94173
Merge branch 'master' into dev
2017-04-18 18:27:43 +00:00
Brenda Wallace
976bdbbd96
Removed owner_matches?
...
it's not used anymore
2017-04-18 07:09:47 +00:00
Brenda Wallace
cff1d8bfb9
Photo#show for signed in and not signed in, and other members
2017-04-18 07:09:47 +00:00
Brenda Wallace
bbdc54cb69
Photos#show links to items
2017-04-18 07:09:47 +00:00
Brenda Wallace
36f1f7b71a
updating view spec - link to delete photo has changed
2017-04-18 07:09:47 +00:00
Brenda Wallace
e1731793dd
controller specs for PhotoAssociations
2017-04-18 07:09:47 +00:00
Brenda Wallace
8ea3b27612
Responsive image on photos#show
2017-04-18 07:09:47 +00:00
Brenda Wallace
9469a69078
Deleting photo's association with another item
2017-04-18 07:09:47 +00:00
Brenda Wallace
cc46fe3336
Only delete own associations
2017-04-18 07:09:47 +00:00
Brenda Wallace
52b4064a2d
Don't overwrite edited photo titles
2017-04-18 07:09:47 +00:00
Brenda Wallace
d367b9ef21
UI for removing photos from plantings
2017-04-18 07:09:47 +00:00
Brenda Wallace
4711e4669f
Layout change on photos
2017-04-18 07:09:47 +00:00
Brenda Wallace
3e55024f98
Editing title of photos
2017-04-18 07:09:47 +00:00
Daniel O'Connor
ccf56bf944
Merge pull request #1321 from Br3nda/harvests-display
...
bugfix: Only show harvests if we have some
2017-04-18 12:24:01 +09:30
Shiny
42e51a9cf6
Merge branch 'dev' into harvests-display
2017-04-17 10:00:20 +00:00
Brenda Wallace
667e0cc0e3
bugfix: Only show harvests if we have some
2017-04-17 21:59:31 +12:00
Brenda Wallace
339830b3bb
gardens#show Include crop, owner, harvesss and garden in query
2017-04-17 08:59:34 +00:00
Brenda Wallace
7770164672
Include owner in query, because we need it later
2017-04-17 08:59:34 +00:00
Brenda Wallace
f333607572
Reduced query count by .includes() on plantings
2017-04-17 08:59:34 +00:00
Brenda Wallace
87d3764eeb
Route for flickr auth callback -- Fixes #1106
2017-04-17 08:28:52 +00:00
Cesy
faf487b719
Merge pull request #1314 from Br3nda/members-controller
...
Rubocop compliance for members controller
2017-04-17 09:13:26 +01:00
Shiny
53eb171dfc
Merge pull request #1317 from Growstuff/dev
...
release 22
2017-04-17 05:00:59 +00:00
Shiny
3dbf0df19e
Merge branch 'dev' into members-controller
2017-04-17 03:49:54 +00:00
deppbot
b0b6931678
Bundle Update on 2017-04-17
2017-04-17 03:45:39 +00:00
Shiny
cd272a6443
Merge branch 'dev' into members-controller
2017-04-16 09:44:32 +00:00
Daniel O'Connor
d515dba7f2
Merge pull request #1316 from Br3nda/garden-thumbnail
...
Garden thumbnail display cleanup
2017-04-16 15:50:52 +09:30
Shiny
4958330c9e
Merge branch 'master' into dev
2017-04-16 02:42:38 +00:00
Brenda Wallace
17236a4a8a
Garden thumbnail display cleanup
2017-04-16 13:48:22 +12:00
Brenda Wallace
936a8778ed
Rubocop compliance for members controller
2017-04-16 12:03:48 +12:00
Daniel O'Connor
3ccab3f857
Merge pull request #1309 from Br3nda/fix_1305
...
Fix 1305
2017-04-15 17:11:02 +09:30
Daniel O'Connor
0201e873eb
Merge branch 'dev' into fix_1305
2017-04-15 17:03:15 +09:30
Daniel O'Connor
20289e6566
Merge pull request #1310 from Br3nda/counter-caches
...
Adding counter caches
2017-04-15 17:01:20 +09:30
Shiny
85ded414ec
Merge branch 'dev' into fix_1305
2017-04-15 06:50:16 +00:00
Shiny
299c95c5f5
Merge branch 'dev' into counter-caches
2017-04-14 07:40:19 +00:00
Taylor Griffin
8f51090098
make mentionbot settings file
2017-04-14 07:40:01 +00:00
deppbot
5551eeba24
Bundle Update on 2017-04-14
2017-04-14 07:10:10 +00:00
Shiny
7a5a68f511
Merge branch 'dev' into counter-caches
2017-04-14 01:44:44 +00:00
Shiny
6d4ec9ad34
Merge branch 'dev' into fix_1305
2017-04-14 01:44:35 +00:00
Brenda Wallace
fffef75813
Ignore ConsecutiveComments and IdNames in haml for now
2017-04-14 01:43:42 +00:00
Brenda Wallace
0e2d7b4393
Allow instance variables in partials for now
2017-04-14 01:43:42 +00:00
Brenda Wallace
f08068c289
Upgrade haml_lint
2017-04-14 01:43:42 +00:00
deppbot
ff653934ad
Bundle Update on 2017-04-08
2017-04-14 01:43:42 +00:00
Brenda Wallace
c4bed2cf4d
Merge branch 'haml-lint-fix' into counter-caches
2017-04-14 11:42:02 +12:00
Brenda Wallace
47c0f74f81
Ignore ConsecutiveComments and IdNames in haml for now
2017-04-14 11:40:52 +12:00
Brenda Wallace
171e34914b
Allow instance variables in partials for now
2017-04-14 11:40:46 +12:00
Brenda Wallace
8010a8b56c
Upgrade haml_lint
2017-04-14 11:40:40 +12:00
Brenda Wallace
ac165ce0cd
Adding counter caches
2017-04-14 11:32:31 +12:00
Brenda Wallace
4925fde28f
Ignore ConsecutiveComments and IdNames in haml for now
2017-04-14 09:43:16 +12:00
Brenda Wallace
6580cf38b0
Allow instance variables in partials for now
2017-04-13 23:02:16 +12:00
Brenda Wallace
fdf10202ba
Upgrade haml_lint
2017-04-13 22:56:07 +12:00
Brenda Wallace
85a368999b
we love rubocop
2017-04-13 14:30:51 +12:00
Daniel O'Connor
6ba4b4560e
Fix #1305 by adding aggregation
...
Expand test coverage
member_id is owner_id on plantings
Argue with ActionView::Template::Error about what we can group on
Rename variable
2017-04-13 14:30:41 +12:00
Cesy
71aedb136a
Merge pull request #1300 from Growstuff/bundle-update-2017-04-02-131809
...
Bundle Update on 2017-04-02
2017-04-08 15:06:16 +01:00
Shiny
65c988790b
Merge branch 'dev' into bundle-update-2017-04-02-131809
2017-04-06 08:04:46 +12:00
Brenda Wallace
0372d3b9b0
Removing pre-commit.sh script
2017-04-06 08:04:09 +12:00
Shiny
3272ea1ca5
Merge branch 'dev' into bundle-update-2017-04-02-131809
2017-04-06 07:51:19 +12:00
Shiny
39b461c348
Merge pull request #1243 from Growstuff/dev
...
Release 21
2017-04-06 07:49:08 +12:00
pozorvlak
a8f7031447
Merge pull request #1303 from Br3nda/disable-eslint
...
Disable eslint
Fixes #1302 , at least temporarily.
2017-04-05 11:15:10 +01:00
Shiny
17967b7c72
Merge branch 'dev' into disable-eslint
2017-04-04 09:07:02 +12:00
Brenda Wallace
e422c8b072
Disable eslint
2017-04-03 21:05:35 +00:00
Cesy
5392d7d900
Merge branch 'dev' into bundle-update-2017-04-02-131809
2017-04-03 08:47:32 +01:00
Cesy
d42bbe7fa3
Merge pull request #1299 from Br3nda/gemfile-ruby-bump
...
Gemfile.lock bumping ruby version to match other files
2017-04-03 08:46:19 +01:00
deppbot
45f2abeab5
Bundle Update on 2017-04-02
2017-04-02 13:18:11 +08:00
Brenda Wallace
7e754b8293
Gemfile.lock bumping ruby version to match other files
2017-04-01 15:19:18 +13:00
pozorvlak
1dcd84009a
Merge pull request #1298 from CloCkWeRX/ruby_234
...
Ruby 2.3.4
2017-03-31 14:07:36 +01:00
Daniel O'Connor
8615df264e
Ruby 2.3.4
2017-03-31 16:29:21 +10:00
Daniel O'Connor
4e400cc899
Merge pull request #1295 from Growstuff/bundle-update-2017-03-30-121732
...
Bundle Update on 2017-03-30
2017-03-31 16:27:43 +10:00
Daniel O'Connor
3cead5fb6b
Pin to earlier rubocop
2017-03-31 16:15:55 +10:00
Shiny
1decf6ea11
Merge branch 'dev' into bundle-update-2017-03-30-121732
2017-03-30 21:37:57 +13:00
Harry Brodsky
23c0f901c6
Add name to CONTRIBUTORS.md
2017-03-30 19:15:48 +13:00
Harry Brodsky
78f4b3dbf3
Update irregular crop pluralizations
2017-03-30 19:15:48 +13:00
deppbot
9340b8d7e5
Bundle Update on 2017-03-30
2017-03-30 12:17:33 +08:00
pozorvlak
0094473bbe
Merge pull request #1287 from Br3nda/bw/readme-new-contributors
...
Readme update for new contributors - force-merging because it only touches README.md.
2017-03-28 23:56:37 +01:00
pozorvlak
743f482818
Merge pull request #1292 from Br3nda/query-optimising
...
Query optimising
2017-03-28 23:55:05 +01:00
Brenda Wallace
b8ea6116d4
Add photos to plantings to make them interesting in the spec
2017-03-29 10:46:15 +13:00
Brenda Wallace
2521e52d71
Remove test called to Planting.interesting(...)
...
Interesting plantings with no photos is not used in the code.
The method was converted to a scope.
2017-03-29 08:28:58 +13:00
Brenda Wallace
d44f9ef4e9
Removed assignment of useless variable
2017-03-29 08:21:34 +13:00
Brenda Wallace
63cee1edc9
Back to reading @garden.plantings
2017-03-29 08:21:02 +13:00
Brenda Wallace
3791b34fe3
One planting per owner (used for intersetingness)
2017-03-28 22:39:03 +13:00
Brenda Wallace
5d58be110e
Fixed crop.interesting, no more duplicate crops
2017-03-28 19:33:34 +13:00
Brenda Wallace
911593b480
Reduces query numbes on gardens#show
2017-03-24 21:10:45 +13:00
Shiny
b72a3d6942
Merge branch 'dev' into query-optimising
2017-03-24 18:31:18 +13:00
Brenda Wallace
804ac8662a
Rubocop fix ups
2017-03-24 17:29:39 +13:00
Brenda Wallace
1601e966ad
Planting.interesting is in a scope
2017-03-24 16:59:09 +13:00
Brenda Wallace
e7553868f2
Removed variables on homes controller
...
following the comment there
2017-03-24 16:57:51 +13:00
Brenda Wallace
5e8ca392d2
Moved Member.interest near top of file
2017-03-24 16:45:55 +13:00
Brenda Wallace
815915d933
Loading child records of interesting crops
2017-03-24 16:45:36 +13:00
Brenda Wallace
6223076dae
Pull in interesting members data in controller
2017-03-24 16:30:56 +13:00
Brenda Wallace
0182a99654
Optimising Member.interesting
2017-03-24 16:28:37 +13:00
Brenda Wallace
5baa357bb3
Use bullet to find queries to optomise
2017-03-24 16:07:05 +13:00
deppbot
0fb4d74685
Bundle Update on 2017-03-24
2017-03-24 09:24:40 +13:00
Daniel O'Connor
eebaef6fde
Merge branch 'dev' into bw/readme-new-contributors
2017-03-21 14:03:22 +10:30
Daniel O'Connor
59fc550f3c
Merge pull request #1290 from Growstuff/bundle-update-2017-03-19-161121
...
Bundle Update on 2017-03-19
2017-03-20 14:15:06 +10:30
Shiny
64ffaab1ec
Merge branch 'dev' into bundle-update-2017-03-19-161121
2017-03-20 10:01:48 +13:00
Cesy
21f53e362f
Merge pull request #1279 from Br3nda/plantings-harvests
...
View harvests for a planting
2017-03-19 09:46:57 +00:00
deppbot
20cfa0c5b2
Bundle Update on 2017-03-19
2017-03-19 16:11:22 +08:00
Shiny
204633d533
Merge branch 'dev' into bw/readme-new-contributors
2017-03-18 14:21:43 +13:00
Shiny
c77ed8c6d0
Merge branch 'dev' into plantings-harvests
2017-03-17 08:18:56 +13:00
Shiny
fe7ae18e7b
Merge pull request #1285 from Growstuff/add-contributor-megan
...
Added Megan to contributors
2017-03-17 08:13:03 +13:00
Shiny
8746cc67e2
Merge branch 'dev' into plantings-harvests
2017-03-17 08:11:33 +13:00
Shiny
f1feb59818
Merge branch 'dev' into add-contributor-megan
2017-03-17 08:10:32 +13:00
Shiny
bb62b11070
Merge branch 'dev' into bw/readme-new-contributors
2017-03-16 21:15:30 +13:00
deppbot
1660d54c01
Bundle Update on 2017-03-16
2017-03-16 21:15:11 +13:00
Shiny
cb7715b6d9
Merge branch 'dev' into bw/readme-new-contributors
2017-03-16 15:35:22 +13:00
Shiny
a60d0faedd
Merge branch 'dev' into add-contributor-megan
2017-03-16 15:35:15 +13:00
Shiny
7f592579cd
Merge branch 'dev' into plantings-harvests
2017-03-16 15:35:06 +13:00
Brenda Wallace
998befb30f
Limited plantings to member's own garden, and approved crops
2017-03-16 15:29:25 +13:00
Shiny
ebbf6df87d
Merge branch 'dev' into plantings-harvests
2017-03-16 14:59:54 +13:00
Shiny
40e4f8df8a
Merge branch 'dev' into add-contributor-megan
2017-03-16 14:59:26 +13:00
Brenda Wallace
81d41398a2
Link to waffle from readme
2017-03-16 14:55:30 +13:00
Brenda Wallace
4f02f45ae8
Updated wiki link
2017-03-16 14:55:22 +13:00
Arun Kumar
f7ec1826b0
Use presence instead of regex validation
2017-03-16 13:27:13 +13:00
Shiny
d619cd160d
Added Megan to contributors
2017-03-16 13:04:31 +13:00
Daniel O'Connor
4a20f68d3a
Merge branch 'dev' into plantings-harvests
2017-03-16 09:40:56 +10:30
Daniel O'Connor
62d2b5e9fb
Merge pull request #1273 from Br3nda/yaml-cleanup
...
Yaml file clean up
2017-03-16 09:39:33 +10:30
Daniel O'Connor
5935d2e73f
Merge pull request #1276 from Br3nda/bw/install-linters
...
Install npm modules locally
2017-03-16 09:38:54 +10:30
Daniel O'Connor
92b8972b24
Merge pull request #1278 from Br3nda/bw/crop-model-dupe
...
Reduced duplication of the term "approved" in crop model
2017-03-16 09:37:24 +10:30
Daniel O'Connor
12254fe0ca
Merge pull request #1275 from Br3nda/bw/discourse-removal
...
Removing references to Discourse (talk.growstuff.org)
2017-03-16 09:36:29 +10:30
Daniel O'Connor
ea54fca2b2
Merge pull request #1282 from Br3nda/gardens-order
...
Gardens order
2017-03-16 09:35:17 +10:30
Daniel O'Connor
d7db9007fd
Merge pull request #1280 from Br3nda/public-error-pages
...
Update public error pages
2017-03-16 09:32:52 +10:30
Daniel O'Connor
c2acb8cf73
Merge pull request #1274 from Br3nda/fix-traxis-badge
...
Tie travis badge to a branch
2017-03-16 09:30:27 +10:30
Shiny
8d04d4b223
Merge branch 'dev' into plantings-harvests
2017-03-15 23:10:15 +13:00
Shiny
35d9c8e9f1
Merge branch 'dev' into bw/crop-model-dupe
2017-03-15 23:09:31 +13:00
Shiny
b23118a9db
Merge branch 'dev' into public-error-pages
2017-03-15 23:09:21 +13:00
Shiny
5585dbada1
Merge branch 'dev' into gardens-order
2017-03-15 23:09:09 +13:00
Thomas Countz
fa49234669
remove "add new garden" on other member's page ( #1283 )
...
* update garden#show view logic
* added name to contributors
Closes #1167
2017-03-15 23:06:32 +13:00
Shiny
8833571ab3
Merge branch 'dev' into bw/discourse-removal
2017-03-14 16:21:44 +13:00
Shiny
a54e66f2fd
Merge branch 'dev' into bw/install-linters
2017-03-12 22:56:11 +13:00
Shiny
7913f85cf4
Merge branch 'dev' into yaml-cleanup
2017-03-12 22:55:11 +13:00
Shiny
bf46c0a6d2
Merge branch 'dev' into bw/crop-model-dupe
2017-03-12 22:54:32 +13:00
Shiny
082bdb035f
Merge branch 'dev' into plantings-harvests
2017-03-12 22:54:17 +13:00
Shiny
15bedb1659
Merge branch 'dev' into public-error-pages
2017-03-12 22:54:03 +13:00
Shiny
5995812215
Merge branch 'dev' into gardens-order
2017-03-12 22:53:34 +13:00
Brenda Wallace
195d1bbdbb
order gardens by recently updated
2017-03-12 20:12:28 +13:00
deppbot
55e0579384
Bundle Update on 2017-03-12
2017-03-12 18:50:42 +13:00
Megan Talbot
d167a427b9
Update public error pages
...
Author: Megan Talbot <meganftalbot@gmail.com >
Date: Wed Mar 1 15:55:30 2017 -0700
2017-03-12 14:46:40 +13:00
Brenda Wallace
c89c20e842
View harvests for a planting
2017-03-12 14:44:11 +13:00
Shiny
ad04a48c8f
Merge branch 'dev' into bw/discourse-removal
2017-03-12 13:56:04 +13:00
Shiny
d3a47b3dc6
Merge branch 'dev' into fix-traxis-badge
2017-03-12 12:49:22 +13:00
Brenda Wallace
02de30f617
Reduced duplication of the term "approved" in crop model
2017-03-12 12:31:38 +13:00
Shiny
a4360a0fa5
Merge branch 'dev' into yaml-cleanup
2017-03-12 11:44:21 +13:00
Brenda Wallace
39d4dec294
Npm sourced linters in package.json
2017-03-12 11:26:50 +13:00
Brenda Wallace
4c189b4d56
Lock haml_lint to 0.20.0 and update other gems
2017-03-12 10:53:55 +13:00
Brenda Wallace
8267b7d16d
Removing references to Discource (talk.growstuff.org)
...
and adding one link to github issues.
2017-03-12 10:51:25 +13:00
Brenda Wallace
bf9f86d516
Tie travis badge to a branch
...
Instead of showing the most recent buid (on any branch),
show the dev branch.
2017-03-12 10:42:17 +13:00
Brenda Wallace
a93c4e9fb8
Yaml file clean up
2017-03-12 10:38:39 +13:00
deppbot
3243716d13
Bundle Update on 2017-03-06
2017-03-08 10:41:52 +13:00
Cesy
685418507b
Merge pull request #1266 from Br3nda/spec-fixups
...
bugfix in some spec expectations
2017-03-05 08:32:09 +00:00
Shiny
418c5fdcd0
Merge branch 'dev' into spec-fixups
2017-03-05 21:11:06 +13:00
Brenda Wallace
322f28eaa6
bugfix in some spec expectations
2017-03-05 00:36:10 +13:00
Cesy
7a06ab0b61
Merge pull request #1264 from Br3nda/js-clean
...
Added missing semicolons to js files
2017-03-04 11:07:19 +00:00
Shiny
a5dda8ab9b
Merge branch 'dev' into js-clean
2017-03-04 23:58:04 +13:00
Cesy
54b5c139f3
Merge pull request #1263 from Br3nda/bundle-audit-update
...
Bundle audit needs updating in test runs
2017-03-04 10:34:39 +00:00
Shiny
864990dc8a
Merge branch 'dev' into js-clean
2017-03-04 17:09:01 +13:00
Brenda Wallace
1e0ccd72a2
Added missing semicolons to js files
2017-03-04 17:06:29 +13:00
Shiny
513a8924d8
Merge branch 'dev' into bundle-audit-update
2017-03-04 16:52:19 +13:00
Brenda Wallace
478d68ee25
Bundle audit needs updating
2017-03-04 16:45:43 +13:00
deppbot
175780aa06
Bundle Update on 2017-03-03
2017-03-04 16:33:18 +13:00
Miles Gould
c9558be2d3
Add deppbot to CONTRIBUTORS.md
...
This prevents deppbot-generated pull requests from failing the "are you
in CONTRIBUTORS.md?" check in CI.
2017-03-04 16:16:28 +13:00
Miles Gould
f1d3a70bbd
Install git-guilt linter
2017-03-03 14:25:03 +13:00
Miles Gould
d3dd6f88f2
Fix typo in CONTRIBUTING.md
2017-03-03 14:25:03 +13:00
Brenda Wallace
882d641683
Photo changes expire homepage too
2017-03-03 08:49:24 +13:00
pozorvlak
a53f6073a6
Merge pull request #1253 from Br3nda/rubocop-progress
...
Rubocop progress
2017-03-02 17:45:39 +00:00
pozorvlak
7c7020f50a
Merge branch 'dev' into rubocop-progress
2017-03-02 14:31:39 +00:00
pozorvlak
41b3c0f4fc
Merge pull request #1254 from Br3nda/bw/unneeded-percent-q
...
Rubocop fix for unneeded %Q
2017-03-02 14:29:05 +00:00
pozorvlak
314087321c
Merge branch 'dev' into bw/unneeded-percent-q
2017-03-02 13:41:01 +00:00
pozorvlak
c67067acaf
Merge pull request #1247 from Br3nda/overcommit
...
Run the linters etc from overcommit
2017-03-02 13:11:19 +00:00
Shiny
d23be43c2f
Merge branch 'dev' into overcommit
2017-03-02 22:24:18 +13:00
Brenda Wallace
6c282ffbd7
rubocop fix for redundant self assignment
2017-03-02 22:21:15 +13:00
Brenda Wallace
0ecc65bbe0
rubocop fix for redundant self
2017-03-02 22:21:15 +13:00
Brenda Wallace
076da040b5
Revert "Intentionally making rubocop fail"
...
This reverts commit 17858cc17c .
2017-03-02 21:53:20 +13:00
Brenda Wallace
17858cc17c
Intentionally making rubocop fail
2017-03-02 21:50:48 +13:00
Brenda Wallace
66fec1f4a3
Adding yaml linter
2017-03-02 21:32:53 +13:00
Brenda Wallace
69848f11ca
Docs on using overcommit
2017-03-02 21:22:22 +13:00
Brenda Wallace
affbe2a460
renamed ruby files to .rb
...
so rubocop cop catches these in her net
2017-03-02 21:13:35 +13:00
Brenda Wallace
cc40bb35fb
bundle exec on the contributor check
2017-03-02 21:04:21 +13:00
Shiny
542cc1f546
Merge branch 'dev' into bw/unneeded-percent-q
2017-03-02 21:02:28 +13:00
Brenda Wallace
0d2fb25881
Removed gemfile check. overcommit can do this
2017-03-02 20:59:45 +13:00
Brenda Wallace
29f050d19f
Removed check_conflicts. overcommit does this
2017-03-02 20:48:21 +13:00
Brenda Wallace
2238374080
Moved overcommit call into check_static
2017-03-02 20:47:18 +13:00
Brenda Wallace
cad8ecad8f
Added bundle-audit
2017-03-02 20:40:25 +13:00
Brenda Wallace
d161053328
Always create db - so we can check rails schema is up to date
2017-03-02 20:19:22 +13:00
Brenda Wallace
dbb74c5675
Moved phantom verion output to script
2017-03-02 20:10:47 +13:00
Brenda Wallace
6422070f04
Moved linter installs to own script
2017-03-02 20:06:47 +13:00
Brenda Wallace
b6512ce8e4
RailsSchemaUpToDate and BundleAudit added to overcommit
2017-03-02 20:00:46 +13:00
Brenda Wallace
a3e0bc0798
Rubocop fix for Gemfile
2017-03-02 19:59:59 +13:00
Brenda Wallace
5ec70d1438
Moved merge conflict checking to overcommit
2017-03-02 19:54:18 +13:00
Brenda Wallace
e848e18574
Removed commented out overcommit linters
2017-03-02 19:49:49 +13:00
Brenda Wallace
cfff970812
Revert "Intentionally making rubocop unhappy"
...
This reverts commit 6e3f5f9d77fb4b3b81265665adea1e1b416469fe.
2017-03-01 20:48:15 +00:00
Brenda Wallace
0db8c2feb2
Intentionally making rubocop unhappy
...
to test travis
2017-03-01 20:48:15 +00:00
Brenda Wallace
7e06bf4fd0
Wrap shell script variables in ""
2017-03-01 20:48:15 +00:00
Brenda Wallace
dd710860de
Run the linters etc from overcommit
2017-03-01 20:48:15 +00:00
pozorvlak
4718a9edab
Merge pull request #1256 from Br3nda/numeric
...
Rubocop fix for some numerics
2017-03-01 13:31:10 +00:00
Brenda Wallace
8c5db9229a
fixed forced octal
2017-03-01 17:49:42 +13:00
Brenda Wallace
e229438997
rubocop fox for numeric literals
2017-03-01 17:46:12 +13:00
Brenda Wallace
85a4490740
Rubocop fix for unneeded %Q
2017-03-01 17:35:06 +13:00
Brenda Wallace
9684e84420
Moved metrics to bottom of rubocop.yml
...
Waiting to be completed
2017-03-01 11:38:16 +13:00
Brenda Wallace
4364c028a2
Removed offense counts
2017-03-01 11:36:40 +13:00
Brenda Wallace
4e44e26c6c
Removed rubocop todos that are done
2017-03-01 11:24:26 +13:00
Daniel O'Connor
b07c033863
Merge pull request #1249 from Growstuff/bundle-update-2017-02-28-091217
...
Bundle Update on 2017-02-28
2017-02-28 11:59:57 +10:30
deppbot
f167f5cbd4
Bundle Update on 2017-02-28
2017-02-28 09:12:18 +08:00
pozorvlak
7a1b192392
Merge pull request #1238 from CloCkWeRX/bundle-update-2017-02-23-1
...
Upgrade rails, other gems
2017-02-27 15:18:43 +00:00
pozorvlak
642f371416
Merge branch 'dev' into bundle-update-2017-02-23-1
2017-02-27 15:01:14 +00:00
pozorvlak
f4e2b6e115
Merge pull request #1244 from Br3nda/photos-controller
...
DRY the photos controller
2017-02-27 11:26:14 +00:00
Daniel O'Connor
1873d28b50
Merge branch 'dev' into bundle-update-2017-02-23-1
2017-02-27 16:08:50 +10:30
Brenda Wallace
ce03b4efde
DRY the photos controller
2017-02-26 17:03:29 +13:00
Shiny
102c113b0c
Merge branch 'master' into dev
2017-02-25 22:56:23 +13:00
Shiny
245cd2e44c
Merge branch 'dev' into bundle-update-2017-02-23-1
2017-02-25 22:56:01 +13:00
Cesy
f28456875b
Merge pull request #1242 from Br3nda/schema-update
...
Schema is out of sync -- fixing
2017-02-24 21:15:12 +00:00
Brenda Wallace
9604eed2f3
Schema is out of sync -- fixing
2017-02-24 20:19:01 +13:00
Brenda Wallace
4eda3a506b
Fix up csv importer, should make duplicates
...
Now matches the old functionality.
2017-02-24 20:08:01 +13:00
Daniel O'Connor
14f3dc7526
Add explaining notes
2017-02-23 14:34:38 +10:30
Daniel O'Connor
f2d3c88c85
Revert "Upgrade to the 4.x series of d3-rails"
...
This reverts commit 5bd7d9aa43 .
2017-02-23 14:33:33 +10:30
Daniel O'Connor
f4e0efc8da
Update autoprefixer-rails
2017-02-23 14:32:47 +10:30
Daniel O'Connor
13bfdeaa1a
Pin Kaminari for the moment, until https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md#100 assessed
2017-02-23 14:31:47 +10:30
Daniel O'Connor
e2fb7c940f
Upgrade js-routes
2017-02-23 14:30:10 +10:30
Daniel O'Connor
5bd7d9aa43
Upgrade to the 4.x series of d3-rails
2017-02-23 14:28:19 +10:30
Daniel O'Connor
117c717391
Upgrade capybara, codeclimate-test-reporter
2017-02-23 14:25:51 +10:30
Daniel O'Connor
72603a2db0
Pin to specific omniauth versions for the moment, to avoid login test regression
2017-02-23 14:24:29 +10:30
Daniel O'Connor
9f8cfa8de3
Update sexp_processor, ruby-units
2017-02-23 14:23:01 +10:30
Daniel O'Connor
221dd45681
Upgrade to d3 3.5 “Mount Sharp”
2017-02-23 14:19:33 +10:30
Daniel O'Connor
fb2a600433
Pin d3-rails for the moment
2017-02-23 14:18:31 +10:30
Daniel O'Connor
296f8dddfa
Update selenium-webdriver, haml_lint, jasmine
2017-02-23 14:15:27 +10:30
Daniel O'Connor
da16a38d1f
Upgrade rails
2017-02-23 14:12:27 +10:30
Brenda Wallace
5abc1fb80e
duplicate alt name spec (and adding to crop)
2017-02-23 15:35:29 +13:00
Brenda Wallace
86d5f5febd
sciname/altnames adding code is very similar
2017-02-23 15:35:29 +13:00
Brenda Wallace
0a840abc58
Added specs for duplicate sci names
2017-02-23 15:35:29 +13:00
Brenda Wallace
968e9bd3ad
Rubocop fix up in spec
2017-02-23 15:35:29 +13:00
Brenda Wallace
ddd0e0c285
Fixed typo in string causing spec to fail
2017-02-23 15:35:29 +13:00
Brenda Wallace
00952d5ef6
Updating more specs for new csv importer interface
2017-02-23 15:35:29 +13:00
Brenda Wallace
a0e1d8b11d
Update scientific name model spec
2017-02-23 15:35:29 +13:00
Brenda Wallace
3d7f2ec20c
Updating specs to match new csv importer
2017-02-23 15:35:29 +13:00
Brenda Wallace
abbd2cf0a4
fix bug: look up parent crop by name in csv import
2017-02-23 15:35:29 +13:00
Brenda Wallace
2f9961651f
Call new csv importer from specs
2017-02-23 15:35:29 +13:00
Brenda Wallace
3089c28233
Adding validations to sci names and alt names
2017-02-23 15:35:29 +13:00
Brenda Wallace
4e722dd123
Move crop csv import to own file
2017-02-23 15:35:29 +13:00
Brenda Wallace
5698a78d9b
DRY the accounts controller
2017-02-23 09:45:57 +13:00
Daniel O'Connor
71804a0b41
Merge pull request #1235 from Br3nda/accounttypes-controller-DRY
...
DRY the account types controller
2017-02-22 11:03:00 +10:30
Brenda Wallace
d500c9093d
DRY the account types controller
2017-02-22 13:21:59 +13:00
Shiny
9ff468aa50
Merge pull request #1228 from Growstuff/dev
...
Release 20
2017-02-22 09:21:01 +13:00
Shiny
4261f16cd0
Merge pull request #1133 from pozorvlak/test_runners
...
Refactor test-runners
2017-02-21 11:59:09 +13:00
Shiny
b8884beb2f
Merge branch 'dev' into test_runners
2017-02-21 11:31:02 +13:00
pozorvlak
bc88c4d8c7
Merge pull request #1231 from Br3nda/seeds-controller
...
DRY seeds controller
2017-02-20 13:49:29 +00:00
pozorvlak
3ac4fbcdb8
Merge branch 'dev' into seeds-controller
2017-02-20 13:36:50 +00:00
pozorvlak
549426e3e0
Merge pull request #1230 from Br3nda/gardens-controller
...
DRY the gardens controller
2017-02-20 13:36:40 +00:00
pozorvlak
25a1f0da9a
Merge branch 'dev' into gardens-controller
2017-02-20 13:11:18 +00:00
pozorvlak
3be2fc6241
Merge pull request #1229 from Br3nda/harvests-controller
...
DRY the Harvests controller
2017-02-20 13:11:04 +00:00
pozorvlak
837934167b
Merge branch 'dev' into harvests-controller
2017-02-20 13:02:58 +00:00
pozorvlak
d43d8ae0e7
Merge pull request #1217 from Br3nda/MultilineMethodCallBraceLayout
...
Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation
2017-02-20 12:46:17 +00:00
Brenda Wallace
035b2399ca
DRY seeds controller
2017-02-20 20:54:06 +13:00
Brenda Wallace
1a3e976ba5
DRY the gardens controller
2017-02-20 02:36:51 +00:00
Brenda Wallace
d31739f86a
Further code clarity on the harvest csv filename
2017-02-20 10:07:14 +13:00
Brenda Wallace
0f523381f0
DRY the harvest controller
2017-02-20 09:58:36 +13:00
Brenda Wallace
550848a513
ParenthesesAroundCondition fixup
2017-02-19 16:20:45 +13:00
Brenda Wallace
ae3752e021
DefWithParentheses fixup
2017-02-19 16:19:16 +13:00
Brenda Wallace
50624fb2cb
Style/MultilineBlockLayout fix
2017-02-19 16:17:03 +13:00
Brenda Wallace
818466a142
MethodCallWithoutArgsParentheses fixup
2017-02-19 16:17:03 +13:00
Brenda Wallace
e184503caa
Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation
2017-02-19 16:17:03 +13:00
Brenda Wallace
d00f743c47
rubocop fix up on spec
2017-02-17 16:00:11 +13:00
pozorvlak
b19a991106
Merge pull request #1226 from Br3nda/scinames-controller
...
DRY scientific names controller
2017-02-16 23:00:29 +00:00
pozorvlak
88e019a19f
Merge branch 'dev' into scinames-controller
2017-02-16 22:52:07 +00:00
pozorvlak
e954ba801b
Merge pull request #1225 from Br3nda/comments-controller
...
DRY comments controller
2017-02-16 22:51:42 +00:00
Brenda Wallace
be23bfc419
DRY scientific names controller
2017-02-17 10:18:34 +13:00
Shiny
5e984ce04a
Merge branch 'dev' into comments-controller
2017-02-17 09:57:29 +13:00
Brenda Wallace
d15eb32133
Added some utf8, kōrero mai (te reo māori)
2017-02-17 09:47:12 +13:00
Brenda Wallace
21f11a4d5d
highest MethodLength is now 34
2017-02-17 09:26:30 +13:00
Brenda Wallace
ae398f1a63
Spec checks you can't change post id in comments#update
2017-02-17 09:20:15 +13:00
Brenda Wallace
cd3cee5d5f
DRY comments controller and add more spec scenarios
2017-02-17 09:14:01 +13:00
Miles Gould
9030e5b978
Merge branch 'dev' into test_runners
2017-02-16 13:31:39 +00:00
Miles Gould
9d6ac9fd8b
LINT ALL THE HAML!
...
.
.
.
lint *all* the HAML?
2017-02-16 13:30:20 +00:00
pozorvlak
403a8814e1
Merge pull request #1222 from Br3nda/forums-controller
...
Small clean ups on forums controller
2017-02-16 13:26:38 +00:00
Miles Gould
00c34ef30c
Document test-running process in CONTRIBUTING.md
2017-02-16 13:25:59 +00:00
Miles Gould
738c0d4e08
Store spec failures, for rspec --only-failures
...
The list of failing tests is stored in tmp/examples.txt, which is
already gitignored.
2017-02-16 13:24:50 +00:00
Miles Gould
82e27f8a71
Delete reference to Discussion Forums wiki page
...
The wiki is dead, that page hasn't been preserved, and most of the
forums it described are dead too. Sic transit gloria mundi.
2017-02-16 13:07:56 +00:00
Miles Gould
fbc203ca0d
Make Jasmine tests pass in CI
...
One test relied on reading the innerHTML attribute of an SVGElement
object; this worked in the browser, but not when run with
`rake jasmine:ci`. I've changed the test to use the `textContent`
attribute instead, which works in both places.
2017-02-16 13:01:40 +00:00
Miles Gould
c83bfc101e
Allow console.log in Jasmine tests, for debugging
2017-02-16 13:00:34 +00:00
pozorvlak
22905235c1
Merge branch 'dev' into forums-controller
2017-02-16 12:41:20 +00:00
pozorvlak
4d3b94b7f0
Merge pull request #1216 from Br3nda/more-rubocop
...
Rubocop fix for MultilineHashBraceLayout
2017-02-16 12:41:10 +00:00
pozorvlak
9e19aae0ca
Merge branch 'dev' into forums-controller
2017-02-16 12:33:55 +00:00
pozorvlak
d8c3f7ed34
Merge branch 'dev' into more-rubocop
2017-02-16 12:30:38 +00:00
pozorvlak
28a6cfe25c
Merge pull request #1223 from Br3nda/posts-controller
...
DRY the posts controller
2017-02-16 12:28:47 +00:00
pozorvlak
630d539f7d
Merge branch 'dev' into more-rubocop
2017-02-16 12:24:20 +00:00
Brenda Wallace
4704bd89f8
DRY the posts controller
2017-02-16 22:15:30 +13:00
Brenda Wallace
076695d349
Added name presence validation to forum
2017-02-16 21:52:28 +13:00
Brenda Wallace
3925a54340
DRY the forums controller
2017-02-16 21:52:07 +13:00
Brenda Wallace
6c566c56d8
removed unnecesary reloads of @forum
2017-02-16 20:16:13 +13:00
Daniel O'Connor
bcc89674d4
Upgrade to current Hashie
2017-02-16 17:18:44 +13:00
Shiny
e1dab634a2
Merge branch 'dev' into more-rubocop
2017-02-16 13:23:07 +13:00
Daniel O'Connor
e06e002282
Merge pull request #1218 from Br3nda/UnneededInterpolation
...
Fix up all UnneededInterpolation
2017-02-16 10:29:19 +10:30
Daniel O'Connor
23ed7f91ba
Merge pull request #1220 from Br3nda/ReversibleMigration
...
Marked our one ReversibleMigration as okay
2017-02-16 10:29:02 +10:30
Daniel O'Connor
aa511aedb4
Merge pull request #1219 from Br3nda/TrailingCommas
...
Removed trailing commas
2017-02-16 10:28:43 +10:30
Brenda Wallace
2b03381a24
Removed trailing commas
2017-02-15 23:33:06 +00:00
Brenda Wallace
6017c4ba23
Marked our one ReversibleMigration as okay
2017-02-16 12:32:37 +13:00
Brenda Wallace
a46b8ebe76
Fix up all UnneededInterpolation
2017-02-16 12:26:47 +13:00
Brenda Wallace
a4f8b3a0e6
Rubocop fix for MultilineHashBraceLayout
2017-02-16 12:20:32 +13:00
Daniel O'Connor
1b8c413b90
Merge pull request #1215 from Br3nda/likeable-dry
...
Likeable even more dry
2017-02-14 10:27:51 +10:30
Shiny
7a334abf1d
Merge branch 'dev' into likeable-dry
2017-02-14 12:40:05 +13:00
pozorvlak
5c067c87b8
Merge pull request #1201 from Br3nda/bw/harvest-planting-link
...
Linking existing harvests to a planting
2017-02-13 23:02:04 +00:00
Brenda Wallace
87bc1becb0
Reduced repeating code in likes controller
2017-02-14 11:52:20 +13:00
pozorvlak
7c0d6c04df
Merge branch 'dev' into bw/harvest-planting-link
2017-02-13 22:39:15 +00:00
pozorvlak
01415fd04f
Merge pull request #1214 from Br3nda/authentication-scoping
...
User can only sign out their own session
2017-02-13 22:38:40 +00:00
pozorvlak
e0def646ce
Merge branch 'dev' into authentication-scoping
2017-02-13 22:22:47 +00:00
pozorvlak
a52731dc4b
Merge pull request #1198 from Br3nda/bw/grand-haml-cleanup-of-2017
...
All the haml clean up
2017-02-13 22:20:16 +00:00
Shiny
cd2500c99a
Merge branch 'dev' into bw/harvest-planting-link
2017-02-14 00:19:28 +13:00
Shiny
c9a197bc61
Merge branch 'dev' into bw/grand-haml-cleanup-of-2017
2017-02-14 00:18:53 +13:00
Mackenzie Morgan
c5439c8650
use symbols for status codes
2017-02-13 20:56:22 +13:00
Brenda Wallace
6d0a7ebc8f
Only show plantings with overlapping date ranges on harvest options
2017-02-13 20:41:43 +13:00
Brenda Wallace
0d1bab04d5
don't load the record again
2017-02-13 20:28:29 +13:00
Brenda Wallace
e6b23262da
User can only sign out their own session
2017-02-13 20:08:31 +13:00
Brenda Wallace
06ea3db252
Use .field to format planting options on harvests
2017-02-13 17:30:41 +13:00
Brenda Wallace
8d24ffbffb
spec for harvesting from a planting
2017-02-13 17:21:11 +13:00
Brenda Wallace
cce9f513db
Linking existing harvests to a planting
2017-02-13 17:21:11 +13:00
Brenda Wallace
c37ba9f041
Use @harvest.planting, instead of @planting
2017-02-13 17:21:11 +13:00
Shiny
f8c56cc217
Merge branch 'dev' into bw/grand-haml-cleanup-of-2017
2017-02-13 17:19:58 +13:00
Daniel O'Connor
d11e6f484a
Pin leaflet-rails for the moment, until we fix tests
2017-02-13 17:19:40 +13:00
Daniel O'Connor
9218a03e2b
Upgrade only geocoder
2017-02-13 17:19:40 +13:00
Daniel O'Connor
da760a8a4c
Revert "Update geocoder, leaflet-rails"
...
This reverts commit ecd2bb1c01 .
2017-02-13 17:19:40 +13:00
Daniel O'Connor
9ccecf0e04
Update i18n-tasks bootstrap_form font-awesome-sass
2017-02-13 17:19:40 +13:00
Daniel O'Connor
5ec105ad19
Upgrade sidekiq
2017-02-13 17:19:40 +13:00
Daniel O'Connor
5c1f5f4312
Update poltergeist
2017-02-13 17:19:40 +13:00
Daniel O'Connor
48d3a64e7b
Update cancancan
2017-02-13 17:19:40 +13:00
Daniel O'Connor
decd48a970
Update geocoder, leaflet-rails
2017-02-13 17:19:40 +13:00
Daniel O'Connor
540ac7b034
Update warden
2017-02-13 17:19:40 +13:00
Daniel O'Connor
8112133cf2
Update unicorn
2017-02-13 17:19:40 +13:00
Daniel O'Connor
55f00ed0f8
Update newrelic
2017-02-13 17:19:40 +13:00
Daniel O'Connor
d0999c2f9a
Update activemerchant
2017-02-13 17:19:40 +13:00
Daniel O'Connor
47150a8ad8
Update selenium-webdriver
2017-02-13 17:19:40 +13:00
Daniel O'Connor
9301688763
Update guard
2017-02-13 17:19:40 +13:00
Daniel O'Connor
248b89a564
Update elasticsearch
2017-02-13 17:19:40 +13:00
Daniel O'Connor
8e9ffac64e
Pin to hashie 3.4.* for https://github.com/intridea/hashie/issues/408
2017-02-13 17:19:40 +13:00
Brenda Wallace
65024d8f83
Moved hash in haml onto one line, for clarity and glory
2017-02-12 20:41:25 +00:00
Shiny
8ab70a1c1c
Merge branch 'dev' into bw/grand-haml-cleanup-of-2017
2017-02-13 08:04:41 +13:00
Brenda Wallace
2c871abd03
don't allow owner in params
2017-02-13 07:41:53 +13:00
Brenda Wallace
8b4491d0ab
Tabulation on wrapped form_for
2017-02-13 07:38:26 +13:00
Brenda Wallace
93202fc13c
haml clean up for devise views
2017-02-13 07:34:41 +13:00
Brenda Wallace
0f520c0928
More haml clean up for home views
2017-02-13 07:34:31 +13:00
Brenda Wallace
21c989989c
add missing new line at end of haml file
2017-02-13 07:34:13 +13:00
Brenda Wallace
123c34b6d1
Haml cleanup for layout
2017-02-13 07:33:48 +13:00
Brenda Wallace
f5e786401d
fixed typo
2017-02-13 07:32:43 +13:00
Brenda Wallace
6ecb919f34
haml clean ups for members views
2017-02-13 07:32:43 +13:00
Brenda Wallace
c89d1ae94e
Haml clean ups for plantings views
2017-02-13 07:32:43 +13:00
Brenda Wallace
9b7a7d3e8f
Haml clean up for product views
2017-02-13 07:32:43 +13:00
Brenda Wallace
9ebe830402
Haml clean up for scientific names views
2017-02-13 07:32:43 +13:00
Brenda Wallace
9a0adadc9a
Haml clean up for seeds views
2017-02-13 07:32:43 +13:00
Brenda Wallace
92c3976f0a
Haml clean up for shared views
2017-02-13 07:32:43 +13:00
Brenda Wallace
01c25df8cf
haml-lint all views
2017-02-13 07:32:43 +13:00
pozorvlak
9ae35ca6eb
Merge pull request #1200 from Br3nda/bw/planting_slug
...
Simplified logic in planting.planting_slug
2017-02-12 15:46:22 +00:00
pozorvlak
43f9707c11
Merge branch 'dev' into bw/planting_slug
2017-02-12 15:21:41 +00:00
Mackenzie
4fa423bcab
Merge pull request #1205 from Br3nda/dry-notifications
...
DRY for the notifications controller
2017-02-12 10:21:31 -05:00
Mackenzie
97d0bb6752
Merge pull request #1207 from Br3nda/DRY-plantparts
...
DRY the plant parts controller
2017-02-12 10:20:30 -05:00
Mackenzie
b9edd2f89b
Merge pull request #1203 from Br3nda/access
...
Added cancan ability for likes (and DRY-ed)
2017-02-12 10:20:03 -05:00
pozorvlak
4bd50ca433
Merge branch 'dev' into bw/planting_slug
2017-02-12 15:19:55 +00:00
pozorvlak
a2dd675717
Merge pull request #1199 from Br3nda/time-zones
...
Use timezone when creating dates
2017-02-12 15:19:38 +00:00
Brenda Wallace
1275aa0102
DRY the plant parts controller
2017-02-12 22:58:17 +13:00
Brenda Wallace
f40ff18949
You can only reply to messages that were sent to you.
2017-02-12 22:15:50 +13:00
Brenda Wallace
f25d4dbf8c
DRY for the notifications controller
2017-02-12 21:52:22 +13:00
Brenda Wallace
4dd99f54db
Removed deprecation notice from controller spec
2017-02-12 20:55:06 +13:00
Brenda Wallace
b8e06a1d1d
Specs for deleting someone else's like
2017-02-12 20:50:50 +13:00
Brenda Wallace
f7b8113af1
Fixed spec, now requests json response
2017-02-12 20:36:24 +13:00
Brenda Wallace
b0394d1028
checks json returned by likes controller
2017-02-12 17:42:24 +13:00
Brenda Wallace
fa0c00aa9c
Named arg (liked_by_member) fixed
...
cos i was writing python when this is meant to be ruby
2017-02-12 17:37:32 +13:00
Brenda Wallace
a507eb47bf
Removed trailing white space
2017-02-12 17:26:34 +13:00
Brenda Wallace
865f323f97
controller specs for likes controller
2017-02-12 15:35:15 +13:00
Brenda Wallace
c82f47bdda
Pass the ID from link to likesdestroy
2017-02-12 15:34:28 +13:00
Brenda Wallace
72d0514e75
Further checks in likes controller
2017-02-12 15:33:54 +13:00
Brenda Wallace
dc62365c7d
DRY likes controller further
2017-02-12 15:23:58 +13:00
Brenda Wallace
d8d94d178c
Moved some of likes#destroy out to new methods
2017-02-12 15:23:58 +13:00
Brenda Wallace
6afb12c157
Split up big methods in like controller
2017-02-12 15:23:58 +13:00
Brenda Wallace
a0be52fdaa
likes doesn't have an index
2017-02-12 15:23:58 +13:00
Brenda Wallace
6b8474e01b
Checks for cancan ability before allowing like
2017-02-12 15:23:58 +13:00
Shiny
23ae7fcd8c
Merge branch 'dev' into time-zones
2017-02-12 12:14:01 +13:00
Shiny
179cfbf6bc
Merge branch 'dev' into bw/planting_slug
2017-02-12 12:13:37 +13:00
Mackenzie
b5f82a8fc8
Merge pull request #1202 from Br3nda/code-climate-knows
...
Simplified alternate names controller.
2017-02-11 11:06:30 -05:00
Brenda Wallace
54c01cbd82
Removing alternate names from rubocop todo
2017-02-11 19:48:16 +13:00
Brenda Wallace
cf9e5a6652
Adding alternate names to admin menu
2017-02-11 19:45:53 +13:00
Brenda Wallace
01c6a6da9f
improvements to alternate names controller
2017-02-11 19:45:33 +13:00
Shiny
cc1daf8f6b
Join slug with -
2017-02-10 23:54:16 +13:00
Shiny
a0bf815663
Downcase planting slug
2017-02-10 23:52:10 +13:00
Brenda Wallace
ce573c1e55
Simplified logic in planting.planting_slug
2017-02-10 22:41:28 +13:00
Brenda Wallace
be2426c99f
Use timezone when creating dates
2017-02-10 21:53:18 +13:00
Shiny
7ca314c2f2
Merge pull request #1191 from Growstuff/dev
...
Release 19
2017-02-10 09:24:00 +13:00
Mackenzie
36768cf384
Merge pull request #1194 from Br3nda/bw/grand-haml-cleanup-of-2017
...
More haml clean up
2017-02-08 22:46:34 -05:00
Mackenzie
e35d0455bd
Merge pull request #1196 from Br3nda/spammer-begone
...
stripping html from markdown
2017-02-08 22:43:51 -05:00
Brenda Wallace
c8405830c7
Added strip_tags before processing markdown
2017-02-09 03:29:18 +00:00
Shiny
6bc9f775c2
Merge branch 'dev' into bw/grand-haml-cleanup-of-2017
2017-02-09 10:23:01 +13:00
Mackenzie
a43526776b
Merge pull request #1195 from Br3nda/bw/spammer-injection-begone
...
Truncate, escape, and DRY og:description fields
2017-02-07 16:00:32 -05:00
Brenda Wallace
6f74566d47
Truncate, escape, and DRY og:description fields
2017-02-08 09:49:19 +13:00
Brenda Wallace
82ce6c8222
Haml clean up for seeds views
2017-02-08 08:52:46 +13:00
Brenda Wallace
f96f459595
Moved title logic into application helper
...
For harvests, plantings, and seeds
2017-02-08 07:25:59 +13:00
Brenda Wallace
096146cb84
Fix: @owner -> owner in harvests_title
2017-02-08 07:25:59 +13:00
Brenda Wallace
ba1c40702b
DRY up gardens and plantings helper
2017-02-08 07:25:59 +13:00
Brenda Wallace
e6254da3f1
Haml clean up for Roles views
2017-02-08 07:25:59 +13:00
Brenda Wallace
acbb610e05
Haml clean up for posts views
2017-02-08 07:25:59 +13:00
Brenda Wallace
338265d9e9
Haml cleanup for plantings views
2017-02-08 07:25:59 +13:00
Brenda Wallace
706922cacf
Haml clean up for plantparts views
2017-02-08 07:25:59 +13:00
Brenda Wallace
08f2877f8e
Haml clean up for places views
2017-02-08 07:25:59 +13:00
Brenda Wallace
8275f5be96
Add photos to travis haml check
2017-02-08 07:25:59 +13:00
Brenda Wallace
2c3d1848d5
Haml clean up for photos
2017-02-08 07:25:59 +13:00
Brenda Wallace
17e88778c8
Haml clean up for orders
2017-02-08 07:25:59 +13:00
Brenda Wallace
bafb0123da
Haml cleanup for notifier
2017-02-08 07:25:59 +13:00
Brenda Wallace
e1e9c32652
Moved havests#index title to a helper
2017-02-08 07:25:59 +13:00
Brenda Wallace
48c3cbb3d1
Change to hash attributes syntax in harvests#show
2017-02-08 07:25:59 +13:00
Brenda Wallace
740b8587f2
Moved complex parts of garden/nav into helper
2017-02-08 07:25:59 +13:00
Brenda Wallace
b113146aaa
Add harvest and gardens to travis for haml-lint
2017-02-08 07:25:59 +13:00
Brenda Wallace
900de8a615
Fixed Read more link in harvests
2017-02-08 07:25:59 +13:00
Brenda Wallace
d73aa98309
Cleaned up most of Home's haml
2017-02-08 07:25:59 +13:00
Brenda Wallace
ac7d44cb72
Cleaned up most of harvest's haml
2017-02-08 07:25:59 +13:00
Miles Gould
d301f2f2ae
Add static check for files with merge conflicts
...
Fixes #1146
2017-02-07 15:03:52 +00:00
Miles Gould
2accb727e5
Describe rake static
2017-02-07 14:38:04 +00:00
Miles Gould
16db285898
Only run ES tests under GROWSTUFF_ELASTICSEARCH
...
And vice-versa: only run non-ElasticSearch tests under
GROWSTUFF_ELASTICSEARCH=false
2017-02-07 14:27:14 +00:00
Miles Gould
b8c0882642
Tag ElasticSearch-related tests
2017-02-07 14:27:14 +00:00
Miles Gould
cc54dc54b4
Only build ElasticSearch index for ES tests
2017-02-07 14:27:14 +00:00
Miles Gould
3f8ebdc477
Run JavaScript unit tests from Travis
...
`rspec spec` doesn't run the Jasmine tests, annoyingly, so I've added a
call to `rake jasmine:ci`.
2017-02-07 14:27:14 +00:00
Miles Gould
68120c5bbe
Make rake spec depend on rake assets:precompile
2017-02-07 14:27:14 +00:00
Miles Gould
71ec9fd2d3
Run JS tests from rake and rake spec:unit
2017-02-07 14:27:14 +00:00
Miles Gould
f11bc42507
Turn on asset compilation in test
...
This is required for running jasmine tests via `rake spec:javascript`.
The comment above this setting warned that it would slow down testing
considerably; in my quick tests the slowdown is only about 2% (3mins 14
vs 3mins 11). We precompile assets in Travis, so this *shouldn't* cause
any more random CI failures...
2017-02-07 14:27:14 +00:00
Miles Gould
7672b9ffc8
Add spec:unit Rake task
2017-02-07 14:27:14 +00:00
Miles Gould
8d237cc2ee
Make rake run specs and static checks by default
2017-02-07 14:27:14 +00:00
Miles Gould
a875a7c883
Cache asset-pipeline cache in Travis
...
This should shave about 30s off each job.
2017-02-07 14:27:14 +00:00
Miles Gould
19d65587be
Split static checks into a separate Travis job
2017-02-07 14:27:14 +00:00
Miles Gould
3fed962dcc
Add script/check_static to run all static checks
...
...and invoke it from .travis.yml
2017-02-07 14:27:14 +00:00
Miles Gould
987f50c87e
Factor out global env vars in .travis.yml
...
This should make it slightly more obvious which job is which when
looking at Travis build results.
2017-02-07 13:52:23 +00:00
Daniel O'Connor
bba057ec76
Merge pull request #1192 from Br3nda/bw/three-pending-specs
...
Filled in the 3 pending planting specs
2017-02-07 16:36:59 +10:30
Brenda Wallace
1dc44c9edc
Filled in the 3 pending planting specs
2017-02-07 18:29:10 +13:00
Daniel O'Connor
92c1515381
Merge pull request #1186 from CloCkWeRX/fix_date_expectation
...
Fix #1182 and improve test coverage
2017-02-07 14:02:31 +10:30
Shiny
43f905ea25
Merge branch 'dev' into fix_date_expectation
2017-02-07 16:03:39 +13:00
Brenda Wallace
1db30d98ce
Haml clean up for members
2017-02-07 15:35:34 +13:00
Shiny
2b92f013fc
Merge branch 'dev' into fix_date_expectation
2017-02-07 14:34:41 +13:00
Brenda Wallace
23f8c24ef4
Haml clean up for notifications
2017-02-07 14:33:20 +13:00
Daniel O'Connor
fba2306a4d
Merge pull request #1190 from Br3nda/bw/haml-shop
...
Haml clean for shop
2017-02-07 11:15:26 +10:30
Brenda Wallace
c8fa54591a
Haml clean for shop
2017-02-07 07:53:34 +13:00
Daniel O'Connor
67b496fe44
Merge pull request #1185 from Br3nda/bw/grand-haml-cleanup-of-2017
...
Forums and Gardens haml clean up
2017-02-06 14:13:27 +10:30
Daniel O'Connor
b24514fa82
Look at right attribute
2017-02-06 14:11:44 +10:30
Daniel O'Connor
f0a81d4100
Fix #1182 and improve test coverage
2017-02-06 14:10:40 +10:30
Brenda Wallace
64f11793c9
Fixed typo in link
2017-02-06 16:31:57 +13:00
Brenda Wallace
05a9d498a7
More forums haml clean up
2017-02-06 14:50:49 +13:00
Brenda Wallace
16145599ce
Haml clean up for (most) garden views
2017-02-06 14:46:19 +13:00
Brenda Wallace
af8527aa5b
Haml clean up of forum views
2017-02-06 14:46:19 +13:00
Daniel O'Connor
f9eb70e2eb
Merge pull request #1184 from Br3nda/bw/grand-haml-cleanup-of-2017
...
Haml clean up -- crops views
2017-02-06 11:47:47 +10:30
Brenda Wallace
8408fdc845
Moved popular plant plarts calculation into sql
2017-02-06 13:22:18 +13:00
Brenda Wallace
f37c9152af
Simplified the "grown for" view
2017-02-06 11:21:33 +13:00
Brenda Wallace
4ee789ca06
Popular plant parts are now sorted by popularity
2017-02-06 10:59:40 +13:00
Brenda Wallace
43e4ed43cd
Travis starts checking the haml that's cleaned up
...
To stop regressions to bad haml again
2017-02-06 10:46:49 +13:00
Brenda Wallace
80371c835c
Moved long line (ebay url) to helper
2017-02-06 10:40:58 +13:00
Brenda Wallace
6478d9cb1b
Haml clean up for crops views
2017-02-06 10:31:45 +13:00
pozorvlak
f8b84f390d
Calculate "count_uses_of_property" using DB query ( #1183 )
...
* Refactor 'count_uses_of_property' method in crop model
* Add check for nil column value
* Add @alran to CONTRIBUTORS.md
* Reformat Crop#count_uses_of_property
* Remove unnecessary string interpolation
2017-02-05 13:23:47 +13:00
pozorvlak
755b9b339f
Merge pull request #1181 from Br3nda/bw/grand-haml-cleanup-of-2017
...
Te grand haml cleanup of 2017
2017-02-04 23:07:12 +00:00
Shiny
9deed09d36
Merge branch 'dev' into bw/grand-haml-cleanup-of-2017
2017-02-05 11:01:46 +13:00
pozorvlak
43de722faf
Merge pull request #1180 from Br3nda/bw/application-controller-complexity
...
Reduce complexity of ApplicationController.store_location
2017-02-04 21:55:51 +00:00
pozorvlak
e145bb59f7
Merge branch 'dev' into bw/application-controller-complexity
2017-02-04 21:45:06 +00:00
pozorvlak
911c7b7bc1
Merge pull request #1174 from Br3nda/bw/rubocop-reduce-complexity
...
rubocop - reduce complexity
2017-02-04 21:44:42 +00:00
Brenda Wallace
2b7144c1fd
Fixed trailing quote in haml
2017-02-04 15:07:18 +13:00
Brenda Wallace
8ddf36fed9
Haml clean up for (some of) crops views
2017-02-04 15:04:07 +13:00
Brenda Wallace
785ae33a42
Haml clean up for comments views
2017-02-04 14:07:59 +13:00
Brenda Wallace
c43c1686a3
Haml clean up for alternate_names views
2017-02-04 13:50:04 +13:00
Brenda Wallace
65a8bde467
Haml clean up for admin views
2017-02-04 12:00:42 +13:00
Brenda Wallace
3647f67538
Haml clean up for accounts views
2017-02-04 11:52:15 +13:00
Brenda Wallace
6c4f7eff92
Haml clean up for account_types views
2017-02-04 11:50:33 +13:00
Brenda Wallace
9b57a44f6c
Adding haml-lint
2017-02-04 11:41:02 +13:00
Brenda Wallace
8a69ed4013
Reduce complexity of ApplicationController.store_location
2017-02-04 11:31:34 +13:00
Brenda Wallace
e5d826e8c3
Further simplified newsletter subscription logic
2017-02-04 11:28:37 +13:00
Brenda Wallace
77c01d4f66
BUGFIX: Added missing if
2017-02-04 11:23:27 +13:00
Brenda Wallace
33b7952ed3
Simplified OmniauthCallbacksController
2017-02-04 11:21:15 +13:00
Brenda Wallace
1217ba5b48
Reduce complexity of ApplicationController.store_location
2017-02-04 11:19:11 +13:00
Brenda Wallace
ffee6ada83
Simplify member.update_newsletter_subscription
2017-02-04 11:18:00 +13:00
Brenda Wallace
63b71a9265
Reduce controller complexity
2017-02-04 11:18:00 +13:00
pozorvlak
3ecc7ba99b
Merge pull request #1178 from Br3nda/bw/plantingshelper-simplify
...
PlantingsHelper simplification
2017-02-03 13:36:42 +00:00
pozorvlak
3e81419e78
Merge branch 'dev' into bw/plantingshelper-simplify
2017-02-03 12:08:54 +00:00
pozorvlak
7cd8dfa0c7
Merge pull request #1176 from Br3nda/bw/seeds-controller-complexity
...
Reduce complexity of seeds controller
2017-02-03 12:08:45 +00:00
pozorvlak
9182c8ceb1
Merge branch 'dev' into bw/seeds-controller-complexity
2017-02-03 11:12:20 +00:00
pozorvlak
ec8096233c
Merge pull request #1179 from CloCkWeRX/repair_gemfile
...
Repair missing items from Gemfile.lock - jasmine/phantomjs
2017-02-03 11:11:28 +00:00
Brenda Wallace
19aa3a1ca4
PlantingsHelper simplification
2017-02-03 20:42:15 +13:00
Shiny
e574ee166c
Merge branch 'dev' into bw/seeds-controller-complexity
2017-02-03 20:32:29 +13:00
Daniel O'Connor
93e9428bb6
Repair missing items from Gemfile.lock
2017-02-03 11:11:47 +10:30
pozorvlak
fcf453b9d9
Merge pull request #1173 from Br3nda/bw/inactive-gardens
...
hide inactive gardens by default
2017-02-02 22:57:54 +00:00
pozorvlak
909164ea70
Merge branch 'dev' into bw/inactive-gardens
2017-02-02 22:40:21 +00:00
pozorvlak
b5a5aca67b
Merge pull request #1175 from Br3nda/bw/plantings-controller-complexity
...
Reduce complexity of plantings controller
2017-02-02 22:22:41 +00:00
Shiny
2424e7de87
Merge branch 'dev' into bw/inactive-gardens
2017-02-02 14:48:31 +13:00
Shiny
d367b44da1
Merge branch 'dev' into bw/plantings-controller-complexity
2017-02-02 14:48:14 +13:00
Shiny
fe999d7170
Merge branch 'dev' into bw/seeds-controller-complexity
2017-02-02 14:47:10 +13:00
Daniel O'Connor
3267fd7d1f
Merge pull request #1177 from Br3nda/bw/simplify-harvest-to-s
...
Simplified harvest.to_s
2017-02-02 10:58:16 +10:30
Brenda Wallace
355419b6cb
Reduce complexity of seeds controller
2017-02-02 00:01:48 +00:00
Brenda Wallace
dfa23a6564
Simplified harvest.to_s
2017-02-01 23:55:45 +00:00
Brenda Wallace
9099ee5779
Reduce complexity of plantings controller
2017-02-01 23:51:14 +00:00
Brenda Wallace
7ba9049908
spec only show active gardens
2017-02-01 18:25:56 +13:00
Brenda Wallace
c82127f1fb
Modify specs for new titles on garden nav buttons
2017-02-01 17:37:03 +13:00
Brenda Wallace
666394906b
Active gardens only on profiles
2017-02-01 17:37:03 +13:00
Brenda Wallace
150393b1c3
Show only active gardens by default
2017-02-01 17:37:03 +13:00
Daniel O'Connor
e8e1e33a07
Merge pull request #1172 from pozorvlak/install_d3
...
Install d3-rails gem in production and staging
2017-01-31 11:01:41 +10:30
Miles Gould
18e6e8510c
Install d3-rails gem in production and staging
...
It was only being installed in development and test environments,
causing deployment failures.
Fixes #1170
2017-01-30 20:17:42 +00:00
Daniel O'Connor
64d7c2535b
Merge pull request #1168 from Br3nda/likeable
...
Reviving Likeable
2017-01-27 12:30:36 +10:30
Daniel O'Connor
15106a051c
Merge branch 'dev' into likeable
2017-01-27 12:05:13 +10:30
Daniel O'Connor
62fe72c9f4
Merge pull request #1143 from pozorvlak/bw/bar_graphs
...
[WIP] bar graphs
2017-01-27 12:01:03 +10:30
Daniel O'Connor
43519809f5
Merge branch 'dev' into bw/bar_graphs
2017-01-27 11:54:12 +10:30
Shiny
7731623397
Merge branch 'dev' into likeable
2017-01-27 14:21:53 +13:00
pozorvlak
3b3e14fadb
Merge pull request #1161 from Br3nda/bw/pending-crops
...
Member can see crops they have requested
2017-01-26 11:21:24 +00:00
Daniel O'Connor
271242eca9
Merge branch 'dev' into bw/bar_graphs
2017-01-25 13:00:25 +10:30
Daniel O'Connor
a607fdc6ec
Merge branch 'dev' into likeable
2017-01-25 12:58:55 +10:30
Daniel O'Connor
6d1bdf9ae1
Merge branch 'dev' into bw/pending-crops
2017-01-25 12:55:13 +10:30
Daniel O'Connor
25058d02fc
Merge pull request #1164 from Br3nda/bw/link-from-harvest-to-planting
...
Link from harvest to planting, instead of garden
2017-01-25 12:54:42 +10:30
Shiny
b80e7f677c
Merge branch 'dev' into likeable
2017-01-24 19:44:42 +13:00
pozorvlak
576426c30d
Merge pull request #1166 from Br3nda/bw/fix-notify-sys-exit
...
Fix crashing on email send - HOTFIX to master
2017-01-23 17:54:19 +00:00
Shiny
c9b464771d
Merge branch 'master' into bw/fix-notify-sys-exit
2017-01-23 21:50:22 +13:00
Shiny
76af02f2a5
Merge branch 'dev' into bw/bar_graphs
2017-01-23 20:18:19 +13:00
Shiny
346970b471
Merge branch 'dev' into bw/pending-crops
2017-01-23 20:17:44 +13:00
Shiny
e6d3c257e8
Merge branch 'dev' into bw/link-from-harvest-to-planting
2017-01-23 20:17:34 +13:00
Daniel O'Connor
7224ef8848
Merge pull request #1159 from Br3nda/bw/garden-display-fix
...
Fix display of gardens on smaller screens
2017-01-23 14:59:43 +10:30
Brenda Wallace
dd9a0071d2
Link from harvest to planting, instead of garden
2017-01-23 09:58:25 +13:00
Brenda Wallace
65b4b2d23e
Feature spec for requested crops
2017-01-23 09:49:47 +13:00
Brenda Wallace
4fedc7f23f
Member can see crops they have requested
2017-01-23 09:49:47 +13:00
Shiny
26b3e28171
Merge branch 'dev' into bw/garden-display-fix
2017-01-23 09:41:37 +13:00
Daniel O'Connor
29765c7bab
Merge pull request #1160 from Br3nda/bw/fix-notify-sys-exit
...
change deliver_later to deliver_now, so we don't sys.exit() crash
2017-01-23 00:21:47 +10:30
Brenda Wallace
370938c9f9
change deliver_later to deliver_now, so we don't sys.exit() crash
2017-01-22 21:22:30 +13:00
Cesy
e578ca2c77
Merge pull request #1153 from Growstuff/dev
...
Release 18
2017-01-22 07:47:42 +00:00
Brenda Wallace
08d407f041
Fix display of gardens on smaller screens
2017-01-22 20:33:37 +13:00
Shiny
d6de147661
Merge branch 'dev' into bw/bar_graphs
2017-01-22 18:39:53 +13:00
Brenda Wallace
9cadbdec2b
Regenerated schema file
2017-01-22 18:27:32 +13:00
Brenda Wallace
5e61be9853
Merge remote-tracking branch 'upstream/dev' into HEAD
2017-01-22 18:26:38 +13:00
Brenda Wallace
ff50ec65d0
Merge remote-tracking branch 'upstream/dev' into HEAD
2017-01-22 18:26:29 +13:00
Daniel O'Connor
c4c50a4174
Merge pull request #1158 from Br3nda/bw/controller-translations
...
more controller translations
2017-01-22 15:34:14 +10:30
Brenda Wallace
a1c74bfdfb
Translations for members controller
2017-01-22 17:36:48 +13:00
Brenda Wallace
2f9453780e
Translations for harvests controller
2017-01-22 17:28:49 +13:00
Brenda Wallace
725ae817d4
Translations for gardens controller
2017-01-22 17:26:30 +13:00
Daniel O'Connor
eab9bcb37d
Merge pull request #1157 from Br3nda/bw/rubocop-hash-braces
...
Removed unnecesary braces on hash args
2017-01-22 13:22:11 +10:30
Brenda Wallace
40a981c94d
Removed unnecesary braces on hash args
2017-01-22 15:10:11 +13:00
Cesy
dd2af6a0e3
Merge pull request #1155 from CloCkWeRX/2017-01-21-gem-updates
...
2017 01 21 gem updates
2017-01-21 19:49:05 +00:00
Daniel O'Connor
9192ccf52b
Update coveralls
2017-01-21 17:02:40 +10:30
Daniel O'Connor
4e79fd201c
Update omniauth
2017-01-21 17:01:59 +10:30
Daniel O'Connor
d266d7ed1a
Update i18n-tasks
2017-01-21 16:52:24 +10:30
Daniel O'Connor
f7f1907b74
Silence config/routes.rb:1:39: W: Lint/UnneededDisable: Unnecessary disabling of Metrics/BlockLength for now
2017-01-21 16:45:04 +10:30
Daniel O'Connor
c42e9ca410
Upgrade factory_girl_rails
2017-01-21 16:42:04 +10:30
Daniel O'Connor
f97c465a92
Update geocoder
2017-01-21 16:41:15 +10:30
Daniel O'Connor
a5b566a207
Update lumberjack
2017-01-21 16:40:27 +10:30
Daniel O'Connor
c6d16c92f5
Update public_suffix
2017-01-21 16:40:04 +10:30
Daniel O'Connor
c5b2e37730
Update diff-lcs
2017-01-21 16:39:31 +10:30
Daniel O'Connor
5c642dfef9
Really disable
2017-01-21 16:37:30 +10:30
Daniel O'Connor
a9b8253dfa
Update connection_pool
2017-01-21 16:35:33 +10:30
Daniel O'Connor
58a3cbf569
Disable check for now
2017-01-21 16:28:57 +10:30
Daniel O'Connor
8b4c8fef3b
Pin to earlier version of rainbow until https://github.com/sickill/rainbow/issues/44 is sorted
2017-01-21 16:14:37 +10:30
Daniel O'Connor
36c0de4504
Upgrade to selenium-webdriver 3.0.0
2017-01-21 16:04:15 +10:30
Daniel O'Connor
3208bf9fb6
Regenerate rubocop configuration
2017-01-21 15:58:52 +10:30
Daniel O'Connor
4eebf5c867
Error: The Style/MethodCallParentheses cop has been renamed to Style/MethodCallWithoutArgsParentheses.
2017-01-21 15:57:01 +10:30
Daniel O'Connor
61f7bdfdd2
Update rubocop
2017-01-21 15:56:02 +10:30
Daniel O'Connor
06838d7ad1
Update ruby_dep, unicode-display_width
2017-01-21 15:55:22 +10:30
Daniel O'Connor
676f246e85
Merge pull request #1154 from Br3nda/bw/translations
...
More translations
2017-01-21 15:51:41 +10:30
Shiny
6121a9bc6e
Merge branch 'dev' into bw/translations
2017-01-20 21:05:31 +11:00
Brenda Wallace
c2804f1725
Merge branch 'bw/controller-translations' into bw/translations
...
Conflicts:
config/locales/en.yml
2017-01-20 23:04:00 +13:00
Brenda Wallace
b198305d36
Translations for account controller
2017-01-20 22:48:04 +13:00
Brenda Wallace
7d7f5bfda3
Translations for account types
2017-01-20 22:46:12 +13:00
Brenda Wallace
d97af8e76e
Adding missing translation for harvests
2017-01-20 22:40:14 +13:00
Brenda Wallace
91adc5f59e
Normalise english translations file
2017-01-20 22:23:38 +13:00
Shiny
714b2580a3
Merge branch 'dev' into bw/bar_graphs
2017-01-18 11:15:09 +13:00
pozorvlak
a8d5b14d46
Merge pull request #1150 from Br3nda/bw/rubocop
...
Rubocop fix up for the models
2017-01-17 17:43:24 +00:00
pozorvlak
cc59c4f49b
Merge branch 'dev' into bw/rubocop
2017-01-17 16:47:07 +00:00
pozorvlak
8a7b7e75ef
Merge pull request #1141 from Br3nda/bw/active-plantings
...
Show only active plantings by default
2017-01-17 16:41:22 +00:00
Shiny
f8dda12de6
Merge branch 'dev' into bw/active-plantings
2017-01-15 17:36:32 +13:00
Shiny
ab332976da
Merge branch 'dev' into bw/rubocop
2017-01-15 17:36:17 +13:00
pozorvlak
331c778350
Merge pull request #1152 from CloCkWeRX/upgrade-comfortable-mexican-sofa
...
Upgrade to current comfortable_mexican_sofa
2017-01-14 22:20:54 +00:00
Cesy
48b6a2297b
Merge branch 'master' into dev
2017-01-14 20:21:46 +00:00
pozorvlak
27ea2e0432
Merge branch 'dev' into upgrade-comfortable-mexican-sofa
2017-01-14 19:53:06 +00:00
pozorvlak
4c0000b964
Merge pull request #1145 from Br3nda/bw/description-photo-links
...
Descriptive links from photo page
2017-01-14 19:51:20 +00:00
Daniel O'Connor
a3ee17bd4d
#1054 Upgrade to current comfortable_mexican_sofa
2017-01-15 02:19:15 +10:30
Brenda Wallace
958e7eb955
Removed rubocop excludes that we have fixed
2017-01-14 21:13:59 +13:00
Brenda Wallace
39888d44e2
Rubocop compliance for the account model
2017-01-14 21:11:02 +13:00
Brenda Wallace
b603bae1a7
Rubocop compliance for the notification model
2017-01-14 21:09:47 +13:00
Brenda Wallace
05db5f3109
Rubocop compliance for the order_item model
2017-01-14 21:08:47 +13:00
Brenda Wallace
ad72ab0ba8
Rubocop compliance for the role model
2017-01-14 21:04:19 +13:00
Brenda Wallace
3beb3974fc
Rubocop compliance for the product model
2017-01-14 21:03:01 +13:00
Brenda Wallace
fa15fd2912
Rubocop compliance for the photo model
2017-01-14 21:01:46 +13:00
Brenda Wallace
78ed7869c5
Rubocop compliance for the member model
2017-01-14 20:57:18 +13:00
Brenda Wallace
0fa9f54c9c
Rename member.has_role? to role?
2017-01-14 20:54:43 +13:00
Brenda Wallace
f214f608ff
Rename member.is_paid? to paid?
2017-01-14 20:51:22 +13:00
Brenda Wallace
eb70f6dc57
Rubocop compliance for the seed model
2017-01-14 20:48:19 +13:00
Brenda Wallace
43c4b154f9
Rubocop compliance for the follow model
2017-01-14 20:45:54 +13:00
Brenda Wallace
21a536bf86
Merge remote-tracking branch 'upstream/dev' into bw/rubocop
2017-01-14 20:43:02 +13:00
Brenda Wallace
832a20eac9
Rubocop compliance for order model
2017-01-14 20:42:32 +13:00
Brenda Wallace
f6cc0f3e13
rubocop compliance in post model
2017-01-14 20:34:08 +13:00
Brenda Wallace
5be5585084
Rubocop disable Rails/HasAndBelongsToMany
2017-01-14 20:31:34 +13:00
Brenda Wallace
989f176fb7
Crop model adhering to rubocop
2017-01-14 20:09:54 +13:00
Brenda Wallace
be07b5fd0e
Only check values.zero? if they are present
2017-01-14 20:09:09 +13:00
Shiny
180505a1ca
Merge branch 'dev' into bw/active-plantings
2017-01-14 18:27:18 +13:00
Shiny
22343385f6
Merge branch 'dev' into bw/bar_graphs
2017-01-14 18:26:48 +13:00
Shiny
e11603cb3e
Merge branch 'dev' into bw/description-photo-links
2017-01-14 18:25:52 +13:00
Daniel O'Connor
97c5eb1c42
Merge pull request #1149 from Br3nda/bw/quotes-in-name
...
Removed unwanted quotes in member name in menu
2017-01-14 15:09:04 +10:30
Brenda Wallace
d07509f9e4
Rubocop compliance for comment model
2017-01-14 17:23:39 +13:00
Brenda Wallace
0c1220d11f
Rubocop compliance for harvest model
2017-01-14 17:22:33 +13:00
Brenda Wallace
f889b112fe
Rubocop compliance for garden model
2017-01-14 17:20:21 +13:00
Brenda Wallace
a1cfa826d9
Removed unwanted quotes in member name in menu
...
Fix for Issue #1144
2017-01-14 17:11:58 +13:00
Brenda Wallace
477f9669bd
Added nav for plantings
2017-01-14 16:54:37 +13:00
Brenda Wallace
c1da5e4dc8
Split plantings#index into two methods to simplify
2017-01-14 16:47:29 +13:00
Brenda Wallace
6bdfe5a669
Moved plantings nav bar to own file and simplified
2017-01-14 16:32:03 +13:00
Shiny
8138aa8c09
Merge branch 'dev' into bw/active-plantings
2017-01-14 15:33:28 +13:00
Brenda Wallace
eba397117c
Planting needs to calculate slugs before model is valid
2017-01-14 11:41:48 +13:00
Brenda Wallace
f9396248e6
Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links
2017-01-11 12:12:36 +13:00
Miles Gould
d0351bad70
Merge branch 'dev' into bw/bar_graphs
2017-01-09 15:21:38 +00:00
Miles Gould
7ca371ae43
Merge remote-tracking branch 'mine/bw/bar_graphs' into bw/bar_graphs
2017-01-09 15:19:18 +00:00
Miles Gould
7fa0d22583
Graph real crop sunninesses from server
...
Works for me in superficial manual testing, but needs automated tests.
Also currently does two server round trips (one for planting locations
and one for sunninesses); it would be better to combine these into one,
or alternatively to create a "crop stats" API endpoint and calculate
sunniness stats in SQL.
2017-01-09 15:13:55 +00:00
pozorvlak
f31342c6e0
Merge pull request #1147 from Br3nda/alpha-bundle
...
Bundle alphabetical order to comply with stricter rubocop.
Patch is semantically a no-op, and the static check failure is expected.
2017-01-09 12:11:45 +00:00
Brenda Wallace
87a091d694
Bundle alpha-order to comply with stricter rubocop
2017-01-08 20:50:52 +00:00
Brenda Wallace
2e04d56225
Merge remote-tracking branch 'origin/bw/description-photo-links' into bw/description-photo-links
2017-01-08 21:48:58 +13:00
Brenda Wallace
405dfe4bc9
Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links
2017-01-08 21:35:59 +13:00
Shiny
15de4ac08c
Merge branch 'dev' into bw/active-plantings
2017-01-08 11:16:19 +13:00
Shiny
6e535f2403
Merge branch 'dev' into bw/bar_graphs
2017-01-08 11:10:21 +13:00
Shiny
c55208713b
Merge branch 'dev' into bw/description-photo-links
2017-01-08 11:09:19 +13:00
Shiny
48c1b4d0f9
Merge pull request #1142 from Br3nda/bw/harvests-linkto-plantings
...
Link a harvest to a planting, and display
2017-01-08 11:08:42 +13:00
Brenda Wallace
2f38a8585b
Revert "update spec for stringify"
...
This reverts commit 144823bd13 .
2017-01-07 13:50:11 +13:00
Brenda Wallace
062ff16acf
Put garden.to_s back to garden.name
2017-01-07 13:17:53 +13:00
Brenda Wallace
7f30ce04e0
Garden name (truncated) on front page link
2017-01-07 13:09:35 +13:00
Brenda Wallace
144823bd13
update spec for stringify
2017-01-07 12:52:47 +13:00
Brenda Wallace
90b19d52bb
Don't rely on to_s for slug. Fragile with translations
2017-01-07 12:49:57 +13:00
Brenda Wallace
76be980163
Translate garden.location
2017-01-07 12:48:14 +13:00
Brenda Wallace
88b1f02574
Added require of photo model constants
2017-01-07 12:44:08 +13:00
Brenda Wallace
5b633b484b
Fixes link to seeds, and spec for link to seeds
2017-01-07 12:22:28 +13:00
Brenda Wallace
3be379cee9
updated specs to match new links on photo page
2017-01-07 12:05:35 +13:00
Brenda Wallace
5319d23ee3
Using translations on links from photo page
2017-01-07 12:03:31 +13:00
Brenda Wallace
350c1d4c08
Descriptive links from photo page
2017-01-06 22:25:13 +13:00
Miles Gould
885c9433ce
Merge branch 'dev' into bw/bar_graphs
2017-01-05 11:39:10 +00:00
Miles Gould
b0c132c28f
Replace literal RGB with variable in graph.css
2017-01-05 11:38:55 +00:00
Miles Gould
8765770071
Ignore spurious code duplication error in bar_*.js
...
The code in question is
```
return root.append('g')
.attr("class", "bar")
.selectAll("rect")
.data(bars.map(function(bar) { return bar.value; }))
.enter()
```
in graphs/bar_group.js, and
```
return d3.append('g')
.attr("class", "bar-label")
.selectAll("text")
.data(bars.map(function(bar){ return bar.name;}))
.enter()
.append("text")
.attr('x', -80)
```
in graphs/bar_label_group.js. I don't think it's worth unifying these.
2017-01-05 11:19:44 +00:00
Miles Gould
8083ae9052
Remove duplicate getBarValues() methods
...
I've replaced one with a getMaxValue() function, which is what we
actually want, and deleted the other.
2017-01-05 11:18:51 +00:00
Shiny
5ca8829727
Merge branch 'dev' into bw/active-plantings
2017-01-05 16:35:39 +13:00
Shiny
d40eccdb63
Merge branch 'dev' into bw/harvests-linkto-plantings
2017-01-05 16:31:22 +13:00
pozorvlak
478fae53ab
Merge pull request #1136 from Br3nda/bw/garden-specs
...
Controller garden specs for member doing what they shouldn't
2017-01-04 12:06:10 +00:00
Shiny
fc71cba6ba
Merge branch 'dev' into bw/harvests-linkto-plantings
2017-01-04 22:52:54 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Brenda Wallace
18e58809c3
Merge remote-tracking branch 'upstream/dev' into bw/active-plantings
2017-01-04 16:25:44 +13:00
Brenda Wallace
b27b361e2f
Show active plantings by default
2017-01-04 16:25:19 +13:00
Shiny
3fafa87afd
Merge branch 'dev' into bw/garden-specs
2017-01-04 16:18:54 +13:00
pozorvlak
de60dbb9b0
Merge pull request #1140 from Br3nda/bw/descriptive-spec
...
descriptive spec
2017-01-03 12:12:18 +00:00
Shiny
a95fca3682
Merge branch 'dev' into bw/bar_graphs
2017-01-03 22:42:58 +13:00
Brenda Wallace
8047aef692
Merge remote-tracking branch 'upstream/dev' into bw/descriptive-spec
...
Conflicts:
spec/features/signin_spec.rb
2017-01-03 22:16:24 +13:00
Brenda Wallace
b38728c5df
Add login() to signin spec to reduce code duplication
2017-01-03 22:13:27 +13:00
Brenda Wallace
241c3cfdc0
Moves model name into spec description
...
so we can tell which failed.
2017-01-03 22:12:23 +13:00
Shiny
8b3b28b9d6
Merge branch 'dev' into bw/garden-specs
2017-01-03 20:50:20 +13:00
Daniel O'Connor
5f6fc37efd
Merge pull request #1138 from Br3nda/bw/garden-name-in-link
...
Garden's name in link
2017-01-03 13:33:59 +10:30
Brenda Wallace
881acdccc9
Shortening long garden names on a user's page
2017-01-02 20:54:22 +13:00
Brenda Wallace
3b1753d3d5
Garden's name in link
2017-01-02 20:36:25 +13:00
Brenda Wallace
ab75f830fb
Controller garden specs for member doing what they shouldn't
2016-12-25 10:38:07 +13:00
Shiny
0c8345d1e2
Merge branch 'dev' into bw/bar_graphs
2016-12-22 10:22:29 +13:00
Cesy
ca553a4693
Merge pull request #1130 from Growstuff/dev
...
Release 17
2016-12-21 19:19:47 +00:00
Shiny
58ddeefaa3
Merge pull request #1127 from Br3nda/bw/guard-clauses
...
Guard clauses
2016-12-21 22:53:06 +13:00
Shiny
ee7fbb9ab9
Merge branch 'dev' into bw/guard-clauses
2016-12-21 20:53:47 +13:00
pozorvlak
cf31e53303
Merge pull request #1131 from pozorvlak/moar_tests
...
Improve unit test coverage for models
2016-12-20 14:22:36 +00:00
Miles Gould
4b1cdc5650
Test Model.newsletter_(un)subscribe
...
I'm not very happy with this change as-is. The tests are very shallow
(they wouldn't have caught the bug @tconquest and I found in this code,
for instance), and use the deprecated `receive_message_chain` method.
From the RSpec docs:
"Chains can be arbitrarily long, which makes it quite painless to
violate the Law of Demeter in violent ways, so you should consider any
use of receive_message_chain a code smell. Even though not all code
smells indicate real problems (think fluent interfaces),
receive_message_chain still results in brittle examples. For example, if
you write allow(foo).to receive_message_chain(:bar, :baz => 37) in a
spec and then the implementation calls foo.baz.bar, the stub will not
work."
Further work needed.
2016-12-19 22:15:53 +00:00
Miles Gould
4f1c94bfb9
Fix warnings in member_spec
2016-12-19 20:44:18 +00:00
Miles Gould
70f589d59b
Replace instance vars with locals in member_spec
2016-12-19 20:33:43 +00:00
Miles Gould
f5eede6072
Improve tests for Member.interesting
2016-12-19 20:29:05 +00:00
Miles Gould
3469d6d37f
Feature test for signin via email address
2016-12-19 20:23:07 +00:00
Miles Gould
b8385afb2f
Remove apparently-unused Geocodable.geocode method
...
We have unit tests for geocoding, but it's not being covered, so I
assume it's being shadowed by a method installed directly from Geocoder.
2016-12-19 20:14:05 +00:00
Miles Gould
abb9acd04a
post_spec: fix warnings
...
Several "unused variable" warnings (due to replacing unused instance
variables with unused locals) and one warning about ambiguous
lack-of-brackets.
2016-12-19 16:40:05 +00:00
Miles Gould
67faa5554c
post_spec: replace instance vars with local vars
...
The @ in front of a variable makes it an instance variable of the
surrounding object. There's no point doing that for variables that are
only used in a single function, so I've made such variables in the file
post_spec.rb into function-local variables. We should do this more
generally: there are a lot of instances of this (anti?)pattern in our
test suite.
2016-12-19 16:36:46 +00:00
Miles Gould
59b86c9b0c
Replace << with string-interpolation in post_spec
2016-12-19 16:33:41 +00:00
Miles Gould
7239cf068b
Test [member name](member) mention syntax
2016-12-19 16:31:32 +00:00
Miles Gould
c23e80b56d
Test Post.recently_active
2016-12-19 16:26:17 +00:00
Miles Gould
b011fc9bae
Test Post.comment_count
2016-12-19 16:17:31 +00:00
Miles Gould
b40974d4c3
Test Crop.create_from_csv with missing parent
...
I couldn't work out how to test that the error is logged.
2016-12-19 16:15:19 +00:00
Shiny
ed081e7286
Merge branch 'dev' into bw/guard-clauses
2016-12-18 19:29:05 +13:00
Cesy
1b9a5bc115
Merge pull request #1129 from Br3nda/bw/ruby-upgrade-2-3-3
...
Upgrade to ruby 2.3.3
2016-12-17 09:59:22 +00:00
Brenda Wallace
b0dd53eb63
Upgrade to ruby 2.3.3
2016-12-17 20:32:07 +13:00
Shiny
27520e9aa6
Merge branch 'dev' into bw/bar_graphs
2016-12-16 12:52:16 +13:00
Daniel O'Connor
3cdaa03e5d
Merge branch 'dev' into likeable
2016-12-15 14:28:22 +10:30
Brenda Wallace
ebae0dfad3
Merge remote-tracking branch 'upstream/dev' into bw/guard-clauses
2016-12-14 21:37:12 +00:00
Brenda Wallace
ca7868b79a
Use guard clauses
2016-12-14 21:28:35 +00:00
Daniel O'Connor
148dfa7f8b
Merge pull request #1126 from CloCkWeRX/2016-12-gem-upgrades
...
2016 12 gem upgrades
2016-12-13 15:08:46 +10:30
Daniel O'Connor
feff2cdfd4
Upgrade rake only
2016-12-12 10:38:31 +10:30
Daniel O'Connor
74657abec0
Revert "Update rake and rubocop"
...
This reverts commit c9127dbf1e .
2016-12-12 10:37:45 +10:30
Daniel O'Connor
6ff3fa21e1
Revert "Disable Style/EmptyMethod for now"
...
This reverts commit 5235b11905 .
2016-12-12 10:37:26 +10:30
Shiny
fe5a93160f
Merge branch 'dev' into bw/bar_graphs
2016-12-10 21:39:11 +13:00
Daniel O'Connor
88ba4f9198
Rubocop
2016-12-09 12:19:38 +10:30
Daniel O'Connor
2594e5d334
Rubocop
2016-12-09 12:06:14 +10:30
Daniel O'Connor
ce9fc85d0b
Rubocop
2016-12-09 12:04:13 +10:30
Daniel O'Connor
2499db77f1
Rubocop
2016-12-09 11:59:56 +10:30
Daniel O'Connor
8edbef3965
Rubocop
2016-12-09 11:56:53 +10:30
Daniel O'Connor
2e23675425
app/controllers/likes_controller.rb:2:3: C: Rails/ActionFilter: Prefer before_action over before_filter.
2016-12-09 11:52:46 +10:30
Daniel O'Connor
fef272e30f
Merge remote-tracking branch 'upstream/dev' into likeable
2016-12-09 11:42:32 +10:30
Daniel O'Connor
be572b9a53
Upgrade
2016-12-09 11:25:03 +10:30
Daniel O'Connor
5235b11905
Disable Style/EmptyMethod for now
2016-12-09 11:17:54 +10:30
Daniel O'Connor
d3d3731fa3
Update minitest
2016-12-09 10:52:01 +10:30
Daniel O'Connor
1982dc76be
Pin to elasticsearch API 2.0 for now
2016-12-09 10:51:13 +10:30
Daniel O'Connor
c9127dbf1e
Update rake and rubocop
2016-12-09 10:46:22 +10:30
Daniel O'Connor
f7ca706e0b
Update omniauth-facebook (not as scary as it sounds - https://github.com/mkdynamic/omniauth-facebook/blob/master/CHANGELOG.md )
2016-12-09 10:25:08 +10:30
Daniel O'Connor
817c1ec5ce
Update will_paginate
2016-12-09 10:24:18 +10:30
Daniel O'Connor
18ab47eed3
Update thor
2016-12-09 10:23:24 +10:30
Daniel O'Connor
d99f24c02c
Update coffee-script-source
2016-12-09 10:22:32 +10:30
Daniel O'Connor
aaaca81d49
Update hashie
2016-12-09 10:21:31 +10:30
Daniel O'Connor
59ec36320b
Update codeclimate-test-reporter
2016-12-09 10:20:47 +10:30
Daniel O'Connor
303fd8c243
Update autoprefixer-rails
2016-12-09 10:20:09 +10:30
Daniel O'Connor
3e43a19e58
Update CONTRIBUTING.md
...
Dead link, no archived version of it
2016-12-09 10:09:04 +10:30
Shiny
391d5bed5f
Merge branch 'dev' into bw/bar_graphs
2016-12-09 07:29:55 +13:00
Shiny
46a0956f5f
Merge pull request #1124 from Br3nda/bw/load-resource
...
Cancan already loads the resource
2016-12-09 07:29:28 +13:00
Brenda Wallace
4f465d808c
We don't need to load the resource again
2016-12-07 23:54:03 +00:00
Shiny
8161e90fbd
Merge branch 'dev' into bw/bar_graphs
2016-12-08 12:35:59 +13:00
Shiny
aea935be4b
Merge pull request #1122 from Br3nda/bw/duplicate-query
...
Gardens query was running twice in contoller
2016-12-08 12:32:20 +13:00
Brenda Wallace
e695d5646a
FIX Gardens query was running twice in contoller
2016-12-07 22:27:17 +00:00
Daniel O'Connor
a074e72b9b
Merge branch 'dev' into bw/bar_graphs
2016-12-07 13:36:21 +10:30
Daniel O'Connor
e799233fb7
Merge pull request #1119 from Br3nda/bw/ParenthesesAsGroupedExpression
...
Fixed parentheses that are interp-ed as grouped expression
2016-12-07 12:30:38 +10:30
Brenda Wallace
d4a496eb1c
Removed duplicate variable assignment
2016-12-07 12:26:12 +13:00
Brenda Wallace
a23e241480
Eslint clean ups
2016-12-07 12:22:33 +13:00
Brenda Wallace
af424103f4
Code style fix up (comments only)
2016-12-07 11:34:17 +13:00
Brenda Wallace
d68cfe0486
Move the invocation into the parens that contain the function
2016-12-07 11:33:30 +13:00
Brenda Wallace
0f15095129
Fix up css style
2016-12-07 11:30:17 +13:00
Brenda Wallace
6e0e7e4de1
Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs
...
Conflicts:
CONTRIBUTORS.md
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/crops.js.erb
app/views/crops/show.html.haml
2016-12-07 11:17:30 +13:00
Shiny
00e240c038
Merge branch 'dev' into bw/ParenthesesAsGroupedExpression
2016-12-07 10:06:50 +13:00
Brenda Wallace
05e7a27782
Call to verify options stays as a hash
2016-12-07 10:04:17 +13:00
Mackenzie
53477485ef
Merge pull request #1117 from Br3nda/bw/AmbiguousOperator
...
Fixed AmbiguousOperator
2016-12-06 12:40:21 -05:00
Mackenzie
c760112e1b
Merge pull request #1118 from Br3nda/bw/assignment-in-condition
...
Don't use assignments in conditions
2016-12-06 12:40:00 -05:00
Mackenzie
0e8146b7ee
Merge pull request #1120 from Br3nda/bw/more-enwikipedia-chars
...
Yet another wikipedia url char added to regex
2016-12-06 12:39:33 -05:00
Brenda Wallace
a7bafafa06
Yet another wikipedia url char added to regex
2016-12-06 21:58:17 +13:00
Brenda Wallace
464c570d99
Fixed parentheses that are interp-ed as grouped expression
2016-12-06 21:23:55 +13:00
Brenda Wallace
abc5ac5f29
Don't use assignments in conditions
2016-12-06 21:18:13 +13:00
Brenda Wallace
4c6f0fc929
Fixed AmbiguousOperator
2016-12-06 21:09:39 +13:00
Daniel O'Connor
41e408b04a
Merge pull request #1116 from Br3nda/bw/returns
...
Removed redundant returns
2016-12-06 11:20:45 +10:30
Brenda Wallace
8981a222ea
Simplified display_weight
2016-12-06 00:32:20 +00:00
Brenda Wallace
91b0c1898e
Simplifying display_harvest_description
2016-12-05 20:40:34 +00:00
Brenda Wallace
26e5a414cf
Line no longer needs wrapping
2016-12-04 21:23:33 +00:00
Brenda Wallace
92195d51d2
Removed redundant returns
2016-12-04 21:21:35 +00:00
Shiny
0fcd8c8e8c
Merge pull request #1094 from Br3nda/bw/useless-assignments
...
Useless assignments fixed, and rails 4 stuff.
2016-12-05 10:06:03 +13:00
Daniel O'Connor
c43ec3d256
Merge branch 'dev' into bw/useless-assignments
2016-12-04 10:30:41 +10:30
Daniel O'Connor
1ae9366076
Merge pull request #1109 from maco/seed_photos
...
add photos to seeds
2016-12-04 10:30:07 +10:30
Daniel O'Connor
8bb6df6ca7
Merge branch 'dev' into seed_photos
2016-12-03 16:47:13 +10:30
Daniel O'Connor
afbdd1194f
Merge branch 'dev' into bw/useless-assignments
2016-12-03 16:43:11 +10:30
Mackenzie Morgan
c2de65e515
Merge branch 'seed_photos' of gitmaco:maco/growstuff into seed_photos
2016-12-02 23:18:05 -05:00
Mackenzie Morgan
c201200e9b
correct schema and add index for photos_seeds
2016-12-02 23:17:01 -05:00
Mackenzie
04ba871949
Merge pull request #1108 from maco/fix_photo_requires
...
WIP: add require_relative to photo_capable concern for constants
2016-12-02 23:13:56 -05:00
Shiny
7785a9d797
Merge branch 'dev' into seed_photos
2016-12-03 09:31:20 +13:00
Shiny
1388aa3b06
Merge branch 'dev' into bw/useless-assignments
2016-12-03 08:23:19 +13:00
Mackenzie
519cf80200
Merge pull request #1111 from CloCkWeRX/658_automation
...
issue #658 i18n automation (updated)
2016-12-02 08:26:15 -05:00
pozorvlak
ce9e20b2f1
Merge branch 'dev' into 658_automation
2016-12-02 13:06:56 +00:00
Shiny
0c2a60ecc3
Reduce max AbcSize to 38 ( #1112 )
...
Reduce how complex methods are allowed to be, according to our code checker, so we're forced to write readable code
2016-12-02 08:06:53 -05:00
Mackenzie
fa1e46c2e7
Merge pull request #1110 from maco/codeclimate_ignores
...
ignore the minified bootstrap accessibility file for code climate checks
2016-12-02 08:02:47 -05:00
pozorvlak
7b0d17af59
Merge branch 'dev' into 658_automation
2016-12-02 12:05:05 +00:00
pozorvlak
4a8494ad06
Merge branch 'dev' into codeclimate_ignores
2016-12-02 12:04:07 +00:00
pozorvlak
3acaea2914
Merge branch 'dev' into fix_photo_requires
2016-12-02 12:03:53 +00:00
pozorvlak
0156795a29
Merge pull request #1114 from Br3nda/bw/phantom-403s
...
Revert "Changed phantomjs url to project official"
2016-12-02 11:05:12 +00:00
Brenda Wallace
7aaf6ea2ec
Revert "Changed phantomjs url to project official"
...
This reverts commit 7fcd3cba8d .
2016-12-02 20:21:41 +13:00
Daniel O'Connor
fa65be40a4
lib/tasks/i18n.rake:8:37: W: Lint/UnusedBlockArgument: Unused block argument - t. If it's necessary, use _ or _t as an argument name to indicate that it won't be used.
2016-12-02 15:51:29 +10:30
Daniel O'Connor
aa638b8a68
Missed from merge
2016-12-02 15:41:35 +10:30
Daniel O'Connor
49639c6244
Merge branch '658_automation' of github.com:CloCkWeRX/growstuff into 658_automation
2016-12-02 15:37:55 +10:30
Jim Stallings
e939be05f8
Add myself to contributors
2016-12-02 15:35:13 +10:30
Jim Stallings
160c6efd04
Remove example file, add documentation
2016-12-02 15:34:38 +10:30
Jim Stallings
fe6e269c64
GS-658 - i18n automation POC
2016-12-02 15:34:38 +10:30
Jim Stallings
81f2fa5fa4
GS-658: sort locale keys, add rake task for it
2016-12-02 15:31:07 +10:30
Shiny
bb0eb25dd3
Merge branch 'dev' into bw/useless-assignments
2016-12-02 14:04:30 +13:00
Shiny
077c807958
Merge branch 'dev' into seed_photos
2016-12-02 14:04:12 +13:00
Daniel O'Connor
07ba39c117
Merge branch 'dev' into codeclimate_ignores
2016-12-02 11:33:04 +10:30
Daniel O'Connor
266455eda6
Merge pull request #1105 from maco/wikipedia_regex
...
expand wikipedia regex to include -, (, and )
2016-12-02 11:32:26 +10:30
Brenda Wallace
03cb4a8dee
use find_or_initialize_by
2016-12-02 00:23:46 +00:00
Brenda Wallace
d87de13215
Merge remote-tracking branch 'origin/bw/find-by' into bw/useless-assignments
2016-12-01 23:46:50 +00:00
Mackenzie Morgan
ceac906a3f
ignore the minified bootstrap accessibility file for code climate checks
2016-12-01 14:00:18 -05:00
Mackenzie Morgan
2fb34bea18
narrow the regex back down
...
hyphen must be the LAST thing in the character class
2016-12-01 13:39:43 -05:00
Mackenzie Morgan
a3c8bc0586
include the migration
2016-12-01 13:23:52 -05:00
Mackenzie Morgan
637b46ef10
add photos to seeds
...
Fixes #495
2016-12-01 12:54:55 -05:00
Mackenzie Morgan
b38945d62f
add require_relative to photo_capable concern for constants
...
starts #1107
2016-12-01 12:53:45 -05:00
Mackenzie Morgan
54628e6d8c
expand wikipedia regex to include punctuation, because some have - or () in name
...
(Fixes : #1104 )
2016-12-01 12:25:48 -05:00
pozorvlak
5cb1e14d7b
Merge pull request #1095 from maco/photo_concern
...
DRY up photo & model interaction
2016-12-01 15:16:21 +00:00
Daniel O'Connor
7032436f7b
Merge branch 'dev' into bw/useless-assignments
2016-12-01 22:15:50 +10:30
Daniel O'Connor
83a3c3e72f
Merge pull request #1102 from cesy/railsupdate
...
Update rails
2016-12-01 22:04:32 +10:30
Cesy Avon
3d845f47b9
Update rails
2016-12-01 09:42:55 +00:00
Brenda Wallace
d2fb96b3d7
change where.first -> find_by
2016-12-01 22:14:50 +13:00
Brenda Wallace
aba06c1faf
Case insensitive crop look up
2016-12-01 21:29:28 +13:00
Brenda Wallace
dc504fe363
use Member.case_insensitive_login_name
2016-12-01 21:29:00 +13:00
Brenda Wallace
cba02ae05c
Convert where.first to find_by
2016-12-01 20:25:28 +13:00
Brenda Wallace
37adbe5f48
Moved case-insensitve login look up to method
2016-12-01 20:25:19 +13:00
Brenda Wallace
ae26e3f936
Moved login_name_or_email query to own method
2016-12-01 20:25:10 +13:00
Mackenzie Morgan
7b2be73c88
code climate
2016-12-01 00:22:52 -05:00
Mackenzie Morgan
cd0fbc80d8
Merge remote-tracking branch 'origin/photo_concern' into photo_concern
2016-12-01 00:19:42 -05:00
Mackenzie Morgan
31bbf42ad0
define valid models for photos in a constants file
...
remove all hardcoded model names from photo.rb and photos_controller.rb
2016-12-01 00:19:33 -05:00
Brenda Wallace
e06d110861
Turn on rails:true in rubocop
...
so we don't need to pass --rails
2016-12-01 13:30:00 +13:00
Shiny
b454132cae
Merge branch 'dev' into bw/useless-assignments
2016-12-01 12:51:13 +13:00
Brenda Wallace
cd0e287dba
removed member look up that wasn't used in spec
2016-12-01 12:50:16 +13:00
Shiny
771e6b649c
Merge branch 'dev' into photo_concern
2016-12-01 12:37:23 +13:00
Daniel O'Connor
547e6400f8
Merge pull request #1049 from maco/scopify
...
moving where clauses into scopes to keep that contained in models
2016-12-01 09:48:26 +10:30
Brenda Wallace
ce7cd5d96b
Merge branch 'dev' into bw/useless-assignments
2016-12-01 11:17:56 +13:00
Mackenzie
ba4d85538c
Merge branch 'dev' into scopify
2016-11-30 16:47:22 -05:00
Mackenzie
af3ca215a6
Merge branch 'dev' into photo_concern
2016-11-30 16:37:36 -05:00
Mackenzie Morgan
cef1bb1056
ignore has_and_belongs_to_many
2016-11-30 16:29:02 -05:00
Brenda Wallace
6321d1ac41
current order, use rails' findby
2016-12-01 10:17:22 +13:00
Mackenzie
57461f6e34
Merge pull request #1091 from pozorvlak/fix_display_days_before_maturity
...
Fix PlantingHelper.display_days_before_maturity
2016-11-30 10:09:36 -05:00
Cesy
cf8fab8ed9
Merge pull request #1080 from Growstuff/dev
...
Release 16
2016-11-30 15:07:42 +00:00
Mackenzie Morgan
aa7ca71e5d
rubocop
2016-11-30 09:47:48 -05:00
Mackenzie Morgan
a5fcfb6277
Merge branch 'dev' of gitmaco:Growstuff/growstuff into photo_concern
2016-11-30 09:44:36 -05:00
Mackenzie
376e6c08d3
Merge pull request #1097 from pozorvlak/precompile_assets_in_test
...
Precompile assets in test
2016-11-30 09:44:15 -05:00
Mackenzie
0cbaac3c75
Merge pull request #1098 from pozorvlak/allow_unadorned_rake_without_db
...
Run tests with `rake` when DB does not yet exist
2016-11-30 09:43:40 -05:00
Miles Gould
6be9640625
Run tests with rake when DB does not yet exist
...
Previously, `rake spec` ran the tests whether or not the `growstuff_test`
database existed or not, but `rake` crashed unless it had already been
created. The problem was that `rake` was trying to load the environment,
which required the presence of a DB; `rake spec` was running this with
the `dev` environment, so succeeded if `growstuff_dev` existed, but
`rake` was running everything with the `test` environment, so would fail
if `growstuff_test` did not exist.
This patch adds `db:create` to the dependencies of the `spec` task,
forcing an unadorned `rake` to create all necessary databases first.
2016-11-30 11:35:35 +00:00
Miles Gould
1841548936
Precompile assets in test
...
According to
https://github.com/teampoltergeist/poltergeist/issues/677#issuecomment-222919584 ,
a possible cause of the "Request failed to reach server" problem (#901 )
is that assets are being compiled on-demand, causing enough of a
slowdown for PhantomJS to think the connection has failed. This turns
off lazy asset compilation in the test environment and precompiles
assets before testing on Travis. We should also turn off lazy asset
compilation in production - see
http://stackoverflow.com/questions/8821864/config-assets-compile-true-in-rails-production-why-not
Our Heroku deployments already run `rake assets:precompile`.
2016-11-30 11:01:25 +00:00
Miles Gould
9400225f65
Return a string from display_days_before_maturity
...
Sometimes we were returning a string, and sometimes we were returning an
integer. We're only ever displaying the result, and this seems a little
more consistent.
2016-11-30 10:16:02 +00:00
Miles Gould
b0b864a5d4
Fix off-by-one bug in display_days_before_maturity
...
We were counting from DateTime.now rather than Date.current, causing us to
under-count by a day.
2016-11-30 10:16:02 +00:00
Miles Gould
77c64d5925
Test PlantingHelper.display_days_before_maturity
...
This ensures that #1079 is fixed.
2016-11-30 10:15:52 +00:00
pozorvlak
d3b927b44b
Merge pull request #1096 from Growstuff/master
...
Master to dev for 1092
2016-11-30 09:44:12 +00:00
Mackenzie Morgan
77b7969fc9
DRY up photo & model interaction
...
* move stuff in models into a concern
* create combined collection for all models that have photos
2016-11-30 00:46:58 -05:00
Shiny
9d68690d86
Merge pull request #1092 from Br3nda/hotfix/1079
...
Check we have a planted_at ts before using
2016-11-30 17:50:15 +13:00
Brenda Wallace
900e7361c6
Check we have a planted_at ts before doing maths with it
2016-11-30 17:39:26 +13:00
Brenda Wallace
a2e86b3e5e
Rails dynamic finds fixed
2016-11-30 12:21:27 +13:00
Brenda Wallace
b6136d6a20
Removed ignores for rails findby
2016-11-30 10:38:00 +13:00
Mackenzie
7b0fdcf007
Merge pull request #1093 from Br3nda/bw/fix-deprecated-methods
...
Fixes for two calls to deprecated methods
2016-11-29 16:34:32 -05:00
Brenda Wallace
178c181cf5
Merge remote-tracking branch 'upstream/dev' into bw/useless-assignments
...
Conflicts:
app/controllers/crops_controller.rb
app/models/crop.rb
spec/models/scientific_name_spec.rb
2016-11-30 10:32:02 +13:00
Brenda Wallace
9aa4fa8031
Fixes for two calls to deprecated methods
2016-11-30 10:25:23 +13:00
Mackenzie Morgan
72877aebaf
update test for renamed scope
2016-11-29 13:41:05 -05:00
Mackenzie Morgan
4857fd8d2e
return from conditional
2016-11-29 12:20:17 -05:00
Mackenzie Morgan
99c8db72d6
syntax
2016-11-29 12:14:16 -05:00
Mackenzie Morgan
53849a26e5
merge
2016-11-29 12:11:52 -05:00
Mackenzie Morgan
9dc02cd3d8
make changes from code review
2016-11-29 12:10:48 -05:00
Mackenzie
391111a5bf
Merge pull request #1088 from maco/rename_scientific_name
...
rename scientific_names.scientific_name to scientific_names.name
2016-11-29 12:04:21 -05:00
Mackenzie Morgan
c93fd78aa8
Merge branch 'dev' of gitmaco:Growstuff/growstuff into scopify
2016-11-29 09:58:02 -05:00
Mackenzie
818c8f0c37
Merge pull request #1090 from pozorvlak/indentation-for-great-glory
...
Fix comment-style weirdness
2016-11-29 09:53:23 -05:00
Mackenzie Morgan
915030e583
whitespace
2016-11-29 09:40:59 -05:00
Mackenzie Morgan
832719b01a
merge from upstream dev
2016-11-29 09:37:25 -05:00
Miles Gould
0d8cbc5bf2
Fix comment-style weirdness
...
We had an inline comment that had been split over two lines; whitespace
fixes made this look very weird.
2016-11-29 10:44:04 +00:00
pozorvlak
bac8f5e4cc
Merge pull request #1072 from Br3nda/bw/indentation-for-great-glory
...
the giant indentation patch of 2016, for great glory
2016-11-29 10:42:24 +00:00
Mackenzie Morgan
69980d9ec6
tests
2016-11-28 22:50:53 -05:00
Mackenzie Morgan
2129b6480d
...that was a guard clause. oops
2016-11-28 22:42:11 -05:00
Mackenzie Morgan
fe860aa1ab
clean up some tests
2016-11-28 22:33:00 -05:00
Mackenzie Morgan
a382caab48
clear up redundant else and unneeded returns
2016-11-28 22:08:41 -05:00
Mackenzie Morgan
e1e9a52186
use a guard clause
2016-11-28 22:08:14 -05:00
Mackenzie Morgan
66c8ce78bc
further DRY up crops controller
2016-11-28 22:04:32 -05:00
Mackenzie Morgan
e1a2b168c9
rename scientific_names.scientific_name to scientific_names.name
...
this mirrors alternate_names.name and allows making code more DRY
2016-11-28 21:57:51 -05:00
Brenda Wallace
8763c22284
Merge remote-tracking branch 'upstream/dev' into bw/indentation-for-great-glory
...
Conflicts:
app/models/crop.rb
2016-11-29 02:33:30 +00:00
Mackenzie
9ec2f76909
Merge pull request #1086 from maco/sunniness_planted_from
...
deduplicate sunniness and planted_from functions (Fixes : #1085 )
2016-11-28 20:59:52 -05:00
Mackenzie Morgan
b94cb2abd6
deduplicate sunniness and planted_from functions ( Fixes : #1085 )
2016-11-28 19:57:34 -05:00
Daniel O'Connor
7abafd7b74
Merge pull request #1084 from maco/improve_crop
...
Improve crop model
2016-11-29 10:27:13 +10:00
Mackenzie Morgan
502862128f
break out if/else into discrete blocks
2016-11-28 19:20:35 -05:00
Mackenzie Morgan
96b1e78962
dedup the add from csv code ( Fixes : #1082 )
2016-11-28 19:12:42 -05:00
Mackenzie
e077f6c7b1
Merge pull request #1076 from Br3nda/bw/poking-travis
...
Travis file lint and clean
2016-11-28 09:57:26 -05:00
Mackenzie
b25a938936
Merge pull request #1081 from CloCkWeRX/upgrade-gems-nov-2016
...
Upgrade various gems for Nov 2016
2016-11-28 09:55:54 -05:00
Mackenzie
0952d7d32f
Merge pull request #1078 from Br3nda/bw/garden-names-one-line
...
Limit garden names to one line
2016-11-28 09:55:16 -05:00
Daniel O'Connor
9963502026
bundle update i18n-tasks
2016-11-28 13:55:01 +10:00
Daniel O'Connor
5c2b14376e
bundle update terminal-table
2016-11-28 10:43:46 +10:00
Daniel O'Connor
330bc912c1
bundle update bootstrap_form
2016-11-28 10:43:05 +10:00
Daniel O'Connor
bd46c37f07
bundle update activemerchant
2016-11-28 10:42:03 +10:00
Daniel O'Connor
c08c038df1
bundle update active_utils
2016-11-28 10:40:32 +10:00
Daniel O'Connor
0fb9ea7a11
bundle update newrelic_rpm byebug
2016-11-28 10:37:36 +10:00
Daniel O'Connor
89c29ea73c
bundle update pg
2016-11-28 10:32:43 +10:00
Daniel O'Connor
9c116f5887
bundle update rspec-rails coveralls capybara-screenshot
2016-11-28 10:31:24 +10:00
Daniel O'Connor
eb1013f925
bundle update jwt kramdown excon
2016-11-28 10:30:02 +10:00
Daniel O'Connor
9bd1484a95
bundle update ruby_parser rb-fsevent redis
2016-11-28 10:29:09 +10:00
Daniel O'Connor
7a90c020fc
bundle update thor tins term-ansicolor
2016-11-28 10:28:07 +10:00
Daniel O'Connor
0a69ee682c
Merge pull request #1073 from Br3nda/bw/poltergeist-upgrade
...
Upgrading poltergeist
2016-11-28 10:22:21 +10:00
Daniel O'Connor
8b5c63e898
Merge pull request #1077 from Br3nda/bw/wikipedia-url-regex
...
Narrow-ed regex on wikipedia url
2016-11-28 10:08:11 +10:00
Cesy
dfe12fd7f8
Merge pull request #1074 from Br3nda/bw/string-interp
...
String interp doesn't need .to_s in test
2016-11-27 11:02:31 +00:00
Cesy
73a2ac87da
Merge pull request #1075 from Br3nda/bw/garden-link
...
Bugfix: Link to garden, not member
2016-11-27 11:00:49 +00:00
Brenda Wallace
9cce0e39f6
Limit garden names to one line
2016-11-27 14:52:07 +13:00
Brenda Wallace
10c20c7f91
Narrow-ed regex on wikipedia url
...
and more tests
2016-11-27 14:35:49 +13:00
Brenda Wallace
f52b828abe
Use rake to create database
2016-11-27 13:27:45 +13:00
Brenda Wallace
c76fb15cfd
Add yamllint settings
2016-11-27 13:24:21 +13:00
Brenda Wallace
167417a711
Indent travis.yml correctly
2016-11-27 13:24:02 +13:00
Brenda Wallace
7fcd3cba8d
Changed phantomjs url to project official
2016-11-27 13:22:10 +13:00
Brenda Wallace
9cb58ab0c9
Wrapped the phantomjs downloading in travis.yml
2016-11-27 13:08:53 +13:00
Brenda Wallace
702bbeb724
"[Member]'s garden" link to garden, not member
2016-11-27 10:21:11 +13:00
Brenda Wallace
38fbc52a6f
String interp doesn't need .to_s
2016-11-27 10:17:01 +13:00
Cesy
34e86f5881
Merge pull request #1066 from pozorvlak/autodeploy_prod
...
Auto-deploy to production on successful merge
2016-11-26 08:30:24 +00:00
Brenda Wallace
8c7fcd9d49
Fixed all useless assignments
2016-11-26 19:36:59 +13:00
Brenda Wallace
1fd7233012
Plualisation fixups
2016-11-26 17:27:13 +13:00
Brenda Wallace
d60dcfbddd
Use request.referer instead of request.referrer
2016-11-26 17:26:44 +13:00
Brenda Wallace
b541fe8221
puts allowed in some files
2016-11-26 17:24:41 +13:00
Brenda Wallace
8196d94a73
Don't enforce http pos args until rails 5
2016-11-26 17:23:31 +13:00
Brenda Wallace
07c135eeb5
before_filter is now before_action
2016-11-26 17:20:13 +13:00
Brenda Wallace
bcdd2a9167
Changed called to rails dynamic find_by
2016-11-26 15:55:38 +13:00
Brenda Wallace
20c72e1205
Upgrading poltergeist
2016-11-26 13:43:04 +13:00
Brenda Wallace
c02562518d
Fixed double handling in harvest.to_s
2016-11-26 12:20:51 +13:00
Brenda Wallace
723ebff923
Spacing fixes
2016-11-26 12:13:17 +13:00
Brenda Wallace
62e7c716dd
Removed extra empty blank lines
2016-11-26 12:06:02 +13:00
Brenda Wallace
b17e4eed7d
Block indentation fixups
2016-11-26 12:02:47 +13:00
Brenda Wallace
19727144d8
Else statement alignment
2016-11-26 11:57:02 +13:00
Brenda Wallace
e62adc297a
Aligning end on branches
2016-11-26 11:55:54 +13:00
Brenda Wallace
2e46cccd21
Hash alignment
2016-11-26 11:52:10 +13:00
Brenda Wallace
bbc19a5436
Array indentation fixed
2016-11-26 11:49:51 +13:00
Brenda Wallace
4cf0f85ee8
Indent the first parameter one step more than the start of the previous line.
2016-11-26 11:46:31 +13:00
Brenda Wallace
d268d2b09e
Fixed indentation on comments
2016-11-26 11:45:25 +13:00
Brenda Wallace
200a1c9a84
Closing parenthesis indentation fixed
2016-11-26 11:44:18 +13:00
Brenda Wallace
ebacd83dde
Case statement indentation clean up
2016-11-26 11:42:34 +13:00
Brenda Wallace
c878baa886
Indented parameters cleanup
2016-11-26 11:41:07 +13:00
Brenda Wallace
564731667e
Fixed up all remaining hash alignment
2016-11-26 11:17:42 +13:00
Brenda Wallace
bae25cfe8f
Fixed hash alignment in a funky big DDL
2016-11-26 11:16:55 +13:00
Brenda Wallace
5f3dd04068
Fixed array indentation
2016-11-26 11:00:49 +13:00
Brenda Wallace
2eddaf90cf
Fixed access modifier indentation
2016-11-26 11:00:04 +13:00
Brenda Wallace
91d2998507
Fixed multi-line operation indentation
2016-11-26 10:56:23 +13:00
Brenda Wallace
7eb0ee16b9
Indentation for multiline method calls
2016-11-26 10:54:51 +13:00
Brenda Wallace
83392ddda1
Indentation clean ups
2016-11-26 10:51:54 +13:00
pozorvlak
847f4d88d6
Merge pull request #1069 from CloCkWeRX/add-facebook-assets
...
Add a login splash for facebook
2016-11-25 18:06:02 +00:00
pozorvlak
fb9a1fdfd3
Merge pull request #1061 from Br3nda/bw/long-lines-fixed
...
Wrapped all lines > 120 chars.
2016-11-25 18:02:22 +00:00
Daniel O'Connor
783406d730
Add a login splash
2016-11-25 09:44:12 +10:00
Brenda Wallace
be67b858b4
Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed
...
Conflicts:
lib/tasks/growstuff.rake
2016-11-25 08:18:18 +13:00
Miles Gould
a796ba904a
Merge branch 'Br3nda-bw/reduce-complexity' into dev
2016-11-24 19:06:31 +00:00
Miles Gould
012f2f0cfa
Merge branch 'bw/reduce-complexity' of https://github.com/Br3nda/growstuff into Br3nda-bw/reduce-complexity
2016-11-24 19:00:06 +00:00
pozorvlak
3e8c61c0c3
Merge pull request #1064 from Br3nda/bw/normalise-translations
...
Normalise translation file
2016-11-24 18:55:10 +00:00
Miles Gould
844f68ef4c
Auto-deploy to production on successful merge
...
I *think* this is all that's necessary, though it's a bit hard to test
:-)
2016-11-24 18:48:01 +00:00
pozorvlak
e95566ed48
Merge pull request #1052 from Growstuff/dev
...
Release 15
2016-11-24 18:30:36 +00:00
Daniel O'Connor
916fd73071
Merge pull request #1065 from Br3nda/bw/removed-some-duplication
...
Reduced code duplication in growstuff.rake
2016-11-23 18:11:34 +10:30
Brenda Wallace
18a8d6c5bf
Re-instate usage info when args not as expected
2016-11-23 20:38:46 +13:00
Brenda Wallace
37d01e831f
Reduced code duplication in growstuff.rake
2016-11-23 20:27:20 +13:00
Brenda Wallace
975deab4b2
Normalise translation file
2016-11-23 20:24:02 +13:00
Brenda Wallace
fb6f1ac0a8
Changed whitelisting of what can have photos
2016-11-21 10:05:52 +13:00
Brenda Wallace
069343803e
List of types that can have photos in own method
2016-11-20 21:46:58 +13:00
Brenda Wallace
36d38fe624
Turn off frozen literals requirement
2016-11-20 21:39:51 +13:00
Brenda Wallace
0d6680f574
Disabling rails-pos-args, and documentation
...
in rubocop
2016-11-20 21:37:10 +13:00
Brenda Wallace
dac2343b68
Further code duplication reduction
2016-11-20 21:18:07 +13:00
Brenda Wallace
f24e02fd11
reduced code duplication again in photos cont spec
2016-11-20 21:13:57 +13:00
Brenda Wallace
dddc7b020d
Corrected description in spec
2016-11-20 21:13:33 +13:00
Brenda Wallace
12a9a0b97d
one more check no alert was generated
2016-11-20 21:13:08 +13:00
Brenda Wallace
6a8f48693b
Reduce code duplication in photos cont spec
2016-11-20 21:12:43 +13:00
Brenda Wallace
50a0668c1d
Check no alert message was generated
2016-11-20 21:11:54 +13:00
Brenda Wallace
a7e88a55b3
Spec for trying to attach photo when not allowed.
2016-11-20 21:03:08 +13:00
Brenda Wallace
8012d9f6a8
Whitelist which items can have photos
2016-11-20 21:02:43 +13:00
Brenda Wallace
73a050df13
before_filter becomes before_action
...
in photos controller
2016-11-20 20:29:45 +13:00
Brenda Wallace
d0a1a113b6
Multi-line block changed from {} to do end
2016-11-20 20:29:01 +13:00
Brenda Wallace
a8bffd3bce
White space fix in spec
2016-11-20 20:28:34 +13:00
Brenda Wallace
f6aac07c3d
Flatten params passed in photos controller spec
2016-11-20 20:27:59 +13:00
Brenda Wallace
72f1d83af4
Removed a bunch of blank lines
2016-11-20 20:19:14 +13:00
Brenda Wallace
138080c4d4
Tabulation fix
2016-11-20 20:18:20 +13:00
Brenda Wallace
cf70bfebe9
Further simplified photos controller
2016-11-20 20:17:27 +13:00
Brenda Wallace
5fc1ab9c60
Reduced code duplication in growstuff.rake
2016-11-20 19:35:17 +13:00
Brenda Wallace
6078734136
Merge remote-tracking branch 'upstream/dev' into bw/reduce-complexity
2016-11-20 19:25:30 +13:00
Brenda Wallace
917e33bccf
Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed
2016-11-20 19:24:53 +13:00
Mackenzie
6a8b604554
Merge pull request #1063 from Br3nda/use_phantomjs_211_in_travis
...
Use phantomjs 211 in travis
2016-11-19 23:57:25 -05:00
Miles Gould
2fa282e131
Install PhantomJS 2.1.1 on Travis-CI
...
I've found it to be much more stable locally - hopefully it will help
with our flaky CI issues (#901 ).
Code mostly cargo-culted from
9d3afe3d04
2016-11-20 17:22:05 +13:00
Brenda Wallace
810fe14c69
Highest percieved complexity is now 10
2016-11-20 09:17:42 +13:00
Brenda Wallace
f4a26d0580
has_item_id? renamed to item_id?
2016-11-20 09:06:04 +13:00
Brenda Wallace
0a54c2d986
Moved to method: collection to use for photos
2016-11-20 09:05:29 +13:00
Brenda Wallace
9c4f011fbc
Reduced percieved complexity in photos_controller.rb
2016-11-19 22:28:38 +13:00
Brenda Wallace
951727e266
Removed offense count comment from rubocop.yml - has fixed
2016-11-19 13:58:45 +13:00
pozorvlak
7355061762
Merge pull request #1060 from Br3nda/bw/covert-tabs-to-spaces
...
Covert all tabs to spaces
2016-11-18 13:39:35 +00:00
Brenda Wallace
2872a1c29d
Wrapped all long lines.
...
reduced rubocop's line length limit to 120
2016-11-17 22:02:18 +13:00
Brenda Wallace
fd29a94d6e
Whitespace fixes in Gemfile
2016-11-17 21:52:52 +13:00
Brenda Wallace
5e0cff5b8e
Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces
...
Conflicts:
app/helpers/seeds_helper.rb
spec/support/controller_macros.rb
2016-11-17 19:04:44 +13:00
Daniel O'Connor
b3ae03ab7e
Merge pull request #1059 from Br3nda/bw/trailing-whitespace-begone
...
Removed all trailing white space
2016-11-16 14:34:49 +10:30
Brenda Wallace
5ec2877577
Covert all tabs to spaces
2016-11-16 13:18:26 +13:00
Brenda Wallace
e182247774
Removed the ignores for trailing whitespace
2016-11-16 13:09:04 +13:00
Brenda Wallace
6bd9bd98d9
Removed extra blank lines, & added a end of file
2016-11-16 12:52:48 +13:00
Brenda Wallace
0475954acf
Removed extra blank lines
2016-11-16 12:50:14 +13:00
Brenda Wallace
0d371593fb
Merge remote-tracking branch 'upstream/dev' into bw/trailing-whitespace-begone
2016-11-15 03:25:14 +00:00
Daniel O'Connor
a6ef100e02
Merge pull request #1058 from Br3nda/bw/wiki-link-text-dupe
...
Removed duplicate wiki_linktext
2016-11-14 18:20:17 +10:30
Mackenzie
adc34b76da
Merge pull request #1055 from Br3nda/bw/rubocop-ci
...
Add rubocop to travis ci
2016-11-13 23:10:00 -05:00
Brenda Wallace
a91c785543
Moved metrics placeholders to main rubocop.yml file
2016-11-14 16:51:17 +13:00
Brenda Wallace
1cac58dadc
Allow both " and ' quote styles
2016-11-14 16:49:26 +13:00
Brenda Wallace
510c31f669
Removed 3 blank lines that codeclimate didn't like
2016-11-14 15:10:13 +13:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Brenda Wallace
dc5d7a8677
Removed duplicate wiki_linktext
2016-11-14 14:30:45 +13:00
Brenda Wallace
1fc1c64f62
Ignore rubocop_todo filename in code climate
2016-11-13 17:42:35 +13:00
Brenda Wallace
d49f33476d
Merge remote-tracking branch 'upstream/dev' into bw/rubocop-ci
2016-11-13 16:45:10 +13:00
Mackenzie
2260f56713
Merge pull request #1056 from Br3nda/bw/contributors-case
...
Contributors check case-insentive
2016-11-12 18:39:18 -05:00
Brenda Wallace
eecd54c5ea
Use single quotes, as code climate suggests
2016-11-13 11:12:24 +13:00
Brenda Wallace
e1f0b649f5
if! -> unless, as code climate suggests
2016-11-13 11:10:45 +13:00
Brenda Wallace
9605ec6109
Pass args to system() to be escaped
2016-11-13 11:07:57 +13:00
Brenda Wallace
b2977d6806
Search contributors file, case insensitive.
2016-11-13 11:05:43 +13:00
Brenda Wallace
d091aecaf1
Use https for contributor link
...
Hoping this will fix the failing contributor error
2016-11-13 10:46:46 +13:00
Brenda Wallace
97f0d5fc5d
Add vendor to rubocop exclude path
2016-11-13 10:34:57 +13:00
Brenda Wallace
2bc9b8c8bb
Added rubocop check to travisci
2016-11-13 10:20:13 +13:00
Brenda Wallace
e312ee2773
All existing rubocop offfenses in a todo file
2016-11-13 10:20:00 +13:00
Brenda Wallace
c685b970d3
Add rubocop to bundle
...
So we can manage which version of rubocop to use.
2016-11-13 10:07:41 +13:00
Mackenzie Morgan
cee3d192e0
test the new order.by_member_id scope
2016-10-11 16:34:25 -04:00
Mackenzie Morgan
65bf4dae69
Merge branch 'dev' of gitmaco:Growstuff/growstuff into scopify
2016-10-11 15:42:18 -04:00
Mackenzie Morgan
494790bcd4
moving where clauses into scopes to keep that contained in models
2016-10-11 15:28:08 -04:00
Cesy
621b7e5d29
Merge pull request #1048 from pozorvlak/es_factorygirl_weirdness
...
Prevent FactoryGirl from trying to connect to ElasticSearch in tests
2016-10-11 08:58:32 +02:00
Cesy
b59ebb7d52
Merge pull request #984 from maco/rubocop_config
...
Rubocop config (ignore the red x)
2016-10-09 17:28:47 +01:00
Miles Gould
ce2141ddb7
Only initialise Crop.__elasticsearch__ if needed
...
The mere presence of this field was causing any test that ran
`FactoryGirl.create :alternate_name` to try to connect to an
ElasticSearch server, even if GROWSTUFF_ELASTICSEARCH was false.
Fixes #1047
2016-10-07 14:49:09 +01:00
Miles Gould
36c88c3762
Delete trailing whitespace
2016-10-07 14:48:38 +01:00
Mackenzie Morgan
099b399b24
bundle
2016-10-06 22:00:01 -04:00
Mackenzie Morgan
5092c78fba
merge
2016-10-06 21:48:18 -04:00
Cesy
199cdf20a7
Merge pull request #1045 from Br3nda/bw/harvest-link
...
harvest thumbnail title linking to the harvest itself
2016-09-25 10:21:59 +01:00
Brenda Wallace
7c1040e7aa
Corrected contributor name
2016-09-19 21:51:13 +12:00
Brenda Wallace
faf117b002
test for link to member's harvest
2016-09-19 18:02:44 +12:00
Brenda Wallace
13e491cda7
harvest thumbnail title linking to the harvest itself
2016-09-18 18:33:28 +12:00
Cesy
286b7118be
Merge pull request #1041 from CloCkWeRX/openfarm-links
...
Add links to OpenFarm
2016-09-15 11:31:13 +01:00
Cesy
b2dfe31b5c
Merge pull request #1043 from CloCkWeRX/fix_1042
...
Fix map token in prod configuration
2016-09-15 09:09:02 +01:00
Daniel O'Connor
1f005a3d42
Fixes #1042
2016-09-14 21:41:18 +09:30
Daniel O'Connor
36c64bd8dc
#1038 Add links to OpenFarm
2016-09-14 14:57:08 +09:30
Daniel O'Connor
277325d58c
Merge pull request #1036 from Br3nda/bw/json-sessions
...
allow registration and signin/out on the API
2016-09-14 14:50:04 +09:30
Brenda Wallace
370f407ad6
Adding Brenda Wallace to contributors
2016-09-13 19:25:22 +12:00
Daniel O'Connor
3ea8e2294e
Update README.md
...
Fixes #1037
2016-09-12 21:57:27 +09:30
Brenda Wallace
c6413afa67
allow registration and signin/out on the API
2016-09-11 14:23:50 +12:00
Cesy
fe137a11bb
Merge pull request #1031 from CloCkWeRX/queue_mail
...
Queue mail in sidekiq
2016-08-24 10:38:13 +01:00
Cesy
0fa15161d4
Merge pull request #811 from CloCkWeRX/add_facebook_signup
...
Add facebook signup
2016-08-24 10:37:47 +01:00
Daniel O'Connor
aeb8792165
Merge remote-tracking branch 'upstream/dev' into queue_mail
2016-08-24 06:35:51 +09:30
Daniel O'Connor
c60609d507
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-23 16:34:03 +09:30
Daniel O'Connor
ad04c07017
Merge pull request #1034 from cesy/railsupdate
...
Rails update
2016-08-23 01:03:46 +09:30
Daniel O'Connor
f3f8326360
Merge pull request #1033 from cesy/gemupdate
...
Updating a few gems
2016-08-23 01:00:36 +09:30
Cesy Avon
3798e386ae
Upgrading rails to 4.2.1
2016-08-22 14:14:58 +00:00
Cesy Avon
7d3afa005c
Updating a few gems
2016-08-22 14:00:03 +00:00
Daniel O'Connor
3bfe2329f1
Merge pull request #1032 from Growstuff/dev
...
Release 14
2016-08-22 19:19:04 +09:30
Daniel O'Connor
29765ebc19
rubocop --only HashSyntax --auto-correct
2016-08-22 19:02:27 +09:30
Daniel O'Connor
b91f0e7f63
Whitelist providers to avoid session data being tampered with
2016-08-22 18:59:28 +09:30
Daniel O'Connor
87352b04f1
Refactor to a method to DRY, even if its not 100% the best spot for it to live long term
2016-08-22 18:52:12 +09:30
Daniel O'Connor
0f034523e1
Only maximize if the driver supports such a thing
2016-08-22 18:26:08 +09:30
Daniel O'Connor
20b87e596a
Modern syntax
2016-08-22 18:25:57 +09:30
Daniel O'Connor
4b7cffad04
DEPRECATION WARNING: [Devise] bypass option is deprecated and it will be removed in future version of Devise.
2016-08-22 16:42:08 +09:30
Daniel O'Connor
bcb0a19dea
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-22 16:37:50 +09:30
Daniel O'Connor
4e2311e8d7
Indent
2016-08-22 16:36:30 +09:30
Daniel O'Connor
c7be0f3b0e
Fix redirects and sign the user in if they weren't yet created
2016-08-22 16:35:58 +09:30
Daniel O'Connor
9ab79209ef
Adjust TOS url
2016-08-22 16:35:41 +09:30
Daniel O'Connor
1c3016a31e
Adjust for when running with selenium-webdriver to avoid clicks being placed in the wrong location; and for drivers that don't support blacklisting
2016-08-22 16:17:36 +09:30
Cesy
941001c743
Merge pull request #1029 from CloCkWeRX/add_seed_purchase_links
...
Add links to ebay, which seems to have a variety of seeds to purchase…
2016-08-16 08:53:09 +01:00
Cesy
40cf5ba63a
Merge pull request #1030 from CloCkWeRX/fix_998
...
Ensure we look at the current control, not the entire collection when marking planting finished
2016-08-16 08:50:30 +01:00
Cesy
9a40449f08
Merge pull request #1024 from CloCkWeRX/mapboxv4
...
#981 Add mapbox v4
2016-08-16 08:49:44 +01:00
Daniel O'Connor
049d792053
Fix Gemfile.lock
2016-08-16 12:05:14 +09:30
Daniel O'Connor
e399085a57
Update bootstrap-sass coveralls friendly_id js-routes sass-rails simplecov
2016-08-16 11:58:12 +09:30
Daniel O'Connor
18b4a90690
Upgrade excon ffi autoprefixer-rails multi_json mimemagic pry active_utils activemerchant
2016-08-16 11:56:50 +09:30
Daniel O'Connor
a68ffda7eb
Upgrade minor gems: kramdown, notifany, httparty, codemirror-rails, bootstrap_form, globalid
2016-08-16 11:56:25 +09:30
Daniel O'Connor
0a722edc88
Fix regression from bad merge
2016-08-16 11:45:58 +09:30
Daniel O'Connor
de407608f2
Merge remote-tracking branch 'upstream/dev' into queue_mail
2016-08-16 11:11:40 +09:30
Daniel O'Connor
ece0fdfe6c
Drop sidekiq web for the moment
2016-08-16 11:08:59 +09:30
Daniel O'Connor
5008d35614
Add sidekiq configuration
2016-08-16 11:02:35 +09:30
Daniel O'Connor
6b470f180c
#951 Add sidekiq as our activejob backend
2016-08-16 11:01:19 +09:30
Daniel O'Connor
4deb895b4c
#951 Add sidekiq
2016-08-16 10:59:30 +09:30
Daniel O'Connor
5d70d822eb
#951 Swap to deliver_later implementation
2016-08-16 10:55:40 +09:30
Daniel O'Connor
90a88cf69d
Fixes #998 Ensure we look at the current control, not the entire collection
2016-08-16 10:33:23 +09:30
Daniel O'Connor
044a992d25
Merge pull request #1025 from polveenomials/nav-header
...
Enhancement of the navigation bar (header)
2016-08-15 23:30:11 +09:30
Daniel O'Connor
4b066ec37f
Merge pull request #1028 from CloCkWeRX/minor_gem_upgrades_august_2016
...
Minor gem upgrades for August 2016
2016-08-15 23:28:30 +09:30
Daniel O'Connor
0dad02343e
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-15 23:14:49 +09:30
Daniel O'Connor
7f6a1a424d
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-15 23:13:55 +09:30
Daniel O'Connor
c2dc2c5836
Merge pull request #1027 from CloCkWeRX/cve-2016-6317
...
Fix CVE-2016-6316 CVE-2016-6317
2016-08-15 23:10:27 +09:30
Daniel O'Connor
58452204aa
Add links to ebay, which seems to have a variety of seeds to purchase with our affiliate id
2016-08-15 22:42:32 +09:30
Daniel O'Connor
711ba73d6b
Upgrade devise to 4.2
2016-08-15 22:12:34 +09:30
Daniel O'Connor
5354f2732f
Update bootstrap-sass coveralls friendly_id js-routes sass-rails simplecov
2016-08-15 22:07:39 +09:30
Daniel O'Connor
9bbaaa2211
Upgrade excon ffi autoprefixer-rails multi_json mimemagic pry active_utils activemerchant
2016-08-15 22:04:43 +09:30
Daniel O'Connor
93c47d774e
Upgrade minor gems: kramdown, notifany, httparty, codemirror-rails, bootstrap_form, globalid
2016-08-15 22:01:56 +09:30
Daniel O'Connor
d8ad697d09
Swap tokens
2016-08-15 21:53:17 +09:30
Daniel O'Connor
7308a7cf9a
Name: actionview
...
Version: 4.2.6
Advisory: CVE-2016-6316
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/I-VWr034ouk
Title: Possible XSS Vulnerability in Action View
Solution: upgrade to ~> 3.2.22.3, ~> 4.2.7.1, >= 5.0.0.1
Name: activerecord
Version: 4.2.6
Advisory: CVE-2016-6317
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/rgO20zYW33s
Title: Unsafe Query Generation Risk in Active Record
Solution: upgrade to ~> 4.2.7.1
2016-08-15 21:45:26 +09:30
Cesy
c9c49a7e5e
Merge pull request #1026 from CloCkWeRX/gardenate_attempt_2
...
Gardenate attempt 2
2016-08-15 13:15:21 +01:00
Daniel O'Connor
dba6b2a291
Mitigate security concerns with target=_blank via https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/
2016-08-15 21:31:45 +09:30
Daniel O'Connor
7d3991b295
#967 Mitigate security concerns with target=_blank via https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/
2016-08-15 21:30:51 +09:30
Daniel O'Connor
e4c0ecfb5a
Add basic test
2016-08-15 21:30:40 +09:30
Daniel O'Connor
fdb0e842de
#864 Add links to google, gardenate
2016-08-15 21:30:33 +09:30
polveenomials
85ff36198b
Added name to the CONTRIBUTORS.md
2016-08-04 14:27:49 +08:00
Daniel O'Connor
e38321aa33
#981 Add mapbox access token (on my free 50k views account) and update to v4
2016-07-28 14:27:49 +09:30
Kristine Nicole Polvoriza
d1438d1b2e
Fixed the nav header in mobile view
2016-07-28 12:31:50 +08:00
pozorvlak
b6f848ef66
Merge pull request #1021 from CloCkWeRX/picture_improvements
...
If a harvest doesn't have any photos, try to look at the crop's default photo
2016-07-21 18:24:58 +01:00
Daniel O'Connor
ff47784aee
Add explicit test coverage
2016-07-21 12:21:56 +09:30
Daniel O'Connor
1dba711057
Add more explicit test coverage
2016-07-21 12:13:37 +09:30
Daniel O'Connor
6911f7b24b
Typo
2016-07-21 12:05:37 +09:30
pozorvlak
1e94abd063
Merge pull request #1019 from CloCkWeRX/mobile_searchbar
...
Use navbar-right, and reposition search box to fix mobile layout
2016-07-20 12:44:03 +01:00
Cesy
3325e1e388
Merge pull request #1020 from Growstuff/dev
...
Release 13
2016-07-19 10:45:28 +01:00
Daniel O'Connor
07f7bd24d5
Clean up
2016-07-09 21:54:26 +09:30
Daniel O'Connor
04074ff372
Reimplement ajax like/unlike behaviour
2016-07-09 21:53:33 +09:30
Daniel O'Connor
d3dac756d6
Merge remote-tracking branch 'upstream/dev' into likeable
2016-07-09 21:08:33 +09:30
Daniel O'Connor
4b87977e24
It helps to type properly
2016-07-08 18:12:16 +09:30
Daniel O'Connor
dfa28264c6
#1017 When a crop has no photos, look for harvests of the crop with photos.
2016-07-08 18:09:53 +09:30
Daniel O'Connor
f0c1d6d4c2
#997 Use the harvest photo lookup, not the harvest.crop one
2016-07-08 18:01:53 +09:30
Daniel O'Connor
427b98a157
#997 If a harvest doesn't have any photos, try to look at the crop's default photo
2016-07-08 17:59:32 +09:30
Daniel O'Connor
8f5000443f
Use navbar-right, and reposition search box to fix mobile layout
2016-07-08 17:45:00 +09:30
Daniel O'Connor
7947fd6e91
Clean up link_to as per #1013
2016-07-08 17:08:17 +09:30
Daniel O'Connor
70bf5499b2
Clean up logic a bit as per #1013
2016-07-08 17:07:14 +09:30
Daniel O'Connor
6b059cb4f4
Clean up a bit as per #1013 with TODO comments
2016-07-08 17:06:05 +09:30
Daniel O'Connor
efd112c4b8
And vs && - revised version of b50127c166
2016-07-08 17:01:59 +09:30
Mackenzie Morgan
5c7b760f34
Use array literal [] instead of Array.new
2016-07-08 16:58:34 +09:30
Mackenzie Morgan
81ae473972
space between comma-separated arguments
2016-07-08 16:58:29 +09:30
Mackenzie Morgan
a8171bb739
has_key? -> key?
2016-07-08 16:58:22 +09:30
Daniel O'Connor
c803ed4ee6
Merge pull request #976 from pozorvlak/remove_default_shows
...
Remove "show" methods that just do the default
2016-07-08 16:56:25 +09:30
Daniel O'Connor
9e41a65749
Tweak readme wiki links
...
Supercedes #1016
2016-07-08 15:33:16 +09:30
Daniel O'Connor
43e7d6f7c2
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-07-05 03:09:36 +09:30
Cesy
a7539df5b5
Merge pull request #1018 from CloCkWeRX/minor_rails_bump
...
Minor gem upgrades for the month
2016-07-01 10:14:22 +01:00
Daniel O'Connor
3950619877
Update various minor gems even more
2016-07-01 17:42:58 +09:30
Daniel O'Connor
7373fd4aa9
Update various minor gems
2016-07-01 17:34:25 +09:30
Daniel O'Connor
c3d9885525
Merge pull request #987 from CloCkWeRX/upgradazzle_rails
...
Upgrade to rails 4.2.0+ (round 2)
2016-06-29 14:47:05 +09:30
Daniel O'Connor
4b5dee7bdb
Merge pull request #1007 from ctlewitt/dev
...
issue #1006 : change "Freenode" to "irc.freenode.net" in README.md
2016-06-29 12:51:05 +09:30
Charley Lewittes
55d846b9e0
Merge remote-tracking branch 'them/dev' into dev
2016-06-22 10:56:56 -04:00
Daniel O'Connor
f2d8349a88
#1012 Tweak script to avoid errors after merge
2016-06-22 10:46:26 +09:30
Daniel O'Connor
7c7dd7c609
Merge pull request #1012 from pozorvlak/check_contributors_md
...
Check PR author is in CONTRIBUTORS.md under Travis
2016-06-22 10:25:06 +09:30
Charley Lewittes
d8f2c580ee
added myself to contributors list
2016-06-21 13:14:26 -04:00
Charley Lewittes
2a0602468d
Added link and wording to access Freenode IRC growstuff channel easily
...
fixes #1006
2016-06-21 13:03:06 -04:00
Charley Lewittes
89a9c18188
fixes #1006 : change "Freenode" to "irc.freenode.net" in README.md
2016-06-21 12:49:33 -04:00
Miles Gould
8b426da149
Check PR author is in CONTRIBUTORS.md under Travis
...
Results of testing this locally (the exit value of the last command is
in my prompt):
```
0 $ TRAVIS=true TRAVIS_REPO_SLUG=growstuff/growstuff
TRAVIS_PULL_REQUEST=1007 script/check_contributors_md
Checking to see if you're in CONTRIBUTORS.md...
Thanks for your contribution, ctlewitt!
Please add your name and GitHub handle to the file CONTRIBUTORS.md,
commit it, and update your PR.
1 $ TRAVIS=true TRAVIS_REPO_SLUG=growstuff/growstuff
TRAVIS_PULL_REQUEST=1008 script/check_contributors_md
Checking to see if you're in CONTRIBUTORS.md...
- Miles Gould / [pozorvlak](https://github.com/pozorvlak )
0 $ script/check_contributors_md
Checking to see if you're in CONTRIBUTORS.md...
- Miles Gould / [pozorvlak](https://github.com/pozorvlak )
0 $
```
2016-06-21 16:37:26 +01:00
pozorvlak
cab98f9750
Merge pull request #1011 from Growstuff/revert-1002-letsencrypt-pt2-1
...
Revert "challenge code"
2016-06-21 15:28:15 +01:00
pozorvlak
27b7a26fee
Merge pull request #1010 from Growstuff/revert-999-letsencrypt
...
Revert "lets encrypt challenge page"
2016-06-21 15:27:38 +01:00
Cesy
7261fae9f2
Revert "challenge code"
2016-06-21 15:06:02 +01:00
Cesy
628ebd6841
Revert "lets encrypt challenge page"
2016-06-21 15:05:45 +01:00
Cesy
61bbf7c30d
Merge pull request #1008 from pozorvlak/test_gemfile_commits
...
Check for "forgot to commit Gemfile.lock" in CI
2016-06-21 14:57:54 +01:00
Miles Gould
e33803343a
Check for "forgot to commit Gemfile.lock" in CI
...
Quick-and-dirty script to catch an error we've missed a couple of times
in code review, but which is not (AFAICT) covered by any of our existing
checkers. Inspired by the following posts:
- https://zachholman.com/posts/how-github-writes-blog-posts/
- https://zachholman.com/talk/move-fast-break-nothing/
2016-06-21 13:32:11 +01:00
Mackenzie
b08a448fdc
hotfix commit: letsencrypt try #2
2016-06-20 13:40:49 -04:00
Cesy
7210ebfb22
Merge pull request #1004 from maco/letsencrypt
...
Letsencrypt, will be backed out once SSL is up and running.
2016-06-20 16:57:24 +01:00
Mackenzie Morgan
039978357b
letsencrypt verification for staging
2016-06-20 11:48:19 -04:00
Cesy
7ce2481cbc
Merge pull request #1002 from Growstuff/letsencrypt-pt2-1
...
challenge code - will also get reverted once SSL is up.
2016-06-20 15:49:33 +01:00
Mackenzie
5bc6af87c5
challenge code
2016-06-20 10:46:40 -04:00
Cesy
a5eaf3566e
Merge pull request #999 from Growstuff/letsencrypt
...
lets encrypt challenge page - temporary change for SSL tool, will be backed out after
2016-06-20 15:42:22 +01:00
Mackenzie Morgan
58d40e912d
Tweak rubocop config
...
* turn off line length limit
* turn off class documentation requirement
* 30 line methods
2016-06-20 10:35:38 -04:00
Mackenzie
63d89be698
lets encrypt challenge page
2016-06-20 10:34:11 -04:00
pozorvlak
1b7be9f9b0
Merge pull request #936 from maco/add_bootstrap_flashes
...
Add support for Bootstrap alert types
2016-06-20 10:19:36 +01:00
Mackenzie Morgan
7a53e96d52
test the default case
2016-06-19 22:52:51 -04:00
Mackenzie Morgan
b28d146de7
use default of info
...
add tests
2016-06-19 22:42:20 -04:00
Mackenzie Morgan
55c8be8dc5
merge
2016-06-19 22:27:27 -04:00
Daniel O'Connor
38a273459a
Merge pull request #996 from pozorvlak/block_unknown_urls_in_features
...
Block external URLs in feature tests
2016-06-18 20:21:32 +09:30
Miles Gould
1b07632c69
Block external URLs in features
...
https://github.com/teampoltergeist/poltergeist/issues/375#issuecomment-42620085
suggested that this might help with our intermittent "Request to
http://localhost:8081 failed to reach server, check DNS and/or server
status" errors in CI - the theory being that the error message is
misleading, and it's actually a daughter request to an external service
timing out. Seems worth a shot. It also ought to speed up testing, but
the effect is slight (20s out of 3.5 minutes) on my machine.
I've blacklisted only URLs I could find in app/views or by tcpdumping a
test run, because I couldn't get whitelisting to work.
2016-06-17 21:12:25 +01:00
pozorvlak
4a12523793
Merge pull request #991 from Growstuff/dev
...
Release 12
2016-06-17 11:37:29 +01:00
pozorvlak
6aa601b8ab
Merge pull request #993 from Growstuff/revert-988-dev
...
Revert "Handled Issue #950 (Branded Error Pages)"
2016-06-16 13:30:50 +01:00
pozorvlak
a66a040207
Revert "Handled Issue #950 (Branded Error Pages)"
2016-06-16 12:58:22 +01:00
pozorvlak
547a408a99
Merge pull request #988 from Prashanth261993/dev
...
Add branding to error pages (#950 )
2016-06-16 11:12:23 +01:00
pozorvlak
8cd224b7fa
Merge pull request #990 from maco/sparkpost_#917
...
don't override our environment email settings with plain old sendmail
2016-06-15 20:03:35 +01:00
Mackenzie Morgan
8428e93b47
don't override our environment email settings with plain old sendmail
2016-06-15 13:27:51 -04:00
Prashanth
483143f2fe
Merge branch 'growstuff-dev' into dev
...
Conflicts:
CONTRIBUTORS.md
2016-06-14 17:09:06 +05:30
pozorvlak
1b3d106b6d
Merge pull request #989 from maco/sparkpost_#917
...
update to SparkPost's mailserver
2016-06-13 18:04:43 +01:00
Mackenzie Morgan
e7be006fa7
update to SparkPost's mailserver
2016-06-13 12:12:00 -04:00
Prashanth
b9f40151d8
Handled Issue #950 (Branded Error Pages)
...
Moved error related views from public to errors (asset pipeline can be used).
Header and footer were included along with the error message.
2016-06-10 18:35:48 +05:30
Daniel O'Connor
fd467acc29
Clean up whitespace
2016-06-10 20:51:02 +09:30
pozorvlak
e1ad0c31c8
Merge pull request #986 from CloCkWeRX/update_various_gems_nokogiri
...
Update various gems - nokogiri, mime-types, parser, guard-rspec
2016-06-10 11:09:12 +01:00
Daniel O'Connor
ee604dc2b0
Upgrade activemerchant, fixing rails 5 deprecation warnings
2016-06-10 16:04:00 +09:30
Daniel O'Connor
0620646c6d
Fix failing specs
...
- Updated assert_select behaviour given this is now based on nokogiri
- Adjust some specs not to look for a specific asset name, but a behaviour
- Adjust some specs for HTML5 style attributes instead of xhtml style
- Fix tests that did not render before
2016-06-10 16:01:30 +09:30
Daniel O'Connor
df9cf3f5c4
Fix various rails deprecations
2016-06-10 15:58:39 +09:30
Daniel O'Connor
944349760a
Fix DEPRECATION WARNING: #timestamps was called without specifying an option for null.
...
In Rails 5, this behavior will change to `null: false`. You should manually specify `null: true` to prevent the behavior of your existing migrations from changing
2016-06-10 15:57:48 +09:30
Daniel O'Connor
7fe75ee52a
Fix DEPRECATION WARNING: #deliver is deprecated.
2016-06-10 15:45:01 +09:30
Daniel O'Connor
e3d7bf9a62
Upgrade to rails 4.2.*
2016-06-10 15:43:04 +09:30
Daniel O'Connor
deaf49c18f
Update selenium-webdriver
2016-06-10 15:40:56 +09:30
Daniel O'Connor
53543fff4c
Update terminal-table
2016-06-10 15:40:29 +09:30
Daniel O'Connor
ea5e710a70
Update codeclimate-test-reporter
2016-06-10 15:38:43 +09:30
Daniel O'Connor
ad5a52ae74
Update tilt
2016-06-10 15:36:07 +09:30
Daniel O'Connor
c0cc5ab085
Update geocoder
2016-06-10 15:35:29 +09:30
Daniel O'Connor
cf784cbedd
Update parser to current
2016-06-10 15:20:31 +09:30
Daniel O'Connor
5c68830919
Update guard-rspec
2016-06-10 15:19:57 +09:30
Daniel O'Connor
370aab41c3
Update mime-types
2016-06-10 15:19:28 +09:30
Daniel O'Connor
081f4021bc
Upgrade nokogiri
2016-06-10 15:19:03 +09:30
Daniel O'Connor
36f846fabf
Merge pull request #982 from CloCkWeRX/update_gibbon
...
Upgrade gibbon
2016-06-10 15:13:18 +09:30
pozorvlak
f6d094f57c
Merge pull request #985 from lucasnogueira/fix_simplecov_deprecation
...
Fix SimpleCov Deprecation Warning
2016-06-09 22:37:40 +01:00
Lucas Nogueira
9ce097b7d6
Fix SimpleCov Deprecation Warning
2016-06-09 17:42:11 -03:00
Mackenzie Morgan
91991f0c67
update Gemfile.lock
2016-06-09 14:25:04 -04:00
Mackenzie Morgan
306cd13723
add rubocop config with all the things turned on
2016-06-09 14:13:31 -04:00
Mackenzie Morgan
8c624cfacd
merge
2016-06-09 14:13:02 -04:00
pozorvlak
b03ccce575
Merge pull request #980 from lucasnogueira/replace_pluralize
...
Replace pluralize calls
2016-06-09 16:39:34 +01:00
Lucas Nogueira
63b8788c80
Change hash syntax
2016-06-09 11:57:56 -03:00
Daniel O'Connor
faa3beddbc
Upgrade gibbon
2016-06-10 00:17:28 +09:30
Lucas Nogueira
5dbd5bc1d2
Correct minor typos
2016-06-09 08:21:28 -03:00
Lucas Nogueira
b8b0d98e07
Update the contributors list
2016-06-08 22:06:26 -03:00
Lucas Nogueira
b911ebfd07
Replace pluralize calls
2016-06-08 22:03:40 -03:00
Lucas Nogueira
1ca515bd4e
Add missing activerecord model to locales
2016-06-08 21:56:29 -03:00
Lucas Nogueira
905710b6e9
Helper for plural localization
2016-06-08 21:55:33 -03:00
Mackenzie
12e0f674bc
Merge pull request #977 from pozorvlak/fix_devise_warnings
...
Replace deprecated Devise `for` method with `permit`
2016-06-08 13:14:05 -04:00
Mackenzie
18739c2a24
Merge pull request #974 from pozorvlak/remove_vendor_dir
...
Remove vendor directory
2016-06-08 11:12:14 -04:00
pozorvlak
f3dc2ff7e5
Replace deprecated Devise for method with permit
...
This should eliminate the screens-ful of deprecation warnings when
running the test suite.
2016-06-08 15:00:05 +00:00
pozorvlak
e6209a5906
Remove "show" methods that just do the default
...
We can just fall back to the default implementation for these.
2016-06-08 15:58:45 +01:00
Mackenzie
dbf64a4e90
Merge pull request #975 from Growstuff/revert-972-show_concern
...
Revert "Show concern"
2016-06-08 09:26:58 -04:00
pozorvlak
a8961c3466
Revert "Show concern"
2016-06-08 12:58:32 +01:00
pozorvlak
6931952688
Whitespace fixes
2016-06-07 17:43:36 +00:00
pozorvlak
936aa17ecc
Remove references to vendor directory
...
This consisted of instructions to various code-quality tools to
ignore it.
2016-06-07 17:43:36 +00:00
pozorvlak
f3d7420b8a
Remove vendor directory
...
We no longer need it, since we're now getting the functionality we
needed from upstream gems.
2016-06-07 17:43:35 +00:00
pozorvlak
e419acea6e
Install BogusPayPalGateway gem
...
We were maintaining a vendor fork of active_merchant because they
refused to merge this feature in; it's now been released as a
separate gem.
2016-06-07 17:43:35 +00:00
pozorvlak
95ae15b780
Merge pull request #972 from maco/show_concern
...
Show concern
2016-06-07 16:22:17 +01:00
Mackenzie Morgan
ed468e79fc
Merge branch 'dev' of gitmaco:Growstuff/growstuff into show_concern
2016-06-07 09:57:47 -04:00
Daniel O'Connor
130565af75
Merge pull request #969 from maco/code_climate_token
...
add Code Climate token to Travis config
2016-06-07 09:01:27 +09:30
Daniel O'Connor
ad8f360336
Merge pull request #970 from maco/codeclimate_exclude_vendor
...
exclude vendor gems from code climate
2016-06-07 09:01:05 +09:30
Daniel O'Connor
15775403fd
Merge pull request #971 from maco/readme_email
...
info@ email exists again
2016-06-07 09:00:38 +09:30
Mackenzie Morgan
e1b83c32af
info@ email exists again
2016-06-06 13:27:13 -04:00
Mackenzie Morgan
3fc7c65247
exclude vendor gems from code climate
2016-06-06 13:14:01 -04:00
Mackenzie Morgan
c8d1239b79
add Code Climate token to Travis config
2016-06-06 09:40:30 -04:00
Daniel O'Connor
6f9ae13757
Update spec to wait for the link to appear
2016-06-04 23:01:57 +09:30
Daniel O'Connor
0a33ae8d37
Add an ajax like and unlike (though it hides after the user action)
2016-06-04 22:49:08 +09:30
Daniel O'Connor
ac33816675
Update spec
2016-06-04 21:37:35 +09:30
Cesy
7885257fae
Merge pull request #943 from CloCkWeRX/adjust_helper
...
Deal with .nil quantity of a seed in rendering helper
2016-06-04 12:41:03 +01:00
Daniel O'Connor
77e95ad344
Shift to concerns
2016-06-04 21:02:50 +09:30
Daniel O'Connor
bb25cbe5e2
Merge branch 'dev' of github.com:Growstuff/growstuff into likeable
2016-06-04 21:00:52 +09:30
Daniel O'Connor
a8d22709e6
Add explict test coverage of the helper with nil seeds (page level tests already cover this rendering on crop detail in general)
2016-06-04 20:51:20 +09:30
pozorvlak
31b7b45ae3
Merge pull request #966 from cesy/readme
...
Updating readme with current wiki status and Gitter link
2016-06-03 14:34:35 +01:00
Cesy Avon
681798b582
Updating readme with current wiki status and Gitter link
2016-06-03 13:12:19 +00:00
Cesy
f05ea56179
Merge pull request #965 from dv2/dev
...
Add test coverage for GardensHelper
2016-06-03 14:03:07 +01:00
DV Dasari
ed4269ea4c
fixing grammar in test descriptions
2016-06-03 07:54:24 -05:00
DV Dasari
085fcc958e
Add test coverage for GardensHelper
2016-06-02 22:22:14 -05:00
pozorvlak
8f33fe3595
Merge pull request #960 from CloCkWeRX/update_various_gems
...
Update various gems
2016-06-02 18:18:12 +01:00
pozorvlak
980a7d79d3
Merge pull request #963 from CloCkWeRX/add_better_opengraph_squashed
...
Various bugfixes for facebook/opengraph
2016-06-02 17:58:05 +01:00
pozorvlak
9c5c07e087
Merge pull request #948 from cesy/issue875
...
Fix #875 edited date on comments on homepage
2016-06-02 17:41:59 +01:00
Daniel O'Connor
faaf07cad8
Render the full size image, as facebook doesn't like smaller thumbnails
2016-06-03 01:58:34 +09:30
Daniel O'Connor
0e83a230b9
Helps not to render excess info
2016-06-03 01:54:26 +09:30
Daniel O'Connor
c278b36858
Up the various opengraph images to 200x200
2016-06-03 01:45:43 +09:30
pozorvlak
0805f86b86
Merge pull request #961 from cesy/issue476
...
Issue 476 edited by date on comments and posts
2016-06-02 16:53:44 +01:00
pozorvlak
aad88f1da6
Merge pull request #962 from CloCkWeRX/add_better_opengraph_squashed
...
Add better opengraph behaviour, fix facebook share thumbnail size
2016-06-02 16:52:13 +01:00
Daniel O'Connor
7550bc860f
#816 Add better opengraph behaviour, fix facebook share thumbnail size
2016-06-03 01:01:03 +09:30
Cesy Avon
fc38e1edea
Issue #476 test update
2016-06-02 14:58:10 +00:00
Daniel O'Connor
88a66a705b
Update devise to 4.1.X and unpin
2016-06-03 00:23:58 +09:30
Daniel O'Connor
f77fd00931
Remove version pin for rspec-rails
2016-06-03 00:19:49 +09:30
Daniel O'Connor
b5c030905a
Upgrade to geocoder current (we shouldn't be affected by the deprecations in 1.2.X or 1.3.X)
2016-06-03 00:16:00 +09:30
Daniel O'Connor
2844e13298
Upgrade factory_girl_rails, factory_girl
2016-06-03 00:10:25 +09:30
Cesy Avon
3e4dc1f9e3
Issue #875 typo causing test error
2016-06-02 14:39:56 +00:00
Cesy Avon
259c1e1731
Fix #476 show edited and posted date on posts and comments
2016-06-02 14:37:33 +00:00
Daniel O'Connor
870aa674b0
Upgrade autoprefixer-rails to current
2016-06-03 00:07:28 +09:30
Daniel O'Connor
b1ab319bf7
Update mime-types-data to current
2016-06-03 00:05:46 +09:30
Daniel O'Connor
857422719a
Upgrade byebug to current
2016-06-03 00:04:09 +09:30
Daniel O'Connor
235314bc13
Upgrade js-routes to current
2016-06-03 00:03:48 +09:30
Daniel O'Connor
ac1cd88ae1
Upgrade kaminari to current
2016-06-03 00:01:38 +09:30
Daniel O'Connor
f93ea3c0a1
Upgrade httparty to current
2016-06-03 00:00:08 +09:30
Cesy Avon
0075040aab
Fix #875 edited date on comments on homepage
2016-06-02 13:56:03 +00:00
Cesy
f9d51e623c
Merge pull request #959 from pozorvlak/remove_capfile
...
Remove the Capistrano configuration file
2016-06-02 14:13:46 +01:00
Miles Gould
dcd36dcd67
Remove the Capistrano configuration file
...
Finishes work started in 93e468876d .
2016-06-02 13:45:53 +01:00
Cesy
608a921fce
Merge pull request #956 from CloCkWeRX/upgrade_devise4
...
Upgrade to devise 4.0.*
2016-06-02 10:18:29 +01:00
pozorvlak
4bedf1e6ac
Merge pull request #955 from CloCkWeRX/upgrade_geocoder
...
Swap to geocoder 1.1.9
2016-06-02 09:49:04 +01:00
pozorvlak
ac14c310f6
Merge pull request #954 from CloCkWeRX/ruby_231
...
Bump to Ruby 2.3.1
2016-06-02 09:48:20 +01:00
Daniel O'Connor
f979da315a
Explicitly swap from config.email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\W]+\z/
...
to the new default
2016-06-02 13:50:25 +09:30
Daniel O'Connor
a74ef7de6b
Upgrade to devise 4.0.3
2016-06-02 13:49:13 +09:30
Daniel O'Connor
10064121a6
#953 Swap to geocoder 1.1.9; which is the release just after what we had previously pinned
2016-06-02 13:30:42 +09:30
Daniel O'Connor
f8a1ef6066
#952 Try ruby 2.3.1
2016-06-02 13:14:10 +09:30
Daniel O'Connor
40d7b11d90
#952 Try ruby 2.3.1
2016-06-02 13:13:52 +09:30
Mackenzie Morgan
1600dd9e0b
Merge branch 'dev' of gitmaco:Growstuff/growstuff into add_bootstrap_flashes
2016-06-01 23:37:25 -04:00
pozorvlak
fbf5164eca
Merge pull request #937 from dv2/dev
...
Add test coverage for Seeds Helper
2016-06-01 16:33:38 +01:00
DV Dasari
21d86a8c2d
improve the test descriptions to be more readable
2016-06-01 09:46:22 -05:00
DV Dasari
848c7e117b
Add test coverage for Seeds Helper
2016-06-01 09:46:22 -05:00
Cesy
369868672b
Merge pull request #942 from pozorvlak/fix_coverage_calculations
...
Fix coverage calculations
2016-06-01 15:41:42 +01:00
Daniel O'Connor
321f3517a7
#920 Deal with .nil quantity of a seed in rendering helper
2016-06-01 23:26:43 +09:30
Miles Gould
6dd7ec9f95
Fix coverage calculations
...
SimpleCov was reporting 0% coverage for any files loaded before
`SimpleCov.start` was called, even if they were fully tested. This patch
loads the application *after* starting SimpleCov, leading to more
accurate coverage figures.
2016-06-01 14:54:13 +01:00
Cesy
dc00878ff9
Merge pull request #938 from Growstuff/dev
...
Release 11
2016-06-01 14:13:42 +01:00
Mackenzie Morgan
90f444dc1a
Merge branch 'dev' of gitmaco:Growstuff/growstuff into add_bootstrap_flashes
2016-05-31 10:50:56 -04:00
Miles Gould
4fa2e273aa
Merge remote-tracking branch 'origin/pr/933' into dev
2016-05-31 15:48:17 +01:00
pozorvlak
df92e0574a
Merge pull request #934 from dv2/dev
...
Align links properly on "Forgot password page", "Resend confirmation" and "Resend unlock" pages
2016-05-31 15:46:27 +01:00
DV Dasari
e2053e2f8b
adding me to CONTRIBUTORS.md
2016-05-31 07:33:40 -05:00
Eric Tillberg
31f0052b9d
added to contributors list
2016-05-31 06:49:17 -04:00
pozorvlak
b6169778fd
Merge pull request #932 from CloCkWeRX/location-not-set
...
Add a location not set layout (lets try this again!)
2016-05-31 11:41:11 +01:00
Mackenzie Morgan
32b98a7e40
Add support for Bootstrap alert types
...
* All alerts are currently shoved into either red (error) or green (success)
* Add support for yellow (warning) and blue (info) alert types
Solution from this Stack Overflow: http://stackoverflow.com/questions/31094771/rails-bootstrap-haml-how-to-convert-this-code-to-display-flash-messages-to
2016-05-30 21:48:11 -04:00
Daniel O'Connor
5111c2a96b
Add sr-only text
2016-05-31 09:43:53 +09:30
Eric Tillberg
2ac901c891
feature test for issue 910
2016-05-30 09:06:09 -04:00
Mackenzie
ff4466951c
Merge pull request #935 from CloCkWeRX/remove_crowdfunding
...
Remove crowdfunding code
2016-05-29 23:27:22 -04:00
Daniel O'Connor
8f05e254a2
Remove crowdfunding code
2016-05-30 10:06:51 +09:30
DV Dasari
5122903139
align links on "Resend unlock instructions" page
2016-05-29 18:25:01 -05:00
DV Dasari
1344f776e4
align devise shared links properly on "Resend confirmation instructions" page
2016-05-29 18:23:57 -05:00
DV Dasari
f33367ebac
align devise shared links properly on "Forgot your password" page
2016-05-29 18:19:15 -05:00
Eric Tillberg
3ac42deae5
crop approval flash alert for wranglers upon sign in
2016-05-29 16:13:21 -04:00
Daniel O'Connor
3d04e7c125
Add list-inline to ensure the sidebar never conflicts with other content
2016-05-28 09:30:54 +09:30
Daniel O'Connor
fa77f11177
Based on MIT licenced icon-globe ( http://fontawesome.io/3.2.1/icon/globe/ )
2016-05-28 09:26:00 +09:30
pozorvlak
45c8767234
Merge pull request #922 from maco/bug-#848
...
Swap over to having "(Optional)" (or translation) after optional form…
2016-05-27 17:41:42 +01:00
Mackenzie Morgan
13dc87f368
Optional field improvements
...
* Added custom matcher `have_optional(field id name goes here)`
* Fix partial
* Add tests
2016-05-27 11:26:36 -04:00
Mackenzie Morgan
fc0116182f
Merge branch 'dev' of gitmaco:Growstuff/growstuff into bug-#848
2016-05-27 11:24:37 -04:00
Mackenzie
bbe9f3f1db
Merge pull request #927 from pozorvlak/delete_puts_in_spec
...
Remove warnings and debugging puts from rspec output
2016-05-27 11:21:52 -04:00
Miles Gould
1009570102
Check href attribute of links in planting reminder
...
To check the target of a link, you need to pass it to `has_link` as an
`href` keyword argument. We were passing it as a positional argument,
which meant that
- it was ignored, weakening the tests
- the output of rspec filled up with annoying warnings.
Fixes #928 .
2016-05-27 15:46:21 +01:00
Mackenzie Morgan
47f42d0ffa
Merge branch 'dev' of gitmaco:Growstuff/growstuff into bug-#848
2016-05-27 10:22:35 -04:00
Miles Gould
23d21be73f
Delete debugging puts statement from spec
...
Fixes the "rspec output includes an HTML page dump" issue noted at
2089866756 (diff-6464240396bc745d7e89a408c200fd3aR15)
2016-05-27 14:04:30 +01:00
pozorvlak
25f8d2ca44
Merge pull request #924 from maco/capybara-tools
...
Add capybara-screenshot to assist with feature testing
2016-05-27 13:18:26 +01:00
pozorvlak
58d91ec0b0
Merge pull request #923 from maco/bug-#854
...
Display one line of description in harvest card, then go to ellipsis …
2016-05-27 12:17:10 +01:00
pozorvlak
85cc9868cb
Merge pull request #925 from maco/bug-#906
...
Capture originalText from the button that's been clicked, not from…
2016-05-27 11:24:08 +01:00
Mackenzie Morgan
75631da398
Set filename of screenshot to test name
2016-05-27 00:21:02 -04:00
Mackenzie Morgan
03c74dae03
Capture originalText from the button that's been clicked, not from the array of all possible date-picker buttons.
...
Fixes #906
2016-05-26 23:55:49 -04:00
Mackenzie Morgan
2089866756
Display one line of description in harvest card, then go to ellipsis and put read more on next line
...
Fixes #854
2016-05-26 23:08:23 -04:00
Mackenzie Morgan
8d982c7e3e
Add capybara-screenshot to assist with feature testing
2016-05-26 22:39:58 -04:00
Mackenzie Morgan
079cecc529
Swap over to having "(Optional)" (or translation) after optional form elements rather than using placeholder text
...
Fixes #848
2016-05-26 16:53:46 -04:00
pozorvlak
b0d90f6fd5
Merge pull request #921 from maco/bug-#876
...
Use standardized & translateable strings for the photo show page
2016-05-26 17:50:12 +01:00
Mackenzie Morgan
58f4ae32d0
test update
2016-05-26 12:28:58 -04:00
Mackenzie Morgan
dd0373a3ee
Use standardized & translateable strings for the photo show page
...
Fixes #876
2016-05-26 11:51:46 -04:00
pozorvlak
170dca7086
Merge pull request #918 from maco/bug-#855
...
Stop hard-coding strings for pagination
2016-05-26 13:00:33 +01:00
pozorvlak
c930f04b5a
Merge pull request #905 from maco/photos
...
refactor photo controller create for readability
2016-05-26 12:57:29 +01:00
Cesy
f41d919ca8
Merge pull request #916 from maco/bug_873
...
make seed card heading link to seed page and add owner link. Fixes #873
2016-05-26 09:58:37 +01:00
Cesy
8c4583b0d3
Merge pull request #915 from maco/autocomplete_dropdown
...
set background color on autocomplete dropdown. Fixes #914
2016-05-26 09:57:02 +01:00
Mackenzie Morgan
972518e9fc
Stop hard-coding strings for pagination
...
Use translation template to set singular/other strings
for .model_name
Fixes #855
2016-05-25 23:15:36 -04:00
pozorvlak
5b38fad85e
Merge pull request #912 from maco/small_fixes
...
Fix two small things (including: make tests stop failing)
2016-05-25 23:25:47 +01:00
Mackenzie Morgan
d227601627
Add config/factory_girl.rb so that rspec doesn't fail with a confusing
...
'Could not find mapping for #<Member...' error
http://blog.thefrontiergroup.com.au/2011/03/reloading-factory-girl-factories-in-the-rails-3-console/
2016-05-25 17:35:57 -04:00
Mackenzie Morgan
736e45aec9
update Gemfile.lock for code climate
2016-05-25 17:35:23 -04:00
Mackenzie Morgan
11e2e86b06
make seed card heading link to seed page and add owner link. Fixes #873
2016-05-25 16:21:17 -04:00
Mackenzie Morgan
58617b5685
set background color on autocomplete dropdown. Fixes #914
2016-05-25 16:07:49 -04:00
Mackenzie Morgan
8c2aa4844f
use CW's case statement idea
2016-05-25 15:15:09 -04:00
Mackenzie Morgan
8648db5518
create SimpleShow concern for models where show's json call is simple
2016-05-25 13:37:01 -04:00
Mackenzie Morgan
b5b201b6df
bundle
2016-05-25 10:38:06 -04:00
Mackenzie Morgan
b601fe40b3
refactor photo controller create for readability
2016-05-24 16:59:52 -04:00
pozorvlak
d6999b2a8a
Merge pull request #879 from Growstuff/code_climate
...
Add code climate to README
2016-05-23 19:00:26 +01:00
Mackenzie Morgan
76f152aa35
add Code Climate config file
2016-05-23 13:07:18 -04:00
pozorvlak
63f8a2c5c0
Merge pull request #897 from maco/menu_fix
...
darken navbar item text when it opens (and the background turns light)
2016-05-23 12:25:22 +01:00
pozorvlak
ae482ecab6
Merge pull request #802 from cesy/issue690
...
Issue 690 Switch on CMS and remove old files
2016-05-23 12:24:49 +01:00
pozorvlak
a8e63ab397
Merge pull request #898 from CloCkWeRX/adjust_plantings_card_ui
...
Improve the styling of a planting to be more like the other card-layouts
2016-05-23 12:17:47 +01:00
pozorvlak
a2717ad058
Merge pull request #900 from CloCkWeRX/clip_long_text
...
Clip long text in definition lists within panels
2016-05-23 12:07:32 +01:00
Daniel O'Connor
083035c924
Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup
2016-05-23 16:58:22 +09:30
Daniel O'Connor
92cce5910e
Improve planting card UI on mobile
2016-05-23 16:35:58 +09:30
Daniel O'Connor
ab897f05f9
Use panel-body and panel-heading more effectively
2016-05-23 16:21:13 +09:30
Daniel O'Connor
cd8ca02322
Merge remote-tracking branch 'upstream/dev' into adjust_plantings_card_ui
2016-05-23 16:17:39 +09:30
Daniel O'Connor
5104225d11
#856 Clip long text in definition lists within panels
2016-05-23 16:13:53 +09:30
Mackenzie
24d6087ea7
Merge pull request #899 from CloCkWeRX/improve_nearby_places_links
...
Improve nearby places links
2016-05-22 23:39:53 -04:00
Daniel O'Connor
dc9ee18e96
Update stale test expectation
2016-05-23 12:56:37 +09:30
Daniel O'Connor
b4060b7903
Update stale test expectation
2016-05-23 12:55:50 +09:30
Daniel O'Connor
884a3aad2c
Check we have a location before linking to it
2016-05-23 11:51:14 +09:30
Daniel O'Connor
80f826421b
Add page anchors to put you to the area you are most interested in
2016-05-23 11:41:42 +09:30
Daniel O'Connor
7872bb48e2
Fixes #872 Add more links and explain them better
2016-05-23 11:35:49 +09:30
Daniel O'Connor
7d10101c57
For a place, talk about the community as a vaguer way of explaining 'members, seeds, plantings, etc'
2016-05-23 11:31:29 +09:30
Daniel O'Connor
d9ed21ba53
Styling the show view of a planting more like the card view (though 100% card view looks funny with the crop thumbnail floating to the right)
2016-05-23 11:24:32 +09:30
Daniel O'Connor
5e8211172b
Only show a heading for Notes if there are notes
2016-05-23 11:12:42 +09:30
Daniel O'Connor
24956255d7
Fix layout of view all plantings link
2016-05-23 11:03:23 +09:30
Daniel O'Connor
55380dab04
Fix style regression by moving garden content properly into the container
2016-05-23 10:58:09 +09:30
Daniel O'Connor
e7926b6f22
Improve the styling of a planting to be more like the other card-layouts
2016-05-23 10:48:49 +09:30
Mackenzie Morgan
fe7d8f73f3
darken navbar item text when it opens (and the background turns light)
...
Fixes #896
2016-05-22 20:49:51 -04:00
Mackenzie
47d7f001fe
Merge pull request #895 from cesy/precompile
...
Precompile css and js with sass
2016-05-22 15:10:43 -04:00
Cesy Avon
23a6722ddb
Precompile css and js with sass
2016-05-22 16:34:36 +00:00
Cesy
23e2b756fd
Merge pull request #886 from pozorvlak/fix_duplicated_class_warning
...
Fix "duplicated key: :class" warning in HAML code
2016-05-22 17:21:47 +01:00
pozorvlak
8bea05a77b
Merge pull request #803 from cesy/issue734bootstrapaccessibility
...
Bootstrap accessibility
2016-05-22 17:19:55 +01:00
Cesy
d5ac4bac48
Merge pull request #894 from pozorvlak/upgradegibbon
...
Fix mailchimp newsletter subscriptions
2016-05-22 17:13:59 +01:00
pozorvlak
1af9b2e6db
Merge pull request #892 from cesy/databaseconfig
...
Moving database.yml and adding gitignore
2016-05-22 17:09:35 +01:00
Cesy
daa3c08706
Fixing broken links to pages that are now in CMS
2016-05-22 16:05:07 +00:00
Cesy
29102e3b52
Cleaning up more tests
2016-05-22 16:05:07 +00:00
Cesy
8c0fc54344
Sorting tests related to moving to CMS
2016-05-22 16:04:39 +00:00
Cesy
f5b20c2f32
About is empty, policy won't work without the routes
2016-05-22 16:01:40 +00:00
Cesy
79734ff603
Fix #690 Removing old static files that are now in CMS
2016-05-22 16:01:40 +00:00
twconquest
397bfd8bca
Start removing static page references.
2016-05-22 16:01:40 +00:00
Miles Gould
52dc111210
Merge branch 'dev' into upgradegibbon
2016-05-22 16:57:38 +01:00
Cesy Avon
da1375e34d
Making database.yml locally editable
2016-05-22 15:50:22 +00:00
pozorvlak
19f4ee51ed
Merge pull request #891 from Growstuff/dev
...
Release 10
2016-05-22 16:34:18 +01:00
Cesy
7be346d92f
Merge pull request #890 from maco/gem_udpate
...
upgrade gems and make API change for ruby-units
2016-05-22 08:54:07 +01:00
Mackenzie Morgan
51a0a33b2a
upgrade gems and make API change for ruby-units
2016-05-21 16:33:42 -04:00
Mackenzie Morgan
0df52b3cd8
update paperclip
2016-05-20 11:28:55 +01:00
Daniel O'Connor
18cd8f5966
#507 #813 Add spec
2016-05-19 15:53:11 -04:00
Kevin Rio
5a31619b46
If i reply to a notification directly, it's not marked as read. #507
2016-05-19 15:53:11 -04:00
Daniel O'Connor
4b4e0cf69a
$ rubocop --only HashSyntax --auto-correct
...
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
Mackenzie Morgan
8659ebca2d
switch from less to sass
...
* dependency hell + bit rot on upstream libraries prevents installation on OS X
2016-05-19 15:52:54 -04:00
Miles Gould
238e0be682
Merge branch 'upgrade_misc_dev_tools' into dev
2016-05-19 15:02:32 +01:00
Mackenzie
4324ceb8ca
Merge pull request #884 from pozorvlak/bump_ruby_22x
...
Bump ruby to 2.2.x
2016-05-19 09:40:48 -04:00
Miles Gould
79db3c4c1d
Fix "duplicated key: :class" warning in HAML code
...
The warning was
app/views/harvests/_form.html.haml:32: warning: duplicated key at line 32 ignored: :class
We were specifying two `:class` attributes on an HTML tag; I've combined
them into one.
2016-05-19 14:40:24 +01:00
Mackenzie
19d6c8f293
Merge pull request #882 from pozorvlak/install_all_gems_on_travis
...
Install *all* gems in TravisCI
2016-05-19 09:37:08 -04:00
Miles Gould
bcb74c7ed8
Merge branch 'dev' into bump_ruby_22x
2016-05-19 14:15:33 +01:00
Miles Gould
4a341bb7ab
Install *all* gems in CI
...
Previously we were only installing the gems needed for testing. This
caused our CI to miss an incompatibility problem with a gem that was
only needed for another environment:
https://github.com/Growstuff/growstuff/pull/878#discussion_r63745751
2016-05-19 13:33:36 +01:00
Mackenzie
925027f7f0
add code climate test reporter
2016-05-17 14:02:42 -04:00
Mackenzie
1442a9106c
add code climate / travis gem
2016-05-17 13:58:55 -04:00
Mackenzie
fafb421a51
Add code climate to README
...
Our code climate score is *abysmal*, but now that I've been using it in my job for a few months, I have some ideas how to improve it. It's all about clean code (check out the book of that name from your local library) and readability. So let's add the grade to the README, and I'll figure out how to set it up so that Code Climate is run on pull requests automatically (telling us whether things are going to get better or worse with every PR).
2016-05-17 13:47:33 -04:00
Daniel O'Connor
02615dc522
$ bundle update selenium-webdriver guard guard-rspec rails factory_girl pg simplecov coveralls newrelic_rpm better_errors minitest
2016-05-17 13:33:12 +09:30
Cesy
436527b902
Merge pull request #837 from Growstuff/dev
...
Release 9
2016-05-16 20:09:00 +01:00
Cesy
260b16da11
Merge pull request #865 from CloCkWeRX/fix_progress
...
Fix progress calculations
2016-04-21 08:02:37 +01:00
Daniel O'Connor
cf0a646699
Add EOF newlines
2016-04-14 09:59:36 +09:30
Daniel O'Connor
12ad16a05a
Newlines
2016-04-13 08:41:05 +09:30
Cesy
d525afb07c
Merge pull request #866 from CloCkWeRX/fix_posts_path
...
Fixes #851 Correct the link to be specific to the author
2016-04-11 18:56:45 +01:00
Daniel O'Connor
3ff3ffa457
Don't update that link, geesh. Need more coffee!
2016-04-11 09:55:03 +09:30
Daniel O'Connor
e3c689ba6b
Fixes #851 Correct the link to be specific to the author
2016-04-11 09:51:52 +09:30
Daniel O'Connor
82553d6e0a
Avoid time travel in favour of calculating a number of past/future dates
2016-04-11 09:29:06 +09:30
Daniel O'Connor
3644a8124f
Tweak specs, implementation properly
2016-04-09 22:54:03 +09:30
Daniel O'Connor
5cfa051d75
Update expectations
2016-04-09 22:43:17 +09:30
Daniel O'Connor
69fb98146b
Adjust logic
2016-04-09 22:01:05 +09:30
Cesy
01b9e76814
Merge pull request #860 from CloCkWeRX/fix_warnings
...
Fix WARNING: Using the `raise_error` matcher without providing a specific error
2016-04-09 13:26:11 +01:00
Cesy
594e3470b4
Merge pull request #858 from CloCkWeRX/fix_plant_parts
...
Fix plant parts / harvests issue #853
2016-04-09 13:25:46 +01:00
Daniel O'Connor
7bb7a18b66
Fixes #850 Refactors percentage grown to model, stops rendering progress bars in situations it doesn't make sense. Adds specs.
2016-04-09 21:45:13 +09:30
Cesy
de4b89fdf7
Merge pull request #861 from hcbviolet/descriptions
...
#852 Harvest description headings rendered when there's no description
2016-04-09 13:08:00 +01:00
hcbviolet
e8d7ed0c2d
Edit display_harvest_description method for no description
2016-04-08 17:34:58 -07:00
Daniel O'Connor
a3ad9189b1
Fix WARNING: Using the raise_error matcher without providing a specific error or message risks false positives, since raise_error will match when Ruby raises a NoMethodError, NameError or ArgumentError, potentially allowing the expectation to pass without even executing the method you are intending to call. Actual error raised was #<ActiveRecord::RecordNotFound: Couldn't find Member with 'id'=9999>. Instead consider providing a specific error class or message. This message can be supressed by setting: RSpec::Expectations.configuration.warn_about_potential_false_positives = false. Called from /home/travis/build/Growstuff/growstuff/spec/controllers/member_controller_spec.rb:65:in `block (3 levels) in <top (required)>'.
2016-04-07 10:41:35 +09:30
Daniel O'Connor
da588b7fdb
Create the plant part instead of assuming it's seeded
2016-04-07 10:08:21 +09:30
Daniel O'Connor
a7f9e113d6
Target the name attribute
2016-04-07 09:59:06 +09:30
Daniel O'Connor
c3a883de16
Ensure we choose a plant part
2016-04-07 09:47:53 +09:30
Daniel O'Connor
aa2a761a58
Ensure we choose a plant part
2016-04-07 09:46:29 +09:30
Daniel O'Connor
a800630b01
Ensure we choose a plant part
2016-04-07 09:43:45 +09:30
Cesy
b69bb219a3
Merge pull request #859 from CloCkWeRX/add_title_validations
...
Add title validations
2016-04-03 11:45:10 +01:00
Daniel O'Connor
a9330f2d77
#857 Add length validations to UI
2016-04-03 00:15:45 +10:30
Daniel O'Connor
de8bcc38d3
#857 Add length validations to models
2016-04-03 00:13:38 +10:30
Daniel O'Connor
99a3be08eb
Fixes #853
2016-04-03 00:08:19 +10:30
Daniel O'Connor
d9f04d1fa9
Fixes #853
2016-04-03 00:08:12 +10:30
pozorvlak
1791ed5b01
Merge pull request #843 from CloCkWeRX/fix_CVE-2015-7551_upgrade_ruby
...
Fix CVE-2015-7551
2016-03-29 20:04:56 +01:00
pozorvlak
683ec9dd9d
Merge pull request #842 from CloCkWeRX/cve_2015_5312_and_more
...
Fix CVE 2015 5312 and more
2016-03-29 20:03:41 +01:00
Daniel O'Connor
668f6d3a2b
Fix 'app/views/harvests/_form.html.haml:39: warning: duplicated key at line 39 ignored: :class'
2016-03-29 00:43:14 +10:30
Mackenzie
90e9017a19
Merge pull request #841 from CloCkWeRX/fix_840_performance
...
Eager load photos to reduce the number of queries executed
2016-03-28 09:55:40 -04:00
Daniel O'Connor
9f3cb7ee8b
Merge branch 'dev' of github.com:Growstuff/growstuff into fix_CVE-2015-7551_upgrade_ruby
2016-03-29 00:24:26 +10:30
Daniel O'Connor
df952a1779
Bump rspec to fix https://github.com/rspec/rspec-rails/issues/1532
2016-03-29 00:00:07 +10:30
Daniel O'Connor
3748f954c5
Name: uglifier
...
Version: 2.5.3
Advisory: 126747
Criticality: Unknown
URL: https://github.com/mishoo/UglifyJS2/issues/751
Title: uglifier incorrectly handles non-boolean comparisons during minification
Solution: upgrade to >= 2.7.2
2016-03-28 23:54:29 +10:30
Mackenzie
dcbacddb58
Merge pull request #839 from CloCkWeRX/tweak_permissions
...
Tweak permissions links
2016-03-28 09:22:35 -04:00
Daniel O'Connor
b0adec20e7
Fix CVE-2015-7551 ( https://www.ruby-lang.org/en/news/2015/12/16/unsafe-tainted-string-usage-in-fiddle-and-dl-cve-2015-7551/ )
2016-03-28 23:40:17 +10:30
Daniel O'Connor
4e7e82c8a8
Fix CVE-2015-7551 ( https://www.ruby-lang.org/en/news/2015/12/16/unsafe-tainted-string-usage-in-fiddle-and-dl-cve-2015-7551/ )
2016-03-28 23:39:05 +10:30
Daniel O'Connor
6905cd410d
Bump to current ruby 2.2.*, as there's an end of life for 2.1.* https://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/
2016-03-28 23:38:25 +10:30
Daniel O'Connor
66bb130a1a
Fix CVE-2015-7551 ( https://www.ruby-lang.org/en/news/2015/12/16/unsafe-tainted-string-usage-in-fiddle-and-dl-cve-2015-7551/ )
2016-03-28 23:33:34 +10:30
Daniel O'Connor
03ae327e30
Name: uglifier
...
Version: 2.5.3
Advisory: 126747
Criticality: Unknown
URL: https://github.com/mishoo/UglifyJS2/issues/751
Title: uglifier incorrectly handles non-boolean comparisons during minification
Solution: upgrade to >= 2.7.2
2016-03-28 23:27:15 +10:30
Daniel O'Connor
c1fde41f1f
Name: devise
...
Version: 3.4.1
Advisory: CVE-2015-8314
Criticality: Unknown
URL: http://blog.plataformatec.com.br/2016/01/improve-remember-me-cookie-expiration-in-devise/
Title: Devise Gem for Ruby Unauthorized Access Using Remember Me Cookie
Solution: upgrade to >= 3.5.4
2016-03-28 23:23:56 +10:30
Daniel O'Connor
a10f6e4783
Name: actionpack
...
Version: 4.1.11
Advisory: CVE-2015-7581
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/dthJ5wL69JE
Title: Object leak vulnerability for wildcard controller routes in Action Pack
Solution: upgrade to >= 4.2.5.1, ~> 4.2.5, >= 4.1.14.1, ~> 4.1.14
Name: actionpack
Version: 4.1.11
Advisory: CVE-2016-0751
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/9oLY_FCzvoc
Title: Possible Object Leak and Denial of Service attack in Action Pack
Solution: upgrade to ~> 5.0.0.beta1.1, >= 4.2.5.1, ~> 4.2.5, >= 4.1.14.1, ~> 4.1.14, ~> 3.2.22.1
Name: actionpack
Version: 4.1.11
Advisory: CVE-2015-7576
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/ANv0HDHEC3k
Title: Timing attack vulnerability in basic authentication in Action Controller.
Solution: upgrade to ~> 5.0.0.beta1.1, >= 4.2.5.1, ~> 4.2.5, >= 4.1.14.1, ~> 4.1.14, ~> 3.2.22.1
Name: actionpack
Version: 4.1.11
Advisory: CVE-2016-2098
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/ly-IH-fxr_Q
Title: Possible remote code execution vulnerability in Action Pack
Solution: upgrade to ~> 3.2.22.2, >= 4.2.5.2, ~> 4.2.5, >= 4.1.14.2, ~> 4.1.14
Name: actionview
Version: 4.1.11
Advisory: CVE-2016-2097
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/ddY6HgqB2z4
Title: Possible Information Leak Vulnerability in Action View
Solution: upgrade to ~> 3.2.22.2, >= 4.1.14.2, ~> 4.1.14
Name: actionview
Version: 4.1.11
Advisory: CVE-2016-0752
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/335P1DcLG00
Title: Possible Information Leak Vulnerability in Action View
Solution: upgrade to ~> 5.0.0.beta1.1, >= 4.2.5.1, ~> 4.2.5, >= 4.1.14.1, ~> 4.1.14, ~> 3.2.22.1
Name: activemodel
Version: 4.1.11
Advisory: CVE-2016-0753
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/6jQVC1geukQ
Title: Possible Input Validation Circumvention in Active Model
Solution: upgrade to ~> 5.0.0.beta1.1, >= 4.2.5.1, ~> 4.2.5, >= 4.1.14.1, ~> 4.1.14
Name: activerecord
Version: 4.1.11
Advisory: CVE-2015-7577
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/cawsWcQ6c8g
Title: Nested attributes rejection proc bypass in Active Record
Solution: upgrade to ~> 5.0.0.beta1.1, >= 4.2.5.1, ~> 4.2.5, >= 4.1.14.1, ~> 4.1.14, ~> 3.2.22.1
2016-03-28 23:17:55 +10:30
Daniel O'Connor
a76d2a3eb0
Name: devise
...
Version: 3.4.1
Advisory: CVE-2015-8314
Criticality: Unknown
URL: http://blog.plataformatec.com.br/2016/01/improve-remember-me-cookie-expiration-in-devise/
Title: Devise Gem for Ruby Unauthorized Access Using Remember Me Cookie
Solution: upgrade to >= 3.5.4
2016-03-28 23:16:21 +10:30
Daniel O'Connor
049886459a
Name: nokogiri
...
Version: 1.6.5
Advisory: CVE-2015-1819
Criticality: Unknown
URL: https://github.com/sparklemotion/nokogiri/issues/1374
Title: Nokogiri gem contains several vulnerabilities in libxml2 and libxslt
Solution: upgrade to ~> 1.6.6.4, >= 1.6.7.rc4
Name: nokogiri
Version: 1.6.5
Advisory: CVE-2015-7499
Criticality: Medium
URL: https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
Title: Nokogiri gem contains a heap-based buffer overflow vulnerability in libxml2
Solution: upgrade to >= 1.6.7.2
Name: nokogiri
Version: 1.6.5
Advisory: CVE-2015-5312
Criticality: High
URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
Title: Nokogiri gem contains several vulnerabilities in libxml2
Solution: upgrade to >= 1.6.7.1
2016-03-28 23:13:31 +10:30
Daniel O'Connor
b57cb581dd
#840 Eager load photos
2016-03-28 23:08:26 +10:30
Daniel O'Connor
f23cb78dcb
#840 Eager load photos, which are used in the .interesting? call; so we don't have to do a photos.size call on every single crop.
2016-03-28 23:08:20 +10:30
Daniel O'Connor
bfffaab77f
Have to stub the controller load_and_authorize_resource behaviour, as these tests aren't run in that context.
2016-03-28 22:26:36 +10:30
Daniel O'Connor
32af1b28a8
Update the expectations: an edit link is visible to crop wranglers (which used to be an expectation about the id appearing in a link)
2016-03-28 22:03:59 +10:30
Daniel O'Connor
9fa72fa5f7
Only render a pipe if there are multiple options like edit rights available
2016-03-28 21:41:06 +10:30
Daniel O'Connor
e35b15c868
Only render an edit control if the permission exists
2016-03-28 21:40:58 +10:30
Cesy
22e0e8fba0
Merge pull request #836 from gustavor-souza/patch-2
...
Fixing a spec timezone problem.
2015-10-09 09:17:15 +01:00
gustavor-souza
8caea57c47
Fixing a spec timezone problem.
2015-09-29 22:40:13 -03:00
Jim Stallings
2f561aaa47
Add myself to contributors
2015-09-26 11:54:51 -04:00
Jim Stallings
e02a6e569c
Remove example file, add documentation
2015-09-26 11:54:02 -04:00
pozorvlak
24dd02a439
Merge pull request #829 from CloCkWeRX/upgrade_db_cleaner
...
Upgrade database cleaner gem
2015-09-23 21:17:14 +01:00
Cesy
45c8092a94
Merge pull request #832 from CloCkWeRX/ruby217
...
Bump to ruby 2.1.7 for CVE-2015-3900
2015-09-23 11:35:26 +01:00
Daniel O'Connor
48829dba3c
Bump to ruby 2.1.7 for CVE-2015-3900 Request hijacking vulnerability in RubyGems 2.4.6 and earlier; and others - https://www.ruby-lang.org/en/news/2015/08/18/ruby-2-1-7-released/
2015-09-22 11:14:50 +09:30
Jim Stallings
98581801c3
GS-658 - i18n automation POC
2015-09-19 17:45:31 -04:00
Jim Stallings
93f9435fb9
GS-658: sort locale keys, add rake task for it
2015-09-19 16:24:01 -04:00
Cesy
46ee2168e1
Merge pull request #831 from CloCkWeRX/add_selenium
...
Add additional capyabara driver options
2015-09-16 11:59:22 +01:00
Cesy
5dd52ba17f
Merge pull request #830 from CloCkWeRX/sprellin
...
Fix minor typo in specs
2015-09-16 11:52:30 +01:00
Daniel O'Connor
78a65f26c6
Add configuration into example file
2015-09-16 14:16:42 +09:30
Daniel O'Connor
f81666da5e
And cleanup authentications
2015-09-15 12:58:35 +09:30
Daniel O'Connor
4a1bc9f6c0
Avoid test data conflicts and update expectations
2015-09-15 12:44:12 +09:30
Daniel O'Connor
0652c40c52
Avoid test data conflicts causing signup to act as signin-for-existing
2015-09-15 12:34:20 +09:30
Daniel O'Connor
a99145b705
Implement pending spec
2015-09-15 12:27:17 +09:30
Daniel O'Connor
222f875c42
Add more coverage of various scenarios and expected behaviours
2015-09-15 12:26:32 +09:30
Daniel O'Connor
dc983d4863
Add more coverage of various scenarios and expected behaviours
2015-09-15 12:24:37 +09:30
Daniel O'Connor
7256c28038
Refactor to a separate class, containing domain logic
2015-09-15 12:13:47 +09:30
Daniel O'Connor
021cb4f93b
Use #{ENV['GROWSTUFF_SITE_NAME']}
2015-09-15 11:38:20 +09:30
Daniel O'Connor
83929cc8ee
Add the ability to run feature tests via selenium if you configure it, or run specs with GROWSTUFF_CAPYBARA_DRIVER=selenium bundle exec rake spec:features/
2015-09-15 11:28:30 +09:30
Daniel O'Connor
00ca01dc33
Add coverage of the most basic scenarios around sign up and login
2015-09-15 11:20:33 +09:30
Daniel O'Connor
a49f359f9e
Fix minor typo in specs
2015-09-15 10:40:41 +09:30
Daniel O'Connor
be87d2861a
Upgrade database cleaner gem, so that https://github.com/DatabaseCleaner/database_cleaner/pull/364 is available to us.
2015-09-15 10:29:29 +09:30
Cesy
481ca79cc1
Merge pull request #825 from sksavant/pr_member_notify
...
Notify members when mentioned in a post
2015-09-11 11:26:52 +01:00
Savant Krishna
346979c640
Merge remote-tracking branch 'upstream/dev' into pr_member_notify
2015-09-09 21:30:45 -04:00
Mackenzie
ec891fc0b2
Merge pull request #821 from CloCkWeRX/fix_empty_garden
...
Fix #818 by removing the .thumbnail around the button.
2015-09-09 16:07:02 -04:00
pozorvlak
ef6dd88b1e
Merge pull request #820 from CloCkWeRX/fix_popover_better
...
Fix #819 by removing the popover behaviour for a standard avatar
2015-09-09 20:04:55 +00:00
twconquest
b2f3755196
Additional config fix to point to correct list id
2015-09-09 19:48:35 +00:00
pozorvlak
5884718fd0
Merge pull request #824 from sksavant/member_quicklink_md
...
Quick links to members in markdown
2015-09-09 17:46:24 +00:00
Savant Krishna
0c315981df
Merge remote-tracking branch 'upstream/dev' into member_quicklink_md
...
Conflicts:
lib/haml/filters/growstuff_markdown.rb
2015-09-07 20:08:57 -04:00
Savant Krishna
342323e566
Add test for trying to quicklink non-existent @ member
2015-09-07 20:05:24 -04:00
pozorvlak
d7582625c5
Merge pull request #828 from sksavant/csv_planting_fix
...
Fix bug #827 : Error in generating csv file for plantings with owner filter
2015-09-07 15:40:26 +00:00
pozorvlak
1cb4181ffc
Merge pull request #826 from sksavant/escape_crop_link
...
Fix #721 : Escape quick crop link in markdown
2015-09-07 15:39:43 +00:00
Savant Krishna
9e7a80cb86
Fix bug #827 : Error in generating csv file for plantings with owner filter
2015-09-07 04:01:20 -04:00
Savant Krishna
a8924f95a7
Escape member links for [name](member) and @name using backslash
...
Change regex to lookforward
When escaping \@name remove \
2015-09-06 05:41:35 -04:00
Savant Krishna
7afd38a1ee
Fix #721 : Escape quick crop link in markdown
...
Lookahead in markdown to verify \ is not present
Test for escaping crop link
2015-09-06 04:20:14 -04:00
Savant Krishna
1908f670d9
Tests for feature #505 : Notifying members when mentioned
2015-09-06 14:41:04 +10:00
Savant Krishna
7ef1eb5852
Create a notification to all members mentioned in a post : Feature #505
2015-09-06 14:41:04 +10:00
Savant Krishna
f36e9d726e
Change @ regex to match alphanumeric or _ and modify test string
2015-09-06 14:35:35 +10:00
Savant Krishna
0adb24fa4d
Add quick member link help to markdown help
2015-09-06 09:10:18 +10:00
Savant Krishna
aacf7b1f09
Modify regex to include @ in the group
2015-09-05 11:05:53 +10:00
Savant Krishna
b74d89c482
Tests for member quicklinks and @member links
2015-09-04 13:23:10 +10:00
Savant Krishna
3e8f017ad0
Modify markdown to render quick links to members using [name](member) or @name : Feature #504
2015-09-04 12:50:42 +10:00
Cesy
2e45857e1f
Merge pull request #823 from jestallin/658_pages_and_links
...
GS-658 - internationalize header links and some page titles
2015-09-03 10:16:07 +01:00
Jim Stallings
b8b511e747
GS-658 - use yaml anchor for duplicate values
2015-08-30 11:02:47 -04:00
Jim Stallings
85f7ca4058
GS-658 - internationalize drop down links and page titles
2015-08-29 18:39:38 -04:00
Daniel O'Connor
ff779b6679
Trial rendering as comma separated
2015-08-29 07:51:53 +09:30
Daniel O'Connor
f357916779
For more accurate specs, explicitly target the login-name container
2015-08-29 07:49:55 +09:30
pozorvlak
1c4d740217
Merge pull request #822 from cesy/phantomjs
...
Adding commentary to test for clarification of non-JS version
2015-08-28 13:17:53 +00:00
Cesy
fbb442dfee
Adding commentary to test for clarification of non-JS version
2015-08-28 13:00:38 +00:00
Daniel O'Connor
631747e919
Add a trailing sentence.
2015-08-27 15:26:40 +09:30
Daniel O'Connor
ff00b2c985
Fix #818 and layout of show garden page
2015-08-27 15:25:16 +09:30
Daniel O'Connor
a0cdf3a8b2
Fix #818 by removing the .thumbnail around the button. Also rearrange some of the headings (sizing) and controls (add new garden) to be more clearly not a tab.
2015-08-27 15:12:05 +09:30
Daniel O'Connor
c87a5f2d6b
Fix #819 by removing the popover behaviour for a standard avatar; and putting the stats onto the card.
2015-08-27 14:35:15 +09:30
Daniel O'Connor
c09b0a0341
Merge branch 'dev' into add_facebook_signup
2015-08-27 12:19:48 +09:30
Daniel O'Connor
8a739b31a1
Minor style
2015-08-27 12:18:09 +09:30
Daniel O'Connor
afec210219
#645 #556 Add facebook links
2015-08-27 12:02:48 +09:30
Daniel O'Connor
dafee90b24
#645 #556 Add facebook auth management
2015-08-27 11:56:37 +09:30
Daniel O'Connor
f6790a5f9b
#556 When an avatar is set from an oauth provider, don't encourage the user to update gravatar.
2015-08-27 11:52:49 +09:30
Daniel O'Connor
4983a6dfb3
#556 Improve user avatar sizing
2015-08-27 11:42:36 +09:30
Daniel O'Connor
c4c477fdd8
Merge branch 'add_facebook_signup' into dev
2015-08-27 11:31:07 +09:30
Daniel O'Connor
20b89f0d2f
#556 Default to the oauth provided image on account creation
2015-08-27 11:27:15 +09:30
pozorvlak
53ed4f5b24
Merge pull request #810 from cesy/phantomjs
...
Turn on Phantom JS for all tests
2015-08-26 23:14:43 +00:00
Cesy
3300c303be
Merge pull request #817 from CloCkWeRX/add_member_preferred_image
...
Add member preferred image - not accessible to users yet, prep for pulling from facebook
2015-08-26 10:30:45 +01:00
Daniel O'Connor
e84aaeb56d
#509 Refactor the rendering of image_with_popover as well (size is *never* defined, so have defaulted it explicitly to 150)
2015-08-26 10:33:12 +09:30
Daniel O'Connor
cad361ed7a
#509 Update expectations, they were slightly different to what the test tool claimed they would be.
2015-08-25 00:57:39 +09:30
Daniel O'Connor
1187719e7b
#509 Add some basic test coverage
2015-08-25 00:51:13 +09:30
Daniel O'Connor
859cf7f215
#509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic
2015-08-25 00:32:17 +09:30
Daniel O'Connor
6d97a060c3
#509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic
2015-08-25 00:32:06 +09:30
pozorvlak
fc04dde1e8
Merge pull request #814 from CloCkWeRX/fix_facebook_logo_733
...
Add correct prefix to fix facebook share icon
2015-08-24 09:47:32 +01:00
Daniel O'Connor
9564866f6d
#645 Avoid collisions by using a 20 character random string as a fallback
2015-08-24 17:33:28 +09:30
Daniel O'Connor
e3c52b1a56
#733 Render as a 'website'
2015-08-24 16:56:35 +09:30
Daniel O'Connor
3258a6754c
#733 Render only one image, and do it with a full URL
2015-08-24 16:46:42 +09:30
Daniel O'Connor
db876ff107
#733 Add the correct RDFa prefix
2015-08-24 16:38:00 +09:30
Daniel O'Connor
994296640b
#645 Implement all of finish signup, fix an edge case of an authentication without a member, fix error messages on failed oauth.
2015-08-24 16:20:39 +09:30
Daniel O'Connor
9a68c7e1c3
#645 Add a 'finish signup' flow
2015-08-24 11:41:36 +09:30
Daniel O'Connor
ec597d4e6e
#645 Fix minor logic error
2015-08-24 11:23:41 +09:30
twconquest
2882e3d1a5
Correct Gibbon list id to point to correct list
2015-08-21 19:29:03 +00:00
Daniel O'Connor
86e9cd0ec6
#645 Improve error handling and login_name generation. Annoyingly still a change of collisions.
2015-08-21 13:43:58 +09:30
Daniel O'Connor
3a05f75ab0
#645 Add notes around permissions/scopes of later interest
2015-08-21 13:43:24 +09:30
Daniel O'Connor
34b4d30014
#645 Enable account creation or authorisation from a facebook signin (and should work for others with minimal extra work)
2015-08-21 13:22:49 +09:30
Daniel O'Connor
89b6c47bfb
#645 Configure devise / omniauth in only one spot, to avoid CSRF errors
2015-08-21 12:21:55 +09:30
Daniel O'Connor
70f48108b4
#645 Add handling for facebook
2015-08-21 12:21:23 +09:30
Daniel O'Connor
df5689ec18
#645 Rename
2015-08-21 11:36:26 +09:30
Daniel O'Connor
22d72b13d5
#645 Add example keys
2015-08-21 11:36:17 +09:30
Daniel O'Connor
dee7ff34c9
#645 Indicate that a member is omniauthable, so devise knows to render sign-in-with-facebook
2015-08-21 11:36:04 +09:30
Daniel O'Connor
07eb305992
#645 Ask for name, email address only
2015-08-21 11:25:57 +09:30
Daniel O'Connor
c7f0076ee6
#645 Add facebook omniauth middleware
2015-08-21 11:21:44 +09:30
Daniel O'Connor
93bc5255e7
#645 Add facebook omniauth provider
2015-08-21 11:21:30 +09:30
Cesy
b87194336f
Wrangler has different name in tests, fixing failing test
2015-08-20 14:16:39 +00:00
Cesy
0e98f84da7
Fixing admin tests where you need to click on navmenu with JS
2015-08-20 14:06:21 +00:00
Cesy
b9ce3d4fe6
Revert "Adding ids to navbar so PhantomJS can find them"
...
Not needed - test issue was caused by wrong link text
This reverts commit d65ab59d35 .
2015-08-20 13:59:37 +00:00
Cesy
d65ab59d35
Adding ids to navbar so PhantomJS can find them
2015-08-20 13:36:13 +00:00
Cesy
65e0752376
RSS feeds don't need JS
2015-08-20 13:07:25 +00:00
Cesy
3251dd1c54
Merge branch 'js_all_the_features' of github.com:pozorvlak/growstuff into phantomjs
...
Conflicts:
spec/features/admin/forums_spec.rb
spec/features/crops/alternate_name_spec.rb
spec/features/crops/crop_detail_page_spec.rb
spec/features/member_profile_spec.rb
spec/features/rss/members_spec.rb
spec/features/scientific_name_spec.rb
spec/features/signin_spec.rb
spec/features/signup_spec.rb
2015-08-20 12:09:18 +00:00
pozorvlak
c404d8220d
Merge pull request #791 from cesy/cachethumbnails
...
Cache thumbnails
2015-08-19 15:11:16 +01:00
Cesy
48409698ab
Merge pull request #787 from twconquest/show-roles
...
Show roles in member profile page
2015-08-19 14:13:32 +01:00
pozorvlak
4d7c4f38ae
Merge pull request #804 from cesy/issue658i18n
...
Issue #658 i18n
2015-08-17 19:52:10 +01:00
twconquest
c2e4686a23
Add negative tests for roles on profiles
2015-08-17 18:29:00 +00:00
twconquest
24df32ba7f
Merge upstream/dev into show-roles and re-add myself to CONTRIBUTORS.md
...
Conflicts:
CONTRIBUTORS.md
2015-08-17 17:48:50 +00:00
Cesy
744caef4f2
Merge pull request #806 from CloCkWeRX/bump_ruby_2_1_6
...
Upgrade to ruby 2.1.6 for CVE-2015-1855
2015-08-13 09:06:48 +01:00
Daniel O'Connor
5cac8743f8
Upgrade to ruby 2.1.6 for CVE-2015-1855: Ruby OpenSSL Hostname Verification
2015-08-13 15:06:56 +10:00
pozorvlak
9c4d83dad3
Merge pull request #801 from CloCkWeRX/fix_cve_2015_2963
...
Fix CVE-2015-2963, CVE-2015-3448, CVE-2015-1820 & CVE-2015-1840
2015-08-12 17:08:27 +01:00
Cesy
fd3e69c9ab
Removing footer translation as it's now in the CMS
2015-08-12 14:57:13 +00:00
Cesy
b6dfeb980c
i18n example
2015-08-12 14:56:36 +00:00
Cesy
e8266480e5
Adding bootstrap-accessibility plugin
2015-08-12 14:17:41 +00:00
Cesy
e784ec9b33
Making it trigger the crop thumbnail cache properly
2015-08-12 11:45:18 +00:00
Cesy
1df0c36e72
Keying the cache correctly
2015-08-12 10:49:48 +00:00
Cesy
a5e7a8d315
Cache crop thumbnails
2015-08-12 10:49:48 +00:00
Daniel O'Connor
cafd49c143
Name: jquery-rails
...
Version: 3.1.2
Advisory: CVE-2015-1840
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY
Title: CSRF Vulnerability in jquery-ujs and jquery-rails
Solution: upgrade to >= 4.0.4, ~> 3.1.3
2015-08-12 16:59:14 +09:30
Daniel O'Connor
7c7c66348c
Name: rest-client
...
Version: 1.7.2
Advisory: CVE-2015-3448
Criticality: Unknown
URL: http://www.osvdb.org/show/osvdb/117461
Title: Rest-Client Gem for Ruby logs password information in plaintext
Solution: upgrade to >= 1.7.3
Name: rest-client
Version: 1.7.2
Advisory: CVE-2015-1820
Criticality: Unknown
URL: https://github.com/rest-client/rest-client/issues/369
Title: rubygem-rest-client: session fixation vulnerability via Set-Cookie headers in 30x redirection responses
Solution: upgrade to >= 1.8.0
2015-08-12 16:57:58 +09:30
Daniel O'Connor
00ae4ed49f
Name: paperclip
...
Version: 4.2.1
Advisory: CVE-2015-2963
Criticality: Medium
URL: https://robots.thoughtbot.com/paperclip-security-release
Title: Paperclip Gem for Ruby vulnerable to content type spoofing
Solution: upgrade to >= 4.2.2
2015-08-12 16:23:48 +09:30
Cesy
12a1484a26
Merge pull request #800 from CloCkWeRX/fix_all_checkbox_labels
...
Fix more checkbox labels in registration and email editing
2015-08-11 09:51:05 +01:00
Cesy
5bacdb71cc
Merge pull request #798 from CloCkWeRX/cve-2015-3226
...
Minor rails version upgrade to apply security fixes
2015-08-11 08:23:58 +01:00
Cesy
6565e79057
Merge pull request #797 from CloCkWeRX/minor_usability_checkbox_login
...
Style checkbox for 'remember me'
2015-08-11 08:21:39 +01:00
Cesy
f4e53a58de
Merge pull request #799 from CloCkWeRX/patch-1
...
Update CONTRIBUTORS.md
2015-08-11 08:17:38 +01:00
Daniel O'Connor
97cf1347d5
Fix clickable area for checkboxes in email editing
2015-08-11 13:45:47 +09:30
Daniel O'Connor
367e298d48
Fix clickable area for checkboxes in registration
2015-08-11 13:44:17 +09:30
Daniel O'Connor
e765387e22
Update CONTRIBUTORS.md
2015-08-11 10:31:43 +09:30
Daniel O'Connor
7b30c4237b
Name: activesupport
...
Version: 4.1.9
Advisory: CVE-2015-3227
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/bahr2JLnxvk
Title: Possible Denial of Service attack in Active Support
Solution: upgrade to >= 4.2.2, ~> 4.1.11, ~> 3.2.22
Name: activesupport
Version: 4.1.9
Advisory: CVE-2015-3226
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/ruby-security-ann/7VlB_pck3hU
Title: XSS Vulnerability in ActiveSupport::JSON.encode
Solution: upgrade to >= 4.2.2, ~> 4.1.11
2015-08-11 10:28:07 +09:30
Daniel O'Connor
b788cb44ef
Remember that we're working in haml, not slim.
2015-08-11 10:23:50 +09:30
Daniel O'Connor
f61e2438e8
Style checkbox for 'remember me' and allow it to be clickable (minor usability/mobile UI annoyance)
2015-08-10 16:08:09 +09:30
pozorvlak
e503b1079d
Merge pull request #796 from cesy/issue677
...
Fix #677 by adding organic/GMO/heirloom to CSV and RSS
2015-08-06 14:54:10 +01:00
pozorvlak
ccca343959
Merge pull request #795 from cesy/issue788
...
Fix issue #788 with uncaught nil
2015-08-06 14:46:53 +01:00
pozorvlak
63de10efd4
Merge pull request #794 from Growstuff/revert-793-revert-790-homepagetests
...
Fixing #790 properly - caching posts on homepage
2015-08-06 14:30:04 +01:00
Cesy
17c5fd61a3
Fix #677 by adding organic/GMO/heirloom to CSV and RSS
2015-08-06 12:23:00 +00:00
Cesy
44b8500fa8
Fix issue #788 with uncaught nil
2015-08-06 12:12:29 +00:00
Cesy
5a12b47c7c
Revert "Revert "Fixing relative caching of post summary on homepage, fixed #789 ""
2015-08-06 12:37:59 +01:00
Cesy
3db13785a1
Merge pull request #792 from cesy/removing775
...
Revert "Merge pull request #775 from pozorvlak/speed_up_homepage"
2015-08-06 12:37:35 +01:00
Cesy
69d94f7deb
Merge pull request #793 from Growstuff/revert-790-homepagetests
...
Revert "Fixing relative caching of post summary on homepage, fixed #789 " that wasn't ready to merge yet
2015-08-06 12:36:54 +01:00
Cesy
1ec188c793
Revert "Fixing relative caching of post summary on homepage, fixed #789 "
2015-08-06 12:36:21 +01:00
Cesy
438b2444df
Merge pull request #790 from cesy/homepagetests
...
Fixing relative caching of post summary on homepage, fixed #789
2015-08-06 12:34:15 +01:00
Cesy
de981689fc
Revert "Merge pull request #775 from pozorvlak/speed_up_homepage"
...
This reverts commit fa50ff47bb , reversing
changes made to 5b19d236d0 .
Once fixed, please read https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html carefully to get it back in properly.
2015-08-06 10:56:46 +00:00
Cesy
0681fac406
Correcting view test for posts
2015-08-06 09:51:14 +00:00
Cesy
9682300b85
Merge pull request #785 from sha1sum/notification_pagination
...
Resolved #562 - Pagination of notifications.
2015-08-06 10:40:02 +01:00
Cesy
6f95f1fecf
Clarifying comment
2015-08-06 09:20:06 +00:00
Cesy
43fe29f113
Fixing relative caching of post summary on homepage, fixed #789
2015-08-06 09:18:32 +00:00
Cesy
fa50ff47bb
Merge pull request #775 from pozorvlak/speed_up_homepage
...
Speed up homepage by calculating "interesting" things more efficiently
2015-08-05 19:18:56 +01:00
Cesy
5b19d236d0
Merge pull request #783 from pozorvlak/remove_last_count_calls
...
Replace the last few .count and .length calls with .size where possible
2015-08-05 18:57:04 +01:00
Cesy
cad2c90a4f
Merge pull request #784 from pozorvlak/fail_noisily_if_no_secret
...
Check existence of secret token before using it.
2015-08-05 16:03:31 +01:00
Anthony Atkinson
919c25ca67
Fixing notifications index view spec to be compatible with new Kaminari pagination.
2015-08-01 11:58:13 -04:00
Anthony Atkinson
29f3cc3238
Updating new test additions and edits to features/harvests with Rspec3 Ruby2 syntax.
2015-08-01 11:39:51 -04:00
Anthony Atkinson
bc9a025788
Merge branch 'dev' into notification_pagination
2015-08-01 11:38:01 -04:00
Anthony Atkinson
a593aa2a4b
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-01 11:37:01 -04:00
pozorvlak
de63fdc952
Merge pull request #786 from sha1sum/open_service_in_footer
...
Resolves #617 - Open Service graphic link in footer
2015-07-28 22:00:19 +01:00
twconquest
e7d2ae2c40
Add myself to CONTRIBUTORS.md
2015-07-28 19:50:35 +00:00
twconquest
1019834c41
Merge branch 'dev' into show-roles
...
Conflicts:
spec/features/member_profile_spec.rb
2015-07-28 19:42:55 +00:00
twconquest
362f7a78b1
Add feature test for showing roles
2015-07-28 19:33:05 +00:00
Anthony Atkinson
a2eb568eac
Merge remote-tracking branch 'upstream/master' into dev
2015-07-25 14:09:06 -04:00
Anthony Atkinson
9d62c012f1
Resolves #617 - Open Service graphic link in footer
2015-07-25 13:34:16 -04:00
Anthony Atkinson
cbb50df8d0
Resolved #562 - Pagination of notifications.
2015-07-25 13:18:30 -04:00
Miles Gould
91a128ae7e
Check existence of secret token before using it.
...
People were forgetting to create config/environment.yml, which meant
that RAILS_SECRET_TOKEN wasn't being set, which meant that all tests
involving notifications failed. Unfortunately, the resulting wall of
error messages (https://gist.github.com/sha1sum/5debae6b700ff8fc0c76 )
did not make the root cause remotely clear, leading to much confusion
and head-scratching all round.
This commit checks for the existence of RAILS_SECRET_TOKEN and fails
with an informative error message if it's missing.
2015-07-24 15:16:31 +01:00
Miles Gould
d9dd797c33
Merge branch 'pr/782' into dev
2015-07-24 11:09:35 +01:00
Miles Gould
f970fc4db2
Fix another whitespace problem.
2015-07-24 11:09:22 +01:00
Miles Gould
8873986562
Merge branch 'pr/779' into dev
2015-07-24 11:05:21 +01:00
Miles Gould
40b5a47aae
Remove trailing whitespace
2015-07-23 23:22:45 +01:00
Miles Gould
f29c0ad085
Replace .length calls with .size
2015-07-23 23:21:55 +01:00
Miles Gould
96b0198d41
Replace remaining calls to count() with size()
...
The couple that aren't removed are required: for instance, there's a
Crop.count method, but no Crop.size method.
2015-07-23 23:05:39 +01:00
Miles Gould
48649d1986
Clarify comment on an order-dependent feature test
2015-07-23 22:00:06 +01:00
Miles Gould
9e2e93b544
Remove the last few .shoulds from spec/features
2015-07-23 21:57:22 +01:00
Miles Gould
1f0f55dc81
Merge branch 'pr/781' into dev
2015-07-23 19:55:57 +01:00
Mackenzie Morgan
e3738ca0c6
whitespace tab/space correction
2015-07-23 13:56:23 -04:00
Mackenzie Morgan
b0d4f9c731
switch homepage and members/ page member thumbnails to be a flexbox layout so it's more responsive. Fixes #780
2015-07-23 13:56:07 -04:00
Mackenzie
83b54365ba
Merge pull request #768 from GabrielSandoval/gab/harvests
...
Created card based template for harvests, seeds, gardens, etc. Fixes #518 , Fixes #517 , and Fixes #570
2015-07-23 13:40:30 -04:00
Anthony Atkinson
5a33b2b754
Creating a directory for gardens under spec/features (to stay consistent with other features) and moving the creation specs from spec/gardens_spec.rb to spec/gardens/adding_gardens_spec.rb.
...
Also added the required and optional field tests for Garden form.
2015-07-23 11:42:04 -04:00
Anthony Atkinson
69cb87fd0f
Test that required and optional fields are displaying properly on Seed form.
2015-07-23 11:36:54 -04:00
Anthony Atkinson
bc058b9152
Missed a few optional field placeholders on Seed form.
2015-07-23 11:36:40 -04:00
Anthony Atkinson
efd6328436
Test for required and optional field display on Harvest form.
2015-07-23 11:32:06 -04:00
Anthony Atkinson
19adabc55f
Test for required and optional field display on Planting form.
2015-07-23 11:27:17 -04:00
Anthony Atkinson
ccde5b230b
Comments for reasoning behind adding bangs to let statements.
2015-07-23 10:12:03 -04:00
Anthony Atkinson
33f28d1727
Two tests required bangs on let statements in order to pass after refactoring.
2015-07-23 10:07:10 -04:00
AELOGICA
aa3cf729c8
Added feature tests for on gardens, seeds and harvests for the card based thumbnails
2015-07-23 15:44:27 +08:00
AELOGICA
611adc0728
Fixed test errors for seeds and garden thumbnails.
2015-07-23 15:44:26 +08:00
AELOGICA
a97acfb1ca
Fixed display of edit glyphicon based on edit priviledge.
2015-07-23 15:44:26 +08:00
AELOGICA
7e03ef1687
Fixed display of plantings on gardens thumbnail.
2015-07-23 15:44:26 +08:00
AELOGICA
c12791e428
Created card-based thumbnails for Seeds and Gardens page.
2015-07-23 15:44:25 +08:00
AELOGICA
bbe7d967b4
Changed px to em and used truncate instead of srolling for long harvest descriptions.
2015-07-23 15:44:25 +08:00
AELOGICA
f5336bd8f8
Created card based template for harvests.
2015-07-23 15:44:25 +08:00
Anthony Atkinson
5a35a3da01
Initial rendition of feature test upgrade to Ruby 2.x and Rspec 3.x syntax.
2015-07-22 19:48:41 -04:00
Anthony Atkinson
fad9eddbc4
Addition of guard gem to assist in quicker testing.
2015-07-22 16:00:45 -04:00
Anthony Atkinson
044f62eae2
Rubymine .gitignore additions.
2015-07-22 15:54:09 -04:00
Anthony Atkinson
4786e3e087
Marking required and optional fields on Garden form.
2015-07-22 11:07:32 -04:00
Anthony Atkinson
715a004b13
Marking required and optional fields on Seed form. Purposefully marked required those select fields which have no blank option.
2015-07-22 11:05:21 -04:00
Anthony Atkinson
96a007ef3b
Marking required and optional fields on Harvest form.
2015-07-22 11:02:46 -04:00
Anthony Atkinson
a03d044049
Make a reusable helper for the "* denotes a required field" help text and change the Planting form to use the helper.
2015-07-22 10:59:47 -04:00
Anthony Atkinson
9a6c32fe6d
Planting form with required fields marked and optional fields with "optional" placeholders or select options.
2015-07-22 10:52:08 -04:00
Anthony Atkinson
fc33269f47
Reusable class for adding a 1em bottom margin to a block and .red class for red foreground color.
2015-07-22 10:51:37 -04:00
Anthony Atkinson
a80001ffe7
Schema update after migration.
2015-07-22 10:39:02 -04:00
Anthony Atkinson
30032f5527
Add a red asterisk via CSS after all .form-group labels with the .required class.
2015-07-22 10:38:41 -04:00
Anthony Atkinson
fa8b10af58
New contributor!
2015-07-22 10:37:54 -04:00
Anthony Atkinson
9c469fb217
.gitignore additions for users of Rubymine.
2015-07-22 10:05:04 -04:00
pozorvlak
6b944e145e
Merge pull request #778 from GabrielSandoval/gab/names
...
Added multiple forms for scientific and alternate names on crop creation (Fixes #615 )
2015-07-17 20:25:04 +01:00
AELOGICA
7748c40ccf
Added jacarandang to contributors
2015-07-17 09:16:31 +08:00
Jace Monje
745281545a
added test for role checking on view
2015-07-17 09:06:18 +08:00
AELOGICA
7b3aefacd3
Hidden the +/- buttons by dby default, making them visible via JavaScript code.
2015-07-17 07:55:03 +08:00
AELOGICA
134465d023
Fixed feature errors and removed failing deprecated tests
2015-07-17 07:31:53 +08:00
AELOGICA
a581b759a3
Added tests for creating crops with multiple scientific and alternate names
2015-07-17 07:31:53 +08:00
AELOGICA
734b57e395
Fixed feature test errors
2015-07-17 07:31:53 +08:00
AELOGICA
12d151b68c
Added multiple forms for scientific and alternate names on crop creation
2015-07-17 07:31:51 +08:00
AELOGICA
472acd0e81
Polished UI of added forms for alternate names
2015-07-17 07:31:51 +08:00
AELOGICA
7f88b167b4
Added dynamic adding and removing additional scientific names
2015-07-17 07:31:51 +08:00
Miles Gould
897eac4fae
Merge branch 'pr/727' into dev
2015-07-17 00:31:00 +01:00
Miles Gould
41ab646b20
Added @manmeetsingh to CONTRIBUTORS.md
2015-07-16 23:58:57 +01:00
pozorvlak
8c017b24e0
Merge pull request #774 from jacarandang/signout
...
[#568 ] Signout redirects to last page visited
2015-07-16 23:22:03 +01:00
pozorvlak
12e3351c77
Merge pull request #777 from GabrielSandoval/gab/member_links
...
Added link to owner's profile from seeds', plantings', and harvests' index page (Fixes #569 )
2015-07-16 23:14:44 +01:00
AELOGICA
85e4708b71
Changed plantings_by_owner_path to seeds_by_owner_path on misc_seeds_spec.rb
2015-07-16 08:06:01 +08:00
AELOGICA
0816b6b114
Added link to owner's profile from seeds', plantings', and harvests' index
2015-07-13 10:42:06 +08:00
Jym Paul A. Carandang
91b5c3e798
Added test for signount redirection
2015-07-13 09:52:05 +08:00
Miles Gould
fc1dc0e4c3
Remove unused Planting#interesting? method.
2015-07-11 14:32:27 +01:00
Miles Gould
9e7957709d
Remove BUNDLED BY line from Gemfile.lock
...
This keeps getting removed by some automatic process, and it's
cluttering up my `git diff` output.
2015-07-11 14:32:27 +01:00
Miles Gould
492bdd915f
Move the rest of Planting.interesting into the DB
...
We could maybe make it a scope at this point...
2015-07-11 14:32:27 +01:00
Miles Gould
07c976b1fc
Filter plantings-with-photos in the DB, not Ruby.
2015-07-11 14:32:27 +01:00
Miles Gould
2faada7f14
Find interesting crops using DB queries
2015-07-11 14:32:27 +01:00
pozorvlak
133a67a8f2
Merge pull request #764 from GabrielSandoval/gab/places
...
Fixes #720 - Places show nearby seeds, members, and plantings.
2015-07-10 16:26:25 +01:00
pozorvlak
16dd1e5183
Merge pull request #772 from GabrielSandoval/gab/planting_icons
...
Added sunniness icons on plantings/_thumbnail and show page
2015-07-10 13:04:23 +01:00
AELOGICA
4193e38034
Fixed feature test errors on garden/show page.
2015-07-10 15:43:08 +08:00
AELOGICA
9eaaa8856f
Added row divs for members/_gardens, gardens/show, planting/index page.
2015-07-10 15:27:34 +08:00
AELOGICA
3ea9f2b5f2
Applied the responsive planting thumbnail to plantings/index page.
2015-07-10 15:18:39 +08:00
AELOGICA
723329ac49
Made the plantings/_thumbnail partial flexible for small and large screen sizes.
2015-07-10 15:11:15 +08:00
AELOGICA
89424b931b
Replaced 'sunniness_not specified.png' icon with a darker one.
2015-07-10 13:17:43 +08:00
Jym Paul A. Carandang
9f3d3b2b8f
Signout redirects to last page visited
2015-07-10 12:51:36 +08:00
AELOGICA
80c1e1bf23
Removed the column headers of planting thumbnails.
2015-07-10 11:25:05 +08:00
AELOGICA
01e676678c
Removed the '#' column on plantings/_thumbnail partial.
2015-07-10 11:25:05 +08:00
AELOGICA
43d7c36fc5
Created feature tests for showing nearby plantings, seeds, and members on search
2015-07-10 11:25:05 +08:00
AELOGICA
6a6f83c6a4
Added feature request #720
2015-07-10 11:25:05 +08:00
gabrielsandoval
f73bb81eb6
Made sunniness icons transparent
2015-07-10 11:17:11 +08:00
AELOGICA
0407df880b
Added feature tests for sunniness icons for plantings page.
2015-07-10 11:17:11 +08:00
AELOGICA
20219e23dc
Added sunniness icons on plantings/_thumbnail and show page
2015-07-10 11:17:11 +08:00
pozorvlak
49bbbeb431
Merge pull request #769 from jacemonje/new-navbar
...
Redesigned the navbar
2015-07-10 00:24:57 +01:00
pozorvlak
82bc07ccd0
Merge pull request #762 from CjayBillones/refactor-spec-models
...
Refactor spec/models
2015-07-10 00:24:00 +01:00
Cesy
212651a279
Merge pull request #730 from korabh/dev
...
Add background to thumbnails
2015-07-09 14:24:41 +01:00
Korab Hoxha
1568f4b7d8
Update _avatar.html.haml
2015-07-09 12:14:37 +02:00
Cesy
b7706d0064
Merge pull request #771 from pozorvlak/remove_release_8_tasks
...
Remove one-off tasks that were run for Release 8.
2015-07-09 10:23:25 +01:00
Cesy
3a232e1d08
Merge pull request #708 from oshiho3/629-thumbnails-of-crops-on-post
...
#629 Thumbnails of crops on post
2015-07-09 10:20:58 +01:00
Korab Hoxha
a27d273978
Remove 'img-rounded'
2015-07-09 02:27:07 +02:00
Korab Hoxha
4e7b0cf698
Remove img-rounded
2015-07-09 02:26:48 +02:00
Miles Gould
28ac7ff886
Remove one-off tasks that were run for Release 8.
...
The ElasticSearch index task was run, but failed because we didn't have
an ElasticSearch instance to run it against.
2015-07-09 01:06:39 +01:00
Jace Monje
fa0cb55789
fixed errors in tests
2015-07-09 08:01:58 +08:00
pozorvlak
42ffc49d74
Merge pull request #770 from pozorvlak/secret_token_for_staging
...
Set staging secret key from environment
2015-07-09 00:54:56 +01:00
Miles Gould
d4d210447a
Set staging secret key from environment
2015-07-09 00:47:11 +01:00
Jace Monje
7232f4614c
refactored tests
...
fixed tests
2015-07-09 07:37:29 +08:00
Jace Monje
b9a29115a2
new navbar
2015-07-09 07:14:49 +08:00
Cjay
23dbfea05a
Fix spec/models/ability_spec.rb
...
- Changed notification into a variable scope
- Removed let(:cw_ability) and let(:admin_ability) and just used ability
2015-07-09 07:06:21 +08:00
Miles Gould
3259291eea
Merge remote-tracking branch 'upstream/pr/698' into dev
2015-07-08 23:20:16 +01:00
pozorvlak
0d0042dba8
Merge pull request #761 from CjayBillones/refactor-spec-support
...
Refactor spec/support
2015-07-08 22:07:25 +01:00
pozorvlak
edcbc939e3
Merge pull request #728 from oshiho3/575-one-click-email-unsubscribe
...
#575 One click email unsubscribe
2015-07-08 22:06:29 +01:00
Cjay
c568498941
Refactor spec/models
...
- Changed before(:each) into let
- Changed :admin_ability and :cw_ability into :ability
2015-07-09 02:21:10 +08:00
Cjay
c6c8492528
Fix changes in spec/support
2015-07-09 01:59:34 +08:00
Cesy
3420f18fb9
Merge pull request #703 from soborok/issue-610
...
resolved issue #610 to show only current plantings
2015-07-08 17:54:30 +01:00
Mackenzie
377a54e692
Merge pull request #765 from GabrielSandoval/gab/seeds
...
Added feature and test for request displaying available seed count on crop page. Fixes #549
2015-07-08 11:23:01 -04:00
Jace Monje
8c1d88b663
added the admin/wrangler role check on member profile page
2015-07-08 12:07:37 +08:00
AELOGICA
c746c6d6d7
Added feature and test for request #549
2015-07-08 08:35:45 +08:00
AELOGICA
7607daa83a
Added feature and test for request #549
2015-07-08 08:16:32 +08:00
Miles Gould
f11c1b3d54
Merge branch 'pr/759' into dev
2015-07-08 00:32:02 +01:00
pozorvlak
fc44e87fb9
Merge pull request #763 from CjayBillones/refactor-spec-helpers
...
Refactor spec/helpers
2015-07-07 11:56:52 +01:00
pozorvlak
ccc63381a6
Merge pull request #753 from CjayBillones/dev
...
Show edited date/time on posts/comments and Show last login date on member profile
2015-07-07 11:30:08 +01:00
Mackenzie
9b64f5fec1
Merge pull request #758 from GabrielSandoval/gab/days_before_maturity
...
Gab/days before maturity (#678 ) Thank you! That haml looks much better.
2015-07-06 22:31:45 -04:00
AELOGICA
e138b3e8ab
Converted html tables to CSS classes
2015-07-07 10:08:50 +08:00
AELOGICA
92db75b3d8
Converted the ul's in the plantings thumbnail partial to definition lists
2015-07-07 08:34:03 +08:00
AELOGICA
755a60447f
Made the plantings/_thumbnail partial to contain only a single object.
2015-07-07 08:20:43 +08:00
Gabriel
b599818512
Delete _thumbnail.html.haml_spec.rb
2015-07-07 08:20:43 +08:00
AELOGICA
0a2d0d499c
Removed unneeded methods on the plantings helper
2015-07-07 08:20:43 +08:00
AELOGICA
e638acd2de
Refactored further on plantings/show page
2015-07-07 08:20:43 +08:00
AELOGICA
8d5367be9a
Refactored code and replaced the plantings/tumbnail view.
2015-07-07 08:20:43 +08:00
AELOGICA
516274b2b7
Added feature more feature tests on plantings creation for progress bars' status
2015-07-07 08:20:43 +08:00
AELOGICA
f13a66391c
Fixed errors where progress bars does not show 100% when a planting is marked as finished.
2015-07-07 08:20:43 +08:00
AELOGICA
b01385a1e4
Added some tests on the days before maturity feature
2015-07-07 08:20:43 +08:00
AELOGICA
4ca4d6b030
Fixed error where progress bars do not change upon update
2015-07-07 08:20:43 +08:00
AELOGICA
3181c97a2a
Added the mark as finished button on the index page.
2015-07-07 08:20:42 +08:00
AELOGICA
372a7f080d
Added the days before maturity feature #678
2015-07-07 08:20:42 +08:00
Cjay Billones
29a8628c42
Refactor spec/helpers
...
Change before(:each) into let in spec/helpers
2015-07-07 07:38:06 +08:00
pozorvlak
6d81ef198c
Merge pull request #760 from CjayBillones/refactor-rspec
...
Refactor spec tests
2015-07-06 22:22:17 +01:00
Cjay Billones
e94cbcef02
Refactor spec
...
Refactor spec by changing before(:each) into let
2015-07-06 10:56:31 +08:00
Katy Ereira
9304e44c08
Add Maccath tnd CjayBillones to contributors list
2015-07-03 08:45:16 +08:00
Maccath
3a9077050e
Add placeholder to harvest screen's plant part select box.
2015-07-03 08:30:04 +08:00
Cjay
64cf71ab4f
Fix test for comments
2015-07-02 19:01:32 +08:00
Cjay
3fb9283ca7
Add tests for posts
2015-07-02 18:54:17 +08:00
Cjay
a73d492062
Add tests for comment
2015-07-02 18:53:54 +08:00
Cjay
2528d8af8a
Show edited date/time on posts/comments
2015-07-02 18:53:18 +08:00
Cjay
10cb6c18aa
Show last login date on member profile
2015-07-02 18:52:11 +08:00
Cjay
34e61082b9
Add config/application.yml in gitignore
...
Included config/application.yml in gitignore since it contains personal configuration of developer.
2015-07-02 18:51:05 +08:00
Cjay
b868364e96
Fix merge conflict in contributors
2015-07-02 18:50:30 +08:00
pozorvlak
45c0adb044
Merge pull request #757 from CjayBillones/code-refactoring
...
[Refactoring] Replace .count and .length with .size for collections
2015-07-02 11:12:44 +01:00
Cjay Billones
6c72345d26
Fix test
2015-07-02 11:57:45 +08:00
pozorvlak
4648464fb5
Merge pull request #751 from GabrielSandoval/search_form
...
Added search form on the places index page.
2015-07-01 17:43:36 +01:00
AELOGICA
429e54733d
Moved the geocoder stub to ./cofig/environments/test.rb
2015-07-01 10:57:28 +08:00
pozorvlak
daa8717807
Merge pull request #744 from andrba/currency_spec_refactoring
...
#558 Currency refactoring in specs.
2015-06-26 13:18:26 +01:00
Andrey
44b260b1e8
Currency refactoring in specs.
2015-06-26 15:54:37 +10:00
AELOGICA
9bd7448ae6
Added the feature test for searching places
2015-06-26 09:17:08 +08:00
Cjay Billones
bb88041fef
[Refactoring] Replace .count and .length with .size for collections
...
Improved program efficiency (in querying in particular) by replacing .count and .length with .size for collections.
Fix error in refactoring
Reverted some .size into .count
2015-06-25 12:09:03 +08:00
AELOGICA
87f1c6c26d
Added an alert for empty string search.
2015-06-23 14:33:13 +08:00
gabrielsandoval
0e2a5fd205
Added search form on the places index page.
2015-06-21 15:24:07 +08:00
Miles Gould
5bb04dc1a4
Merge branch 'pr/745' into dev
2015-06-16 19:54:33 +01:00
Mackenzie
7cedd98b71
Merge pull request #746 from achalc/fix-fb-thumbnail
...
added growstuff-apple-touch-icon-precomposed.png to meta partial
2015-06-13 00:22:45 -04:00
Mackenzie
2209d65aa6
Merge pull request #748 from wingyu/dev
...
Issue #713 : Added flash message when photos deleted
2015-06-12 23:50:11 -04:00
Mackenzie
ba906868d8
Merge pull request #747 from mauricio-gonzalez/add_autofocus_post_field
...
[#478 ] autofocus subject input
2015-06-12 23:38:41 -04:00
Andrey
4cb3444dcd
Adding myself to contributors
2015-06-09 17:47:21 +10:00
Vincent Wong
60df62f3fa
added flash message when deleting messages
2015-06-06 14:36:03 +10:00
Mauricio
e3a620a109
[ #478 ] autofocus subject input
2015-06-02 23:21:18 -06:00
Achal Channarasappa
3476d58642
added growstuff-apple-touch-icon-precomposed.png to meta partial
2015-06-02 20:52:03 -05:00
pozorvlak
a7feac3740
Merge pull request #742 from maco/dev
...
Moving myself to the committers section
2015-06-01 15:55:03 +01:00
Andrey
ad5730a81c
Removed excessive example from notification controller specs
2015-05-27 12:08:30 +10:00
Andrey
e35ebab380
Reply to notification action
2015-05-27 11:56:24 +10:00
Shiho Takagi
3b42806b77
Modified wordings
2015-05-22 13:46:19 +10:00
Mackenzie Morgan
c5fbda0223
cleaning up inadvertent schema change
2015-05-20 17:10:22 -04:00
Mackenzie Morgan
38dbdc8307
Moving myself (maco) to the committer section, since I was given commit bit a couple months back
2015-05-20 17:08:21 -04:00
Skud
f830ed1cf2
Merge pull request #706 from tygriffin/deprecated-test-warning
...
add deprecation notice to all controller and view specs
2015-05-20 10:17:15 +10:00
Skud
66402e5471
Merge pull request #731 from oshiho3/578-database-seeding-improvement
...
#578 More extensive database seeding - bulk creating members, gardens and plantings
2015-05-20 10:10:48 +10:00
Skud
8410b6db1e
Merge pull request #700 from sksavant/photo_linkback
...
Linkbacks in photo view page to harvest and gardens
2015-05-20 10:08:33 +10:00
Skud
aef4800ad3
Merge pull request #737 from soborok/issue-610-solved
...
resolved issue-610 to display only active planting
2015-05-20 10:08:11 +10:00
Skud
a3b9c50fea
Merge pull request #723 from cesy/moretests
...
More tests
2015-05-20 10:06:18 +10:00
Skud
add275e772
Merge pull request #710 from cesy/secrets
...
Switching to new secrets format
2015-05-20 10:05:46 +10:00
Skud
9a2818baa9
Merge pull request #729 from oshiho3/621-crop-varieties-sidebar
...
#621 Crop varieties sidebar
2015-05-20 10:05:04 +10:00
Skud
c47a1bc361
Merge pull request #740 from yez/feature/robots-dissalow-on-staging
...
Feature/robots dissalow on staging
2015-05-20 09:57:28 +10:00
Skud
e04f78d42d
Merge pull request #741 from pozorvlak/upgrade_poltergeist
...
Upgrade poltergeist to v1.6.
2015-05-20 09:56:24 +10:00
Miles Gould
8ce7c25374
Upgrade poltergeist to v1.6.
...
Poltergeist v1.5.1 is nearly a year old, and relies on PhantomJS 1.8,
which is 2.5 years old and increasingly hard to find in OS package
managers.
2015-05-06 12:15:22 +01:00
Jake Yesbeck
c1ab161b89
Added self to Contributors.md per guidelines
2015-05-05 09:18:32 -07:00
Jake Yesbeck
0d55b54371
Use a constant for the default robots.txt filename
2015-05-05 09:05:00 -07:00
Jake Yesbeck
46ac06698a
Additional test for nonsense subdomain
2015-05-05 09:02:42 -07:00
Jake Yesbeck
81ce6ed8a3
Make sure file exists before attempting to render it
2015-05-05 08:58:33 -07:00
Jake Yesbeck
0f8d1e7db1
Change the render to render the file directly
...
Also assert that the response is the actual file contents
instead of mocking the method call
2015-05-04 23:37:40 -07:00
Jake Yesbeck
507e5a0ebc
Robots controller and custom robots.txt files
...
New route to /robots.txt and some specific logic to switch
on if the subdomain is staging or not.
Staging will not allow any crawlers at all, production does not
have any current limitations
2015-05-04 23:11:41 -07:00
soborok
76608a981c
resolved issue-610 to display only active planting
2015-04-07 13:10:33 -05:00
Gabrielle DeWitt
81d2f9829e
Updated Contributors
2015-04-04 12:01:51 -07:00
Gabrielle DeWitt
b7d7f6896e
Updated Helper Spec to Match Coding Standards
...
Replaced before and should with let and
expect, respectively.
Issue #633
2015-04-04 12:01:43 -07:00
Gabrielle DeWitt
88e8e3a59e
Added Helper for See Who's Planted Link Text
...
Quantity and planted_from are not required
to add a planting. This change handles
the cases where one or both attributes are
missing.
Fixes #633
2015-04-04 11:51:59 -07:00
Shiho Takagi
d95bd0e063
Skip all user confirmation
2015-04-04 23:22:21 +11:00
Shiho Takagi
0c80a00f31
Pupulate sunniness and planted_from field on planting.
2015-04-04 22:56:35 +11:00
Shiho Takagi
1fe9a7d5e0
Merge branch 'dev' of https://github.com/Growstuff/growstuff into 578-database-seeding-improvement
2015-04-04 09:12:20 +11:00
Korab Hoxha
bfb4053bb4
Change to "img-rounded"
2015-03-25 16:05:30 +01:00
Korab Hoxha
2aad8a0ed0
Change to "img-rounded"
2015-03-25 16:05:07 +01:00
Korab Hoxha
7c1cce40b2
Update leaflet_overrides.css.less
2015-03-25 15:50:43 +01:00
Shiho Takagi
c253c86787
minor improvements
2015-03-17 11:40:32 +11:00
Shiho Takagi
59d823ff8b
bulk creating members, gardens and plantings
2015-03-17 02:07:43 +11:00
Korab Hoxha
c8903ba25f
"img-circle" for users
2015-03-15 02:43:43 +01:00
Korab Hoxha
3a5cf37dc0
"img-circle" class for members gravatar
2015-03-13 12:58:06 +01:00
Korab Hoxha
8631b1fc99
Add background to thumbnail
2015-03-13 11:33:20 +01:00
Shiho Takagi
0c6b6e0e0e
added show all/less toggle button
2015-03-12 13:49:37 +11:00
Shiho Takagi
9f33f497bc
improved coding
2015-03-11 13:06:23 +11:00
Shiho Takagi
ad6c1ba2dc
tiding up the code
2015-03-08 15:10:30 +11:00
Shiho Takagi
674d78721d
Merge branch '575-one-click-email-unsubscribe' of https://github.com/oshiho3/growstuff into 575-one-click-email-unsubscribe
2015-03-08 14:29:56 +11:00
Shiho Takagi
3a1bd78252
Merge branch '575-one-click-email-unsubscribe' of https://github.com/oshiho3/growstuff into 575-one-click-email-unsubscribe
2015-03-08 14:29:28 +11:00
Manmeet Singh
b9b2f4a57e
Placing cursor in textarea on page load of write post and write comment views
2015-03-07 16:36:15 +05:30
Marlena Compton
71c0bff3e0
add comments explaining each file per pull request
2015-03-06 07:03:06 -08:00
Shiho Takagi
e4e9b63e4d
Merge branch '575-one-click-email-unsubscribe' of https://github.com/oshiho3/growstuff into 575-one-click-email-unsubscribe
2015-03-06 11:13:49 +11:00
Shiho Takagi
40adc379ae
Merge branch 'dev' of https://github.com/Growstuff/growstuff into 575-one-click-email-unsubscribe
2015-03-06 10:51:09 +11:00
Mackenzie Morgan
2d73dd2869
remove pending/rejected crops from browse and test that, change links on wrangling page to go directly to crop edit and update tests for that
2015-03-04 13:13:35 +11:00
Shiho Takagi
2abe6d7d12
show thumbnail even when there is no photo
2015-03-04 12:53:08 +11:00
Marlena Compton
c7a71381b7
write test for tooltips
2015-03-03 06:49:16 -08:00
Marlena Compton
5a1fd19abc
move bar color into the data
2015-03-03 05:49:13 -08:00
Marlena Compton
a48a6da494
refactored graph scale into width scale and height scale
2015-02-28 15:50:27 -08:00
Cesy Avon
8990e803a0
Increasing coverage of plantings controller
2015-02-26 17:28:26 +00:00
Marlena Compton
b0a803a7a5
add h2 for sunniness chart and crop map
2015-02-26 06:41:24 -08:00
Marlena Compton
6e4bb58dfd
change color when hovering over a bar
2015-02-26 06:26:38 -08:00
Marlena Compton
66b0f139a9
add tooltip to show data values
2015-02-26 06:07:23 -08:00
Shiho Takagi
375f647e2d
Merge branch 'dev' of https://github.com/Growstuff/growstuff into 575-one-click-email-unsubscribe
2015-02-25 16:50:30 +11:00
Shiho Takagi
0f52ea5aad
one click unsubscription
2015-02-25 10:26:04 +11:00
Cesy Avon
2740b5e47b
Correcting the environment variable name for secret token so Heroku is not impacted
2015-02-23 13:37:43 +00:00
Shiho Takagi
3894127f5c
Merge branch 'dev' of https://github.com/Growstuff/growstuff into 629-thumbnails-of-crops-on-post
2015-02-23 21:44:01 +11:00
Shiho Takagi
17ccea4b28
moving photo on posts/show view
2015-02-23 21:43:03 +11:00
Savant Krishna
da95581099
:using size instead of count
2015-02-17 21:35:57 +05:30
Miles Gould
9e146cde18
Merge branch 'dev' into js_all_the_features
2015-02-16 14:42:30 +00:00
Cesy Avon
9b195d1d2e
Fixing line break
2015-02-16 13:42:57 +00:00
Cesy Avon
eb76db93e4
Switching to new secrets format as per http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#config-secrets-yml
2015-02-16 13:34:37 +00:00
Cesy Avon
6f80102f79
Adding autoloaded crop factory for later testing
2015-02-16 12:27:18 +00:00
Shiho Takagi
90ca5ec13b
added thumbnails of crops mentioned on post page
2015-02-13 23:39:31 +11:00
Taylor Griffin
95974ab21b
add deprecation not to all controller and view specs
2015-02-12 19:52:53 +11:00
Nell Taylor & Heejin Park
7a064c0667
Added 'current' scope to show only current plantings on gardens/index view and added accompanying view test
2015-02-10 15:02:10 -06:00
Marlena Compton
567562f132
fix merge conflicts in gemfile.lock
2015-02-10 06:44:22 -08:00
Marlena Compton
39feeb94d0
merge in changes from dev branch
2015-02-10 06:28:47 -08:00
Yoong Kang Lim
75ac2081b0
Merge branch 'dev' into likeable
...
Conflicts:
db/schema.rb
2015-02-10 22:57:28 +11:00
Yoong Kang Lim
36a94156c1
Merge branch 'dev' into likeable
...
Conflicts:
db/schema.rb
2015-02-10 22:54:45 +11:00
Savant Krishna
1c9081e788
remove duplicate test in views
2015-02-10 20:52:42 +11:00
Yoong Kang Lim
e3db003bbc
Added tests for the concern and member model
2015-02-10 20:18:26 +11:00
Savant Krishna
9bcd2d0aa6
Test for linkback of photos to harvest/garden/planting
2015-02-10 20:01:43 +11:00
Savant Krishna
36a9514add
linkback for harvests and gardens as well : Fixing #679
2015-02-09 17:59:31 +11:00
Yoong Kang Lim
33a66dce1f
Starting stages of a like feature for posts.
2015-02-05 00:54:31 +11:00
Marlena Compton
a013385d35
add bits to get the labels in the right place
2015-01-31 08:02:51 -08:00
Marlena Compton
ba7ef3c85d
all charts tests passing WOOT
2015-01-28 05:16:23 -08:00
Marlena Compton
73e144278e
added chart to the page
2015-01-27 07:26:31 -08:00
Marlena Compton
e3d2a90af8
all tests by the y test is passing
2015-01-25 12:45:36 -08:00
Marlena Compton
1d5466fdfd
all but one test passing and seeing that I need a how separate y scale
2015-01-24 16:23:09 -08:00
Marlena Compton
a749a9ca63
all tests working but 2 about to monkey with data again
2015-01-23 06:33:03 -08:00
Miles Gould
6d1385f00c
Turn on PhantomJS for all feature tests.
2015-01-22 23:55:20 +00:00
Marlena Compton
6d8817d1fe
fixing tests but some of them are green and render is working
2015-01-19 07:34:15 -08:00
Marlena Compton
1a845fdabc
xscale working
2015-01-13 21:40:31 -08:00
Marlena Compton
e52c4f7d4b
add group for graph and transform to accommodate labels
2014-12-22 10:24:33 -08:00
Marlena Compton
5f435b1e82
fix conflict in contributors file
2014-12-14 10:15:05 -08:00
Marlena Compton
f608685ac8
add names to contributors
2014-12-12 13:36:11 -08:00
Marlena Compton
dbbd37e59e
BarGroup uses data object
2014-12-06 21:30:38 -08:00
Marlena Compton
482650dec6
bar label group and all tests passing
2014-12-06 21:16:22 -08:00
Marlena Compton
cc22b87cf1
barlabelgroup tests passing still horizontalbargraph tests to fix
2014-12-06 08:30:49 -08:00
Marlena Compton
8826b0137a
changed growtuff to growstuff which fixed tests
2014-11-26 13:55:27 -08:00
Marlena Compton
d4d76b2e8d
committing tests classes I thought I committed earlier :/
2014-11-26 13:48:22 -08:00
Marlena Compton
994ee18f13
Merge remote-tracking branch 'upstream/master'
2014-11-23 14:36:21 -08:00
Marlena Compton
80532e94f1
Merge remote-tracking branch 'origin/dev'
2014-09-11 06:46:41 -07:00