Compare commits

...

5910 Commits

Author SHA1 Message Date
ImgBotApp
c1b8d2211a [ImgBot] Optimize images
*Total -- 1,165.34kb -> 338.55kb (70.95%)

/app/assets/images/pearLogo.svg -- 1,013.66kb -> 220.91kb (78.21%)
/app/assets/images/facebook-login-splash.png -- 69.41kb -> 51.04kb (26.47%)
/app/assets/images/facebook-thumbnail.png -- 10.94kb -> 8.10kb (25.93%)
/app/assets/images/pear.png -- 71.33kb -> 58.50kb (17.98%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
2021-08-09 07:30:03 +00:00
Brenda Wallace
e36de8afe5 Merge pull request #2870 from Growstuff/dependabot/github_actions/actions/setup-node-2.4.0
Bump actions/setup-node from 2.2.0 to 2.4.0
2021-08-09 19:29:19 +12:00
Brenda Wallace
d8601a6682 Merge pull request #2872 from le-jun/accessibilityIssues
Accessibility: Nav bar’s icon links
2021-08-09 19:28:54 +12:00
LeJun
afbde883d7 Created alt text
Missing alt text for nav bar icons
2021-08-06 19:18:21 +02:00
le-jun
2e900194ee Added myself to contributors list 2021-08-06 17:10:20 +02:00
le-jun
96fe52e916 Updated pear.png
Updated the old file with an export from the svg
2021-08-06 14:59:01 +02:00
le-jun
b573515124 Delete pear.png 2021-08-06 14:58:14 +02:00
le-jun
ddfae74013 Added new image files
Converted the old "pear logo" into an svg file and replaced the two Facebook’s pictures.
2021-08-06 14:12:00 +02:00
le-jun
511795b979 Delete facebook-thumbnail.png
Deleted old png
2021-08-06 14:09:11 +02:00
le-jun
2fc2466669 Delete facebook-login-splash.png
Deleted old png
2021-08-06 14:08:58 +02:00
dependabot[bot]
71e37aba03 Bump actions/setup-node from 2.2.0 to 2.4.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.2.0 to 2.4.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.2.0...v2.4.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-06 07:09:30 +00:00
dependabot[bot]
247e1023f3 Merge pull request #2849 from Growstuff/dependabot/bundler/haml_lint-0.37.1 2021-07-13 21:03:14 +00:00
dependabot[bot]
f0cdce6d0f Bump haml_lint from 0.37.0 to 0.37.1
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.37.0 to 0.37.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.37.0...v0.37.1)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-13 20:45:43 +00:00
dependabot[bot]
fd2e8133ab Merge pull request #2852 from Growstuff/dependabot/github_actions/actions/setup-node-2.2.0 2021-07-13 20:41:54 +00:00
dependabot[bot]
235c237e46 Bump actions/setup-node from 2.1.5 to 2.2.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.1.5 to 2.2.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.1.5...v2.2.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-13 20:17:34 +00:00
Brenda Wallace
6878eebe54 Merge pull request #2857 from Growstuff/dependabot/bundler/faraday-1.5.1
Bump faraday from 1.4.2 to 1.5.1
2021-07-14 08:16:36 +12:00
Brenda Wallace
54ded6cdb4 Merge pull request #2858 from Growstuff/dependabot/bundler/oj-3.12.1
Bump oj from 3.11.5 to 3.12.1
2021-07-14 08:16:07 +12:00
Brenda Wallace
0ff2dabca7 Merge pull request #2859 from Growstuff/dependabot/bundler/addressable-2.8.0
Bump addressable from 2.7.0 to 2.8.0
2021-07-14 08:15:25 +12:00
dependabot[bot]
0b5fd8d59c Bump addressable from 2.7.0 to 2.8.0
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.7.0...addressable-2.8.0)

---
updated-dependencies:
- dependency-name: addressable
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-12 17:20:43 +00:00
dependabot[bot]
a42d1519cd Bump oj from 3.11.5 to 3.12.1
Bumps [oj](https://github.com/ohler55/oj) from 3.11.5 to 3.12.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.11.5...v3.12.1)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-12 07:08:42 +00:00
dependabot[bot]
2a6fe47213 Bump faraday from 1.4.2 to 1.5.1
Bumps [faraday](https://github.com/lostisland/faraday) from 1.4.2 to 1.5.1.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v1.4.2...v1.5.1)

---
updated-dependencies:
- dependency-name: faraday
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-12 07:01:49 +00:00
Daniel O'Connor
af00ee496f Merge pull request #2828 from Growstuff/dependabot/bundler/puma-5.3.2
Bump puma from 5.3.1 to 5.3.2
2021-05-26 12:33:10 +09:30
dependabot[bot]
b4e46bbce6 Bump puma from 5.3.1 to 5.3.2
Bumps [puma](https://github.com/puma/puma) from 5.3.1 to 5.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/v5.3.1...v5.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-25 09:11:09 +00:00
Brenda Wallace
3853e8694a Merge pull request #2830 from Growstuff/dependabot/bundler/faraday-1.4.2
Bump faraday from 1.4.1 to 1.4.2
2021-05-25 21:09:13 +12:00
dependabot[bot]
a84d6d3243 Bump faraday from 1.4.1 to 1.4.2
Bumps [faraday](https://github.com/lostisland/faraday) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-25 07:22:31 +00:00
Brenda Wallace
02afbbad81 Merge pull request #2824 from Growstuff/dependabot/bundler/faker-2.18.0
Bump faker from 2.17.0 to 2.18.0
2021-05-20 17:27:34 +12:00
dependabot[bot]
82f980acd1 Bump faker from 2.17.0 to 2.18.0
Bumps [faker](https://github.com/faker-ruby/faker) from 2.17.0 to 2.18.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.17.0...v2.18.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-17 22:18:09 +00:00
Brenda Wallace
c13a5a06c6 Merge pull request #2826 from Growstuff/dependabot/bundler/nokogiri-1.11.4
Bump nokogiri from 1.11.3 to 1.11.4
2021-05-18 10:16:19 +12:00
dependabot[bot]
1d7a9bdaad Bump nokogiri from 1.11.3 to 1.11.4
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.3 to 1.11.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.3...v1.11.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-17 21:53:02 +00:00
Brenda Wallace
e0c4c77568 Merge pull request #2821 from Growstuff/dependabot/github_actions/actions/cache-2.1.5
Bump actions/cache from 2 to 2.1.5
2021-05-17 08:33:02 +12:00
Brenda Wallace
b3a2c3ed8e Merge pull request #2822 from Growstuff/dependabot/github_actions/actions/checkout-2.3.4
Bump actions/checkout from 2 to 2.3.4
2021-05-17 08:32:43 +12:00
Brenda Wallace
84301beaad Merge pull request #2820 from Growstuff/dependabot/github_actions/actions/setup-ruby-1.1.3
Bump actions/setup-ruby from 1 to 1.1.3
2021-05-17 08:32:22 +12:00
dependabot[bot]
72f34765fa Bump actions/cache from 2 to 2.1.5
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 2.1.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...v2.1.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-12 14:37:39 +00:00
dependabot[bot]
b71cafa922 Bump actions/setup-ruby from 1 to 1.1.3
Bumps [actions/setup-ruby](https://github.com/actions/setup-ruby) from 1 to 1.1.3.
- [Release notes](https://github.com/actions/setup-ruby/releases)
- [Commits](https://github.com/actions/setup-ruby/compare/v1...v1.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-12 14:37:39 +00:00
dependabot[bot]
e95ff8e423 Bump actions/checkout from 2 to 2.3.4
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 2.3.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v2.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-12 14:37:38 +00:00
Daniel O'Connor
58f7bd1002 Merge pull request #2810 from Growstuff/dependabot/bundler/i18n-tasks-0.9.34
Bump i18n-tasks from 0.9.31 to 0.9.34
2021-05-13 00:06:59 +09:30
Daniel O'Connor
cf97fd0fb6 Merge branch 'dev' into dependabot/bundler/i18n-tasks-0.9.34 2021-05-12 14:15:41 +09:30
Daniel O'Connor
89f5a222c9 Merge pull request #2811 from Growstuff/dependabot/bundler/devise-4.8.0
Bump devise from 4.7.3 to 4.8.0
2021-05-12 02:29:26 +09:30
Daniel O'Connor
3310fe7753 Merge pull request #2812 from Growstuff/dependabot/bundler/chartkick-4.0.4
Bump chartkick from 4.0.3 to 4.0.4
2021-05-12 02:29:08 +09:30
Daniel O'Connor
ee8bc86ea7 Merge pull request #2819 from Growstuff/dependabot/bundler/puma-5.3.1
Bump puma from 5.2.2 to 5.3.1
2021-05-12 02:28:54 +09:30
Daniel O'Connor
4590b848a3 Merge pull request #2818 from Growstuff/dependabot/github_actions/actions/setup-node-2.1.5
Bump actions/setup-node from 2.pre.beta to 2.1.5
2021-05-12 02:28:41 +09:30
Daniel O'Connor
44edafbe69 Merge pull request #2816 from Growstuff/dependabot/bundler/factory_bot_rails-6.2.0
Bump factory_bot_rails from 6.1.0 to 6.2.0
2021-05-12 02:28:22 +09:30
dependabot[bot]
228e4433f1 Bump devise from 4.7.3 to 4.8.0
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.3 to 4.8.0.
- [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.3...v4.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 16:33:21 +00:00
dependabot[bot]
649f6b0fc0 Bump factory_bot_rails from 6.1.0 to 6.2.0
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 6.1.0 to 6.2.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.1.0...v6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 16:32:53 +00:00
dependabot[bot]
502c42c36d Bump puma from 5.2.2 to 5.3.1
Bumps [puma](https://github.com/puma/puma) from 5.2.2 to 5.3.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/v5.2.2...v5.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 16:32:20 +00:00
dependabot[bot]
ee9c1491b0 Bump chartkick from 4.0.3 to 4.0.4
Bumps [chartkick](https://github.com/ankane/chartkick) from 4.0.3 to 4.0.4.
- [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/v4.0.3...v4.0.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 16:32:17 +00:00
dependabot[bot]
cc8e924a6e Bump actions/setup-node from 2.pre.beta to 2.1.5
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.pre.beta to 2.1.5.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2-beta...v2.1.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 16:30:46 +00:00
Daniel O'Connor
b2f7ebb1c6 Merge pull request #2814 from Growstuff/dependabot/npm_and_yarn/lodash-4.17.21
Bump lodash from 4.17.20 to 4.17.21
2021-05-12 01:59:57 +09:30
dependabot[bot]
d621e48d28 Bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-11 16:04:55 +00:00
Daniel O'Connor
401edbf106 Update CONTRIBUTORS.md 2021-05-12 01:30:35 +09:30
dependabot[bot]
4d5dac27ab Bump i18n-tasks from 0.9.31 to 0.9.34
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.31 to 0.9.34.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.31...v0.9.34)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-29 09:45:55 +00:00
Brenda Wallace
058157a58f Merge pull request #2807 from Growstuff/dependabot/bundler/oauth-0.5.6
[Security] Bump oauth from 0.5.4 to 0.5.6
2021-04-29 15:06:41 +12:00
Brenda Wallace
d5855c08cb Merge pull request #2808 from Growstuff/dependabot/add-v2-config-file
Upgrade to GitHub-native Dependabot
2021-04-29 15:06:22 +12:00
dependabot-preview[bot]
7be9e72d1e Upgrade to GitHub-native Dependabot 2021-04-28 16:44:59 +00:00
dependabot-preview[bot]
787e0988c0 [Security] Bump oauth from 0.5.4 to 0.5.6
Bumps [oauth](https://github.com/oauth-xx/oauth-ruby) from 0.5.4 to 0.5.6. **This update includes a security fix.**
- [Release notes](https://github.com/oauth-xx/oauth-ruby/releases)
- [Changelog](https://github.com/oauth-xx/oauth-ruby/blob/master/HISTORY)
- [Commits](https://github.com/oauth-xx/oauth-ruby/compare/v0.5.4...v0.5.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-28 06:35:46 +00:00
Daniel O'Connor
6e874e393a Merge pull request #2806 from Growstuff/dependabot/bundler/oauth-0.5.6
Bump oauth from 0.5.4 to 0.5.6
2021-04-28 16:02:49 +09:30
dependabot-preview[bot]
36f207a000 Merge pull request #2801 from Growstuff/dependabot/bundler/chartkick-4.0.3 2021-04-28 06:31:59 +00:00
dependabot-preview[bot]
baf262d486 Bump chartkick from 4.0.2 to 4.0.3
Bumps [chartkick](https://github.com/ankane/chartkick) from 4.0.2 to 4.0.3.
- [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/v4.0.2...v4.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-28 06:12:38 +00:00
dependabot-preview[bot]
0ece6b64d3 Merge pull request #2804 from Growstuff/dependabot/bundler/geocoder-1.6.7 2021-04-28 06:05:14 +00:00
dependabot-preview[bot]
12f20c69ec Bump geocoder from 1.6.6 to 1.6.7
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.6.6 to 1.6.7.
- [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.6...v1.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-28 05:48:08 +00:00
dependabot-preview[bot]
e16a81c980 Merge pull request #2803 from Growstuff/dependabot/bundler/oj-3.11.5 2021-04-28 05:42:06 +00:00
dependabot-preview[bot]
844f2bb34e Bump oj from 3.11.3 to 3.11.5
Bumps [oj](https://github.com/ohler55/oj) from 3.11.3 to 3.11.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.11.3...v3.11.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-28 05:19:51 +00:00
dependabot-preview[bot]
d64d9a52c0 Merge pull request #2805 from Growstuff/dependabot/bundler/faraday-1.4.1 2021-04-28 05:13:30 +00:00
dependabot[bot]
5b38b84bf1 Bump oauth from 0.5.4 to 0.5.6
Bumps [oauth](https://github.com/oauth-xx/oauth-ruby) from 0.5.4 to 0.5.6.
- [Release notes](https://github.com/oauth-xx/oauth-ruby/releases)
- [Changelog](https://github.com/oauth-xx/oauth-ruby/blob/master/HISTORY)
- [Commits](https://github.com/oauth-xx/oauth-ruby/compare/v0.5.4...v0.5.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-22 16:33:24 +00:00
dependabot-preview[bot]
9282bb44b8 Bump faraday from 1.3.0 to 1.4.1
Bumps [faraday](https://github.com/lostisland/faraday) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v1.3.0...v1.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-19 08:43:52 +00:00
dependabot-preview[bot]
69c9c201dc Merge pull request #2799 from Growstuff/dependabot/bundler/loofah-2.9.1 2021-04-09 00:52:33 +00:00
dependabot-preview[bot]
49eb688fa3 Bump loofah from 2.9.0 to 2.9.1
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.9.0...v2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-09 00:32:42 +00:00
dependabot-preview[bot]
ced662349c Merge pull request #2800 from Growstuff/dependabot/bundler/sidekiq-6.2.1 2021-04-09 00:30:35 +00:00
dependabot-preview[bot]
3532c6a040 Bump sidekiq from 6.2.0 to 6.2.1
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.2.0 to 6.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/v6.2.0...v6.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-08 08:56:25 +00:00
Daniel O'Connor
5ebe0de7d9 Merge pull request #2795 from Growstuff/dependabot/bundler/kramdown-2.3.1
Bump kramdown from 2.3.0 to 2.3.1
2021-04-08 15:14:34 +09:30
Daniel O'Connor
7336801744 Merge pull request #2784 from Growstuff/dependabot/bundler/puma-5.2.2
Bump puma from 5.2.1 to 5.2.2
2021-04-08 15:13:50 +09:30
dependabot-preview[bot]
aeb48252c9 Merge pull request #2798 from Growstuff/dependabot/bundler/chartkick-4.0.2 2021-04-08 05:43:33 +00:00
dependabot-preview[bot]
6dd105d269 Bump chartkick from 4.0.0 to 4.0.2
Bumps [chartkick](https://github.com/ankane/chartkick) from 4.0.0 to 4.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/v4.0.0...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-07 07:32:57 +00:00
dependabot[bot]
a4b21efeb6 Bump kramdown from 2.3.0 to 2.3.1
Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-07 05:23:47 +00:00
dependabot-preview[bot]
bef063fa34 Merge pull request #2785 from Growstuff/dependabot/bundler/geocoder-1.6.6 2021-04-07 05:20:20 +00:00
Daniel O'Connor
53c6a12b3d Merge branch 'dev' into dependabot/bundler/puma-5.2.2 2021-04-07 14:37:22 +09:30
Daniel O'Connor
1332c84faf Merge branch 'dev' into dependabot/bundler/geocoder-1.6.6 2021-04-07 14:31:04 +09:30
dependabot-preview[bot]
215376f93d Merge pull request #2791 from Growstuff/dependabot/bundler/sidekiq-6.2.0 2021-04-07 05:00:32 +00:00
dependabot-preview[bot]
0dc6a8cf7d Bump sidekiq from 6.1.3 to 6.2.0
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.3 to 6.2.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.1.3...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-06 01:02:28 +00:00
dependabot-preview[bot]
e06a5433f2 Bump geocoder from 1.6.5 to 1.6.6
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.6.5 to 1.6.6.
- [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.5...v1.6.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-06 01:02:21 +00:00
dependabot-preview[bot]
49c219e5b3 Bump puma from 5.2.1 to 5.2.2
Bumps [puma](https://github.com/puma/puma) from 5.2.1 to 5.2.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/v5.2.1...v5.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-06 01:02:18 +00:00
dependabot-preview[bot]
b8c1e8a023 Merge pull request #2792 from Growstuff/dependabot/bundler/unicorn-6.0.0 2021-04-06 01:00:11 +00:00
dependabot-preview[bot]
bb5b2335bd Bump unicorn from 5.8.0 to 6.0.0
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.8.0 to 6.0.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-06 00:39:51 +00:00
dependabot-preview[bot]
0bf2b5bd79 Merge pull request #2793 from Growstuff/dependabot/bundler/rspec-rails-5.0.1 2021-04-06 00:37:34 +00:00
dependabot-preview[bot]
d46c6a3e0e Bump rspec-rails from 4.0.2 to 5.0.1
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.2 to 5.0.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.2...v5.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-06 00:17:06 +00:00
dependabot-preview[bot]
f47844297d Merge pull request #2789 from Growstuff/dependabot/bundler/faker-2.17.0 2021-04-06 00:14:06 +00:00
dependabot-preview[bot]
e0aa679b41 Bump faker from 2.16.0 to 2.17.0
Bumps [faker](https://github.com/faker-ruby/faker) from 2.16.0 to 2.17.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.16.0...v2.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-05 23:54:51 +00:00
dependabot-preview[bot]
f302ac5c66 Merge pull request #2796 from Growstuff/dependabot/bundler/listen-3.5.1 2021-04-05 23:52:15 +00:00
dependabot-preview[bot]
cae54c935d Bump listen from 3.4.1 to 3.5.1
Bumps [listen](https://github.com/guard/listen) from 3.4.1 to 3.5.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.4.1...v3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-05 23:34:15 +00:00
dependabot-preview[bot]
8e20263fc9 Merge pull request #2788 from Growstuff/dependabot/bundler/oj-3.11.3 2021-04-05 23:31:23 +00:00
dependabot-preview[bot]
66d5571548 Bump oj from 3.11.2 to 3.11.3
Bumps [oj](https://github.com/ohler55/oj) from 3.11.2 to 3.11.3.
- [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.11.2...v3.11.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-05 23:11:30 +00:00
dependabot-preview[bot]
08983312d7 Merge pull request #2783 from Growstuff/dependabot/bundler/webdrivers-4.6.0 2021-04-05 23:08:29 +00:00
dependabot-preview[bot]
d1823b6fc6 Bump webdrivers from 4.5.0 to 4.6.0
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.5.0 to 4.6.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.5.0...v4.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-05 22:47:18 +00:00
dependabot-preview[bot]
040e505a41 Merge pull request #2797 from Growstuff/dependabot/bundler/chartkick-4.0.0 2021-04-05 22:44:16 +00:00
dependabot-preview[bot]
9d4a9c605e Bump chartkick from 3.4.2 to 4.0.0
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.4.2 to 4.0.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.4.2...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-05 08:31:06 +00:00
dependabot-preview[bot]
5559a76d04 Merge pull request #2790 from Growstuff/dependabot/bundler/searchkick-4.4.4 2021-03-16 03:28:38 +00:00
dependabot-preview[bot]
a5c6b87f6b Bump searchkick from 4.4.2 to 4.4.4
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.4.2 to 4.4.4.
- [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.2...v4.4.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-15 08:39:59 +00:00
dependabot-preview[bot]
d9351257e3 Merge pull request #2781 from Growstuff/dependabot/bundler/bullet-6.1.4 2021-02-28 03:04:48 +00:00
dependabot-preview[bot]
45dadf0780 Bump bullet from 6.1.3 to 6.1.4
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.3 to 6.1.4.
- [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.1.3...6.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-26 09:30:32 +00:00
dependabot-preview[bot]
eb4161d421 Merge pull request #2773 from Growstuff/dependabot/bundler/rswag-ui-2.4.0 2021-02-15 10:23:20 +00:00
dependabot-preview[bot]
38fda111b3 Bump rswag-ui from 2.3.2 to 2.4.0
Bumps [rswag-ui](https://github.com/rswag/rswag) from 2.3.2 to 2.4.0.
- [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.3.2...2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 10:03:30 +00:00
dependabot-preview[bot]
288068bfb1 Merge pull request #2779 from Growstuff/dependabot/bundler/elasticsearch-6.8.3 2021-02-15 10:00:37 +00:00
dependabot-preview[bot]
16648e8521 Bump elasticsearch from 6.8.2 to 6.8.3
Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby) from 6.8.2 to 6.8.3.
- [Release notes](https://github.com/elastic/elasticsearch-ruby/releases)
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch-ruby/compare/v6.8.2...v6.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 09:40:05 +00:00
dependabot-preview[bot]
2c38957347 Merge pull request #2772 from Growstuff/dependabot/bundler/rswag-api-2.4.0 2021-02-15 09:37:52 +00:00
dependabot-preview[bot]
37a3fd3df8 Bump rswag-api from 2.3.2 to 2.4.0
Bumps [rswag-api](https://github.com/rswag/rswag) from 2.3.2 to 2.4.0.
- [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.3.2...2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 09:21:20 +00:00
dependabot-preview[bot]
d402a823d2 Merge pull request #2780 from Growstuff/dependabot/bundler/geocoder-1.6.5 2021-02-15 09:19:04 +00:00
dependabot-preview[bot]
d7d624cf9d Bump geocoder from 1.6.4 to 1.6.5
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.6.4 to 1.6.5.
- [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.4...v1.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 09:00:08 +00:00
dependabot-preview[bot]
bc52d7635d Merge pull request #2778 from Growstuff/dependabot/bundler/scout_apm-4.0.4 2021-02-15 08:58:11 +00:00
dependabot-preview[bot]
129d10ec38 Bump scout_apm from 4.0.3 to 4.0.4
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 4.0.3 to 4.0.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/v4.0.3...v4.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 08:37:53 +00:00
dependabot-preview[bot]
65e026352f Merge pull request #2764 from Growstuff/dependabot/bundler/xmlrpc-0.3.2 2021-02-15 08:35:17 +00:00
dependabot-preview[bot]
bd5554fda7 Bump xmlrpc from 0.3.1 to 0.3.2
Bumps [xmlrpc](https://github.com/ruby/xmlrpc) from 0.3.1 to 0.3.2.
- [Release notes](https://github.com/ruby/xmlrpc/releases)
- [Changelog](https://github.com/ruby/xmlrpc/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/xmlrpc/compare/v0.3.1...v0.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 08:14:20 +00:00
dependabot-preview[bot]
61ed27e16d Merge pull request #2774 from Growstuff/dependabot/bundler/faker-2.16.0 2021-02-15 08:12:16 +00:00
dependabot-preview[bot]
aff4a1ae54 Bump faker from 2.15.1 to 2.16.0
Bumps [faker](https://github.com/faker-ruby/faker) from 2.15.1 to 2.16.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.15.1...v2.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 07:54:18 +00:00
dependabot-preview[bot]
da2330fdcf Merge pull request #2763 from Growstuff/dependabot/bundler/database_cleaner-2.0.1 2021-02-15 07:52:16 +00:00
dependabot-preview[bot]
f480642bbd Bump database_cleaner from 2.0.0 to 2.0.1
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 2.0.0 to 2.0.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/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 07:33:46 +00:00
dependabot-preview[bot]
4ef54f1546 Merge pull request #2767 from Growstuff/dependabot/bundler/jsonapi-resources-0.10.4 2021-02-15 07:25:55 +00:00
dependabot-preview[bot]
8c6cf474d6 Bump jsonapi-resources from 0.10.3 to 0.10.4
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.10.3...v0.10.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 07:08:10 +00:00
dependabot-preview[bot]
5f66d66930 Merge pull request #2766 from Growstuff/dependabot/bundler/puma-5.2.1 2021-02-15 07:04:37 +00:00
dependabot-preview[bot]
6f4cdb858b Bump puma from 5.1.1 to 5.2.1
Bumps [puma](https://github.com/puma/puma) from 5.1.1 to 5.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/v5.1.1...v5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 06:47:10 +00:00
dependabot-preview[bot]
7c3fc63fb3 Merge pull request #2753 from Growstuff/dependabot/bundler/bootstrap-4.6.0 2021-02-15 06:44:28 +00:00
dependabot-preview[bot]
6176b05ecc Bump bootstrap from 4.5.3 to 4.6.0
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.3 to 4.6.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.5.3...v4.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 06:25:00 +00:00
Brenda Wallace
0e8ec9496f Merge branch 'mainline' into dev 2021-02-15 19:21:44 +13:00
dependabot-preview[bot]
3dc3ce9079 Merge pull request #2775 from Growstuff/dependabot/bundler/timecop-0.9.4 2021-02-15 06:10:44 +00:00
dependabot-preview[bot]
c3f194ee65 Bump timecop from 0.9.2 to 0.9.4
Bumps [timecop](https://github.com/travisjeffery/timecop) from 0.9.2 to 0.9.4.
- [Release notes](https://github.com/travisjeffery/timecop/releases)
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md)
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.2...v0.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 05:52:16 +00:00
dependabot-preview[bot]
84a0fe66df Merge pull request #2776 from Growstuff/dependabot/bundler/rswag-specs-2.4.0 2021-02-15 05:48:35 +00:00
dependabot-preview[bot]
3812915628 Bump rswag-specs from 2.3.2 to 2.4.0
Bumps [rswag-specs](https://github.com/rswag/rswag) from 2.3.2 to 2.4.0.
- [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.3.2...2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-10 07:27:48 +00:00
dependabot-preview[bot]
aad10ed24c Merge pull request #2771 from Growstuff/dependabot/bundler/carrierwave-2.1.1 2021-02-08 22:52:37 +00:00
dependabot-preview[bot]
66e65fd9e6 [Security] Bump carrierwave from 2.1.0 to 2.1.1
Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 2.1.0 to 2.1.1. **This update includes security fixes.**
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases)
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v2.1.0...v2.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-08 19:48:30 +00:00
dependabot-preview[bot]
b4c971fbef Merge pull request #2758 from Growstuff/dependabot/bundler/oj-3.11.2 2021-02-04 00:54:08 +00:00
dependabot-preview[bot]
fef770802e Bump oj from 3.11.1 to 3.11.2
Bumps [oj](https://github.com/ohler55/oj) from 3.11.1 to 3.11.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.11.1...v3.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 21:17:42 +00:00
dependabot-preview[bot]
b104e05585 Merge pull request #2756 from Growstuff/dependabot/bundler/rswag-specs-2.3.2 2021-02-01 21:15:26 +00:00
dependabot-preview[bot]
fa1ac30678 Bump rswag-specs from 2.3.1 to 2.3.2
Bumps [rswag-specs](https://github.com/rswag/rswag) from 2.3.1 to 2.3.2.
- [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.3.1...2.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 20:54:04 +00:00
dependabot-preview[bot]
e525cdcbae Merge pull request #2761 from Growstuff/dependabot/bundler/capybara-3.35.3 2021-02-01 20:52:07 +00:00
dependabot-preview[bot]
1026175a40 Bump capybara from 3.34.0 to 3.35.3
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.34.0 to 3.35.3.
- [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.34.0...3.35.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 20:29:17 +00:00
dependabot-preview[bot]
2d73878a84 Merge pull request #2762 from Growstuff/dependabot/bundler/database_cleaner-2.0.0 2021-02-01 20:27:21 +00:00
dependabot-preview[bot]
e615882d53 Bump database_cleaner from 1.8.5 to 2.0.0
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.8.5 to 2.0.0.
- [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.5...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-01 09:04:15 +00:00
dependabot-preview[bot]
53b921ba9a Merge pull request #2760 from Growstuff/dependabot/bundler/jsonapi-resources-0.10.3 2021-01-31 20:33:51 +00:00
dependabot-preview[bot]
3c6e47cfd4 Bump jsonapi-resources from 0.10.2 to 0.10.3
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.10.2 to 0.10.3.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.10.2...v0.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-29 07:19:37 +00:00
dependabot-preview[bot]
bd7561987f Merge pull request #2757 from Growstuff/dependabot/bundler/rswag-ui-2.3.2 2021-01-29 06:39:21 +00:00
dependabot-preview[bot]
26eca986df Bump rswag-ui from 2.3.1 to 2.3.2
Bumps [rswag-ui](https://github.com/rswag/rswag) from 2.3.1 to 2.3.2.
- [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.3.1...2.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-29 06:22:43 +00:00
dependabot-preview[bot]
8f057b4790 Merge pull request #2759 from Growstuff/dependabot/bundler/rswag-api-2.3.2 2021-01-29 06:20:20 +00:00
dependabot-preview[bot]
a350b6877b Bump rswag-api from 2.3.1 to 2.3.2
Bumps [rswag-api](https://github.com/rswag/rswag) from 2.3.1 to 2.3.2.
- [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.3.1...2.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-28 07:26:06 +00:00
Brenda Wallace
77e1c435f3 Merge pull request #2754 from Growstuff/dev
production deploy
2021-01-27 22:39:35 +13:00
Brenda Wallace
a79c5b87c5 Merge remote-tracking branch 'upstream/dev' into dev 2021-01-27 22:38:54 +13:00
dependabot-preview[bot]
592ab36187 Merge pull request #2738 from Growstuff/dependabot/bundler/webdrivers-4.5.0 2021-01-26 19:38:10 +00:00
dependabot-preview[bot]
e971625fbe Bump webdrivers from 4.4.2 to 4.5.0
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.4.2 to 4.5.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.4.2...v4.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-26 19:15:41 +00:00
dependabot-preview[bot]
b0e1359f3b Merge pull request #2737 from Growstuff/dependabot/bundler/scout_apm-4.0.3 2021-01-26 19:13:46 +00:00
dependabot-preview[bot]
b7a1127a23 Bump scout_apm from 4.0.2 to 4.0.3
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 4.0.2 to 4.0.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/v4.0.2...v4.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-26 18:52:43 +00:00
Brenda Wallace
60c56d1458 Nice formatting on crop descriptions 2021-01-27 07:50:19 +13:00
Brenda Wallace
108a2052ca protect against not finding a crop 2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
8b1fb4d73e Bump oj from 3.11.0 to 3.11.1
Bumps [oj](https://github.com/ohler55/oj) from 3.11.0 to 3.11.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.11.0...v3.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
e5ce52083c Bump bullet from 6.1.2 to 6.1.3
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.2 to 6.1.3.
- [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.1.2...6.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
e861ed8ac0 Bump sidekiq from 6.1.2 to 6.1.3
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.2 to 6.1.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.1.2...v6.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
5061167df9 Bump scout_apm from 4.0.1 to 4.0.2
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 4.0.1 to 4.0.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/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
8e0e3b8fc4 Bump scout_apm from 4.0.0 to 4.0.1
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 4.0.0 to 4.0.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/v4.0.0...v4.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 07:50:19 +13:00
dependabot-preview[bot]
a3da140a19 Bump loofah from 2.8.0 to 2.9.0
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.8.0 to 2.9.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.8.0...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-27 07:50:19 +13:00
Brenda Wallace
40afe90b14 Nice formatting on crop descriptions 2021-01-26 15:57:43 +13:00
Brenda Wallace
5ea7c44614 protect against not finding a crop 2021-01-26 10:09:04 +13:00
dependabot-preview[bot]
cd09dd4a52 Merge pull request #2748 from Growstuff/dependabot/bundler/oj-3.11.1 2021-01-25 21:08:21 +00:00
dependabot-preview[bot]
c763f59651 Bump oj from 3.11.0 to 3.11.1
Bumps [oj](https://github.com/ohler55/oj) from 3.11.0 to 3.11.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.11.0...v3.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-25 07:57:31 +00:00
dependabot-preview[bot]
288a550c12 Merge pull request #2739 from Growstuff/dependabot/bundler/bullet-6.1.3 2021-01-23 02:50:51 +00:00
dependabot-preview[bot]
ac9be97053 Bump bullet from 6.1.2 to 6.1.3
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.2 to 6.1.3.
- [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.1.2...6.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-23 02:32:00 +00:00
dependabot-preview[bot]
53a59d10b6 Merge pull request #2740 from Growstuff/dependabot/bundler/sidekiq-6.1.3 2021-01-23 02:30:08 +00:00
dependabot-preview[bot]
b914eb780c Bump sidekiq from 6.1.2 to 6.1.3
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.2 to 6.1.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.1.2...v6.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-22 07:17:01 +00:00
dependabot-preview[bot]
08882efeda Merge pull request #2736 from Growstuff/dependabot/bundler/scout_apm-4.0.2 2021-01-21 02:56:33 +00:00
dependabot-preview[bot]
28b35ca9ba Bump scout_apm from 4.0.1 to 4.0.2
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 4.0.1 to 4.0.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/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-20 08:51:16 +00:00
dependabot-preview[bot]
a69dee51db Merge pull request #2735 from Growstuff/dependabot/bundler/scout_apm-4.0.1 2021-01-19 20:58:00 +00:00
dependabot-preview[bot]
5a88b3affa Bump scout_apm from 4.0.0 to 4.0.1
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 4.0.0 to 4.0.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/v4.0.0...v4.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-19 20:38:34 +00:00
dependabot-preview[bot]
d5fefe61bb Bump loofah from 2.8.0 to 2.9.0
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.8.0 to 2.9.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.8.0...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-20 09:35:49 +13:00
Brenda Wallace
dde0c04f2f Merge pull request #2734 from Growstuff/dev
production deploy
2021-01-20 09:33:47 +13:00
dependabot-preview[bot]
b116f4a259 Merge pull request #2730 from Growstuff/dependabot/bundler/oj-3.11.0 2021-01-18 03:38:18 +00:00
dependabot-preview[bot]
e9c1c6f1f6 Bump oj from 3.10.18 to 3.11.0
Bumps [oj](https://github.com/ohler55/oj) from 3.10.18 to 3.11.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.10.18...v3.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-18 03:18:42 +00:00
dependabot-preview[bot]
a8d5ed23ba Merge pull request #2731 from Growstuff/dependabot/bundler/listen-3.4.1 2021-01-18 03:16:49 +00:00
dependabot-preview[bot]
c719935eda Bump listen from 3.4.0 to 3.4.1
Bumps [listen](https://github.com/guard/listen) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-18 02:56:05 +00:00
Brenda Wallace
912c5bdd4b Merge remote-tracking branch 'upstream/mainline' into dev 2021-01-18 15:54:06 +13:00
dependabot-preview[bot]
88ba4dfb2c Merge pull request #2733 from Growstuff/dependabot/bundler/platform-api-3.3.0 2021-01-18 02:49:22 +00:00
dependabot-preview[bot]
eab34c5177 Bump platform-api from 3.2.0 to 3.3.0
Bumps [platform-api](https://github.com/heroku/platform-api) from 3.2.0 to 3.3.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/v3.2.0...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-15 07:57:44 +00:00
dependabot-preview[bot]
3598e594a4 Merge pull request #2729 from Growstuff/dependabot/bundler/haml_lint-0.37.0 2021-01-10 21:31:17 +00:00
dependabot-preview[bot]
18136aa276 Bump haml_lint from 0.36.0 to 0.37.0
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.36.0 to 0.37.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.36.0...v0.37.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-08 08:15:36 +00:00
dependabot-preview[bot]
312c183eaf Bump friendly_id from 5.4.1 to 5.4.2
Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.4.1 to 5.4.2.
- [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.4.1...5.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-07 22:53:48 +13:00
Brenda Wallace
f6e5e27dd3 Update README.md 2021-01-06 11:40:09 +13:00
Brenda Wallace
4d3fcc8497 Upgrade ruby to 2.7.2 2021-01-06 11:39:03 +13:00
dependabot-preview[bot]
b1332ee2c0 Merge pull request #2725 from Growstuff/dependabot/bundler/listen-3.4.0 2021-01-05 10:36:08 +00:00
dependabot-preview[bot]
c24343c051 Bump listen from 3.3.3 to 3.4.0
Bumps [listen](https://github.com/guard/listen) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.3...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 10:18:06 +00:00
dependabot-preview[bot]
d618c240dd Merge pull request #2723 from Growstuff/dependabot/bundler/js-routes-1.4.14 2021-01-05 10:15:53 +00:00
dependabot-preview[bot]
7c38a238cf Bump js-routes from 1.4.13 to 1.4.14
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.13 to 1.4.14.
- [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.13...v1.4.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 09:58:28 +00:00
dependabot-preview[bot]
69802447de Merge pull request #2724 from Growstuff/dependabot/bundler/ruby-units-2.3.2 2021-01-05 09:56:38 +00:00
dependabot-preview[bot]
44dfdd0e8f Bump ruby-units from 2.3.1 to 2.3.2
Bumps [ruby-units](https://github.com/olbrich/ruby-units) from 2.3.1 to 2.3.2.
- [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.1...v2.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 09:38:48 +00:00
dependabot-preview[bot]
98be383fd9 Bump webdrivers from 4.4.1 to 4.4.2
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.4.1 to 4.4.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.4.1...v4.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 22:36:19 +13:00
Brenda Wallace
65eedef3df add back the name of item we're linking to when adding a photo 2021-01-05 19:46:07 +13:00
Brenda Wallace
c733bb463c add flickr keys to ci 2021-01-05 19:46:07 +13:00
codefactor-io
84d02b169a [CodeFactor] Apply fixes 2021-01-05 19:46:07 +13:00
Brenda Wallace
60c74ddff3 Reconnecting stale flickr auth tokens 2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
32414cb409 Bump faraday from 1.1.0 to 1.3.0
Bumps [faraday](https://github.com/lostisland/faraday) from 1.1.0 to 1.3.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/v1.1.0...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
62a9205559 Bump js-routes from 1.4.11 to 1.4.13
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.11 to 1.4.13.
- [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.11...v1.4.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
0421782c3e Bump cancancan from 3.1.0 to 3.2.1
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 3.1.0 to 3.2.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.1.0...3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
aca4052c2d Bump rake from 13.0.1 to 13.0.3
Bumps [rake](https://github.com/ruby/rake) from 13.0.1 to 13.0.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/v13.0.1...v13.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
a057a4235f Bump rspec-rails from 4.0.1 to 4.0.2
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
1167189a97 Bump rubocop-rails from 2.9.0 to 2.9.1
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.9.0 to 2.9.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.9.0...v2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
f9d9b94db7 Bump unicorn from 5.7.0 to 5.8.0
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.7.0 to 5.8.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c27af9e7c6 [Security] Bump nokogiri from 1.10.10 to 1.11.0
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.0. **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.10...v1.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
Brenda Wallace
42116db99e break out steps of setup 2021-01-05 19:46:07 +13:00
Brenda Wallace
784bf66216 use codeclimate from gem 2021-01-05 19:46:07 +13:00
Brenda Wallace
0cb7c76c76 use apt-get instead of apt 2021-01-05 19:46:07 +13:00
Brenda Wallace
f0b931b3cd Remove duplicate env var 2021-01-05 19:46:07 +13:00
Brenda Wallace
4f70156d4c install chrome in gh workflow 2021-01-05 19:46:07 +13:00
Brenda Wallace
ce88f6e43e Move env variable to on place in gh workflow config 2021-01-05 19:46:07 +13:00
Brenda Wallace
9e26b3b51a remove reference to coveralls 2021-01-05 19:46:07 +13:00
Brenda Wallace
0d33960e1d Rename ci step to "start elasticsearch" 2021-01-05 19:46:07 +13:00
Brenda Wallace
398531ba70 Removing coveralls 2021-01-05 19:46:07 +13:00
Brenda Wallace
d3e05d6a48 Only run travis on deploy 2021-01-05 19:46:07 +13:00
Brenda Wallace
bd62b7bd5d adding RAILS_SECRET_TOKEN: supersecret 2021-01-05 19:46:07 +13:00
Brenda Wallace
39f244f3be devise secrets needs to match 2021-01-05 19:46:07 +13:00
Brenda Wallace
9d77d5362d Set elasticsearch to 7.5.1 2021-01-05 19:46:07 +13:00
Brenda Wallace
528cc5c1b3 Add elastic search 2021-01-05 19:46:07 +13:00
Brenda Wallace
2b843ceaca Only run on pull requests 2021-01-05 19:46:07 +13:00
Brenda Wallace
e276efe1f0 Run the rspec on github 2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c8bff44978 Bump puma from 5.1.0 to 5.1.1
Bumps [puma](https://github.com/puma/puma) from 5.1.0 to 5.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/v5.1.0...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
b5a73aa078 Bump bullet from 6.1.0 to 6.1.2
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.0 to 6.1.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.1.0...6.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c783218c9a Bump oj from 3.10.16 to 3.10.18
Bumps [oj](https://github.com/ohler55/oj) from 3.10.16 to 3.10.18.
- [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.16...v3.10.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
69cd116698 Bump listen from 3.3.1 to 3.3.3
Bumps [listen](https://github.com/guard/listen) from 3.3.1 to 3.3.3.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.1...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
Brenda Wallace
03d807cc45 Create brakeman-analysis.yml 2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c798389f37 Bump rubocop-rails from 2.8.1 to 2.9.0
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.1 to 2.9.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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
03cec2fa84 Bump puma from 5.0.4 to 5.1.0
Bumps [puma](https://github.com/puma/puma) from 5.0.4 to 5.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/v5.0.4...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c765c83fec Bump scout_apm from 2.6.10 to 4.0.0
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.10 to 4.0.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.6.10...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
358abfcb05 Bump haml from 5.2.0 to 5.2.1
Bumps [haml](https://github.com/haml/haml) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v5.2.0...5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
579c65cc97 Bump faker from 2.14.0 to 2.15.1
Bumps [faker](https://github.com/faker-ruby/faker) from 2.14.0 to 2.15.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.14.0...v2.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
f81ba493cd Bump searchkick from 4.4.1 to 4.4.2
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.4.1 to 4.4.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.4.1...v4.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
f3eb6433d1 Bump loofah from 2.7.0 to 2.8.0
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.7.0 to 2.8.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.7.0...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
c491ae7a2d Bump jsonapi-swagger from 0.8.0 to 0.8.1
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger) from 0.8.0 to 0.8.1.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases)
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.8.0...v0.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
e1495b629c Bump xmlrpc from 0.3.0 to 0.3.1
Bumps [xmlrpc](https://github.com/ruby/xmlrpc) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/ruby/xmlrpc/releases)
- [Changelog](https://github.com/ruby/xmlrpc/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/xmlrpc/compare/v0.3.0...v0.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
fd07ef4080 Bump capybara from 3.33.0 to 3.34.0
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.33.0 to 3.34.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.33.0...3.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
997686599e Bump js-routes from 1.4.9 to 1.4.11
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.9 to 1.4.11.
- [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.9...v1.4.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
976a66896d Bump listen from 3.2.1 to 3.3.1
Bumps [listen](https://github.com/guard/listen) from 3.2.1 to 3.3.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.2.1...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
95839105d8 Bump oj from 3.10.15 to 3.10.16
Bumps [oj](https://github.com/ohler55/oj) from 3.10.15 to 3.10.16.
- [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.15...v3.10.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
812ae0980f Bump bootstrap from 4.5.2 to 4.5.3
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.2 to 4.5.3.
- [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.5.2...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
Brenda Wallace
43a577fa50 Update rubocop config 2021-01-05 19:46:07 +13:00
Brenda Wallace
26f1991d16 Adding back the TODO detector, haml, and node security 2021-01-05 19:46:07 +13:00
Brenda Wallace
acf9f48478 Update rubocop 2021-01-05 19:46:07 +13:00
Brenda Wallace
4c6b37ee52 New codeclimate config syntax 2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
ef4ebdafd3 Bump better_errors from 2.9.0 to 2.9.1
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.9.0...v2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
0500ec4978 Bump friendly_id from 5.4.0 to 5.4.1
Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.4.0 to 5.4.1.
- [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.4.0...5.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
dependabot-preview[bot]
04b4d9727f Bump better_errors from 2.8.3 to 2.9.0
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.3 to 2.9.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.3...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 19:46:07 +13:00
Brenda Wallace
27f95359c3 Merge branch 'mainline' into dev 2021-01-05 19:29:43 +13:00
Brenda Wallace
9d6d9b9647 add back the name of item we're linking to when adding a photo 2021-01-05 17:15:58 +13:00
Brenda Wallace
eb86325246 add flickr keys to ci 2021-01-05 17:15:58 +13:00
codefactor-io
998f1fc5ac [CodeFactor] Apply fixes 2021-01-05 17:15:58 +13:00
Brenda Wallace
f90be934a7 Reconnecting stale flickr auth tokens 2021-01-05 17:15:58 +13:00
dependabot-preview[bot]
95da3dc425 Merge pull request #2716 from Growstuff/dependabot/bundler/faraday-1.3.0 2021-01-04 14:08:28 +00:00
dependabot-preview[bot]
fab71d5d1c Bump faraday from 1.1.0 to 1.3.0
Bumps [faraday](https://github.com/lostisland/faraday) from 1.1.0 to 1.3.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/v1.1.0...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 13:49:00 +00:00
dependabot-preview[bot]
fe2b653ab5 Merge pull request #2704 from Growstuff/dependabot/bundler/js-routes-1.4.13 2021-01-04 13:47:05 +00:00
dependabot-preview[bot]
21a59c1d58 Bump js-routes from 1.4.11 to 1.4.13
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.11 to 1.4.13.
- [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.11...v1.4.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 13:30:39 +00:00
dependabot-preview[bot]
7ac44a506c Merge pull request #2715 from Growstuff/dependabot/bundler/cancancan-3.2.1 2021-01-04 13:25:04 +00:00
dependabot-preview[bot]
e6d5bbe219 Bump cancancan from 3.1.0 to 3.2.1
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 3.1.0 to 3.2.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.1.0...3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 13:08:12 +00:00
dependabot-preview[bot]
241cbc67a3 Merge pull request #2710 from Growstuff/dependabot/bundler/rake-13.0.3 2021-01-04 13:06:26 +00:00
dependabot-preview[bot]
2267a63e18 Bump rake from 13.0.1 to 13.0.3
Bumps [rake](https://github.com/ruby/rake) from 13.0.1 to 13.0.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/v13.0.1...v13.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 12:49:01 +00:00
dependabot-preview[bot]
fb96558443 Merge pull request #2714 from Growstuff/dependabot/bundler/rspec-rails-4.0.2 2021-01-04 12:47:20 +00:00
dependabot-preview[bot]
22297c76f6 Bump rspec-rails from 4.0.1 to 4.0.2
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 12:28:56 +00:00
dependabot-preview[bot]
130416e0c1 Merge pull request #2709 from Growstuff/dependabot/bundler/rubocop-rails-2.9.1 2021-01-04 12:26:16 +00:00
dependabot-preview[bot]
5d93b5af7d Bump rubocop-rails from 2.9.0 to 2.9.1
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.9.0 to 2.9.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.9.0...v2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 12:06:50 +00:00
dependabot-preview[bot]
ca6577233e Merge pull request #2712 from Growstuff/dependabot/bundler/unicorn-5.8.0 2021-01-04 12:04:44 +00:00
dependabot-preview[bot]
1daf11d623 Bump unicorn from 5.7.0 to 5.8.0
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.7.0 to 5.8.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 11:47:44 +00:00
dependabot-preview[bot]
8d14eb1c49 [Security] Bump nokogiri from 1.10.10 to 1.11.0
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.0. **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.10...v1.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-05 00:44:51 +13:00
Brenda Wallace
147eba83d1 break out steps of setup 2021-01-04 23:04:58 +13:00
Brenda Wallace
fb9c42aaf5 use codeclimate from gem 2021-01-04 23:04:58 +13:00
Brenda Wallace
441831f9a5 use apt-get instead of apt 2021-01-04 23:04:58 +13:00
Brenda Wallace
a2b2ac99a5 Remove duplicate env var 2021-01-04 23:04:58 +13:00
Brenda Wallace
1f9de77648 install chrome in gh workflow 2021-01-04 23:04:58 +13:00
Brenda Wallace
e8db5ad142 Move env variable to on place in gh workflow config 2021-01-04 23:04:58 +13:00
Brenda Wallace
e2c0418ab8 remove reference to coveralls 2021-01-04 23:04:58 +13:00
Brenda Wallace
55f36885a6 Rename ci step to "start elasticsearch" 2021-01-04 23:04:58 +13:00
Brenda Wallace
b2f06b7a47 Removing coveralls 2021-01-04 23:04:58 +13:00
Brenda Wallace
df8fade89d Only run travis on deploy 2021-01-04 23:04:58 +13:00
Brenda Wallace
6229c41aa5 adding RAILS_SECRET_TOKEN: supersecret 2021-01-04 23:04:58 +13:00
Brenda Wallace
d79dbf09b5 devise secrets needs to match 2021-01-04 23:04:58 +13:00
Brenda Wallace
fae8026d11 Set elasticsearch to 7.5.1 2021-01-04 23:04:58 +13:00
Brenda Wallace
af11977188 Add elastic search 2021-01-04 23:04:58 +13:00
Brenda Wallace
6e09095182 Only run on pull requests 2021-01-04 23:04:58 +13:00
Brenda Wallace
a0914ac89b Run the rspec on github 2021-01-04 23:04:58 +13:00
dependabot-preview[bot]
cb9f101652 Merge pull request #2705 from Growstuff/dependabot/bundler/puma-5.1.1 2021-01-04 09:56:20 +00:00
dependabot-preview[bot]
05e72df177 Bump puma from 5.1.0 to 5.1.1
Bumps [puma](https://github.com/puma/puma) from 5.1.0 to 5.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/v5.1.0...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 09:23:21 +00:00
dependabot-preview[bot]
73bd7f3a15 Merge pull request #2707 from Growstuff/dependabot/bundler/bullet-6.1.2 2021-01-04 09:20:42 +00:00
dependabot-preview[bot]
acaa2e385f Bump bullet from 6.1.0 to 6.1.2
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.0 to 6.1.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.1.0...6.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-04 08:58:44 +00:00
dependabot-preview[bot]
5bfaa766fb Merge pull request #2713 from Growstuff/dependabot/bundler/oj-3.10.18 2021-01-04 08:56:03 +00:00
dependabot-preview[bot]
e947cbb87d Bump oj from 3.10.16 to 3.10.18
Bumps [oj](https://github.com/ohler55/oj) from 3.10.16 to 3.10.18.
- [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.16...v3.10.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-28 07:39:19 +00:00
dependabot-preview[bot]
a64994c58c Bump listen from 3.3.1 to 3.3.3
Bumps [listen](https://github.com/guard/listen) from 3.3.1 to 3.3.3.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.3.1...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-22 11:38:00 +13:00
Brenda Wallace
194f360ddb Create brakeman-analysis.yml 2020-12-10 12:53:34 +13:00
dependabot-preview[bot]
77afb28b2f Bump rubocop-rails from 2.8.1 to 2.9.0
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.1 to 2.9.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.8.1...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-10 12:49:59 +13:00
dependabot-preview[bot]
c26c159c73 Bump puma from 5.0.4 to 5.1.0
Bumps [puma](https://github.com/puma/puma) from 5.0.4 to 5.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/v5.0.4...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-06 10:48:56 +13:00
dependabot-preview[bot]
1305138cec Bump scout_apm from 2.6.10 to 4.0.0
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.10 to 4.0.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.6.10...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-05 14:45:16 +13:00
Brenda Wallace
b018553059 Merge pull request #2700 from Growstuff/dependabot/bundler/haml-5.2.1
Bump haml from 5.2.0 to 5.2.1
2020-12-03 14:08:32 +13:00
dependabot-preview[bot]
61eb20bab2 Bump haml from 5.2.0 to 5.2.1
Bumps [haml](https://github.com/haml/haml) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v5.2.0...5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-01 08:17:46 +00:00
Brenda Wallace
76b3e69888 Merge pull request #2694 from Growstuff/dependabot/bundler/faker-2.15.1
Bump faker from 2.14.0 to 2.15.1
2020-12-01 18:24:52 +13:00
dependabot-preview[bot]
b7d34528e6 Bump faker from 2.14.0 to 2.15.1
Bumps [faker](https://github.com/faker-ruby/faker) from 2.14.0 to 2.15.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.14.0...v2.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-30 10:00:55 +00:00
dependabot-preview[bot]
2aeab89e94 Merge pull request #2693 from Growstuff/dependabot/bundler/searchkick-4.4.2 2020-11-30 09:58:48 +00:00
dependabot-preview[bot]
7d7e9d7d0f Bump searchkick from 4.4.1 to 4.4.2
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.4.1 to 4.4.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.4.1...v4.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-30 08:34:16 +00:00
dependabot-preview[bot]
5e6f373234 Merge pull request #2696 from Growstuff/dependabot/bundler/loofah-2.8.0 2020-11-30 08:31:51 +00:00
dependabot-preview[bot]
522ff9a29d Bump loofah from 2.7.0 to 2.8.0
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.7.0 to 2.8.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.7.0...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-30 08:05:07 +00:00
dependabot-preview[bot]
9ef116df87 Merge pull request #2692 from Growstuff/dependabot/bundler/jsonapi-swagger-0.8.1 2020-11-30 08:02:54 +00:00
dependabot-preview[bot]
5ab2891a13 Bump jsonapi-swagger from 0.8.0 to 0.8.1
Bumps [jsonapi-swagger](https://github.com/superiorlu/jsonapi-swagger) from 0.8.0 to 0.8.1.
- [Release notes](https://github.com/superiorlu/jsonapi-swagger/releases)
- [Commits](https://github.com/superiorlu/jsonapi-swagger/compare/v0.8.0...v0.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-30 07:17:20 +00:00
dependabot-preview[bot]
3c668ee30f Merge pull request #2691 from Growstuff/dependabot/bundler/xmlrpc-0.3.1 2020-11-30 07:14:30 +00:00
dependabot-preview[bot]
820dd45de3 Bump xmlrpc from 0.3.0 to 0.3.1
Bumps [xmlrpc](https://github.com/ruby/xmlrpc) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/ruby/xmlrpc/releases)
- [Changelog](https://github.com/ruby/xmlrpc/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/xmlrpc/compare/v0.3.0...v0.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-30 06:50:42 +00:00
dependabot-preview[bot]
1487d5671a Merge pull request #2697 from Growstuff/dependabot/bundler/capybara-3.34.0 2020-11-30 06:48:14 +00:00
dependabot-preview[bot]
d240f49d77 Bump capybara from 3.33.0 to 3.34.0
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.33.0 to 3.34.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.33.0...3.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-27 07:13:39 +00:00
Brenda Wallace
4912ef43bf Merge pull request #2690 from Growstuff/dependabot/bundler/js-routes-1.4.11
Bump js-routes from 1.4.9 to 1.4.11
2020-11-19 14:33:55 +13:00
dependabot-preview[bot]
91f9230385 Bump js-routes from 1.4.9 to 1.4.11
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.9 to 1.4.11.
- [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.9...v1.4.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-18 07:35:27 +00:00
Brenda Wallace
b7ccc32560 Merge pull request #2689 from Growstuff/dependabot/bundler/listen-3.3.1
Bump listen from 3.2.1 to 3.3.1
2020-11-18 12:09:29 +13:00
dependabot-preview[bot]
6392a1a722 Bump listen from 3.2.1 to 3.3.1
Bumps [listen](https://github.com/guard/listen) from 3.2.1 to 3.3.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.2.1...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-16 08:25:33 +00:00
Brenda Wallace
77d41ea71a Merge pull request #2688 from Growstuff/dependabot/bundler/oj-3.10.16
Bump oj from 3.10.15 to 3.10.16
2020-11-13 15:57:26 +13:00
dependabot-preview[bot]
220e8d6ecc Bump oj from 3.10.15 to 3.10.16
Bumps [oj](https://github.com/ohler55/oj) from 3.10.15 to 3.10.16.
- [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.15...v3.10.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-12 02:30:28 +00:00
Brenda Wallace
9835d05299 Merge pull request #2685 from Growstuff/dependabot/bundler/bootstrap-4.5.3
Bump bootstrap from 4.5.2 to 4.5.3
2020-11-12 15:28:38 +13:00
dependabot-preview[bot]
25254323cd Bump bootstrap from 4.5.2 to 4.5.3
Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.2 to 4.5.3.
- [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.5.2...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-11 01:57:11 +00:00
Brenda Wallace
4553eb9cac Merge pull request #2687 from Br3nda/feature/codeclimate-config-udpate
New codeclimate config syntax
2020-11-11 14:55:10 +13:00
Brenda Wallace
d4a3da0ee4 Update rubocop config 2020-11-11 14:49:17 +13:00
Brenda Wallace
58f7ba9ff5 Adding back the TODO detector, haml, and node security 2020-11-11 14:45:29 +13:00
Brenda Wallace
b433e81303 Update rubocop 2020-11-11 14:32:01 +13:00
Brenda Wallace
885fa55461 Merge branch 'dev' into feature/codeclimate-config-udpate 2020-11-11 14:29:49 +13:00
Brenda Wallace
612e8b130a New codeclimate config syntax 2020-11-11 14:29:17 +13:00
Brenda Wallace
7173aacbe9 Merge pull request #2683 from Growstuff/dependabot/bundler/better_errors-2.9.1
Bump better_errors from 2.9.0 to 2.9.1
2020-11-09 21:34:50 +13:00
dependabot-preview[bot]
9d5a367766 Bump better_errors from 2.9.0 to 2.9.1
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.9.0...v2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-08 21:38:52 +00:00
Brenda Wallace
e3571b3b9e Merge pull request #2684 from Growstuff/dependabot/bundler/friendly_id-5.4.1
Bump friendly_id from 5.4.0 to 5.4.1
2020-11-09 10:37:02 +13:00
dependabot-preview[bot]
866f08cec2 Bump friendly_id from 5.4.0 to 5.4.1
Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.4.0 to 5.4.1.
- [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.4.0...5.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-06 07:26:25 +00:00
Brenda Wallace
ac1ab61151 Merge pull request #2682 from Growstuff/dependabot/bundler/better_errors-2.9.0
Bump better_errors from 2.8.3 to 2.9.0
2020-11-06 11:11:20 +13:00
dependabot-preview[bot]
9b2082a3bc Bump better_errors from 2.8.3 to 2.9.0
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.3 to 2.9.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.3...v2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-05 07:33:12 +00:00
Brenda Wallace
67b79fc832 Merge pull request #2680 from Growstuff/dev
Production release
2020-11-03 15:36:21 +13:00
dependabot-preview[bot]
b176e76ea3 Merge pull request #2668 from Growstuff/dependabot/bundler/faraday-1.1.0 2020-11-02 23:07:13 +00:00
dependabot-preview[bot]
351c0d919d Bump faraday from 1.0.1 to 1.1.0
Bumps [faraday](https://github.com/lostisland/faraday) from 1.0.1 to 1.1.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/v1.0.1...v1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-02 21:55:43 +00:00
dependabot-preview[bot]
204eb2ee9e Merge pull request #2678 from Growstuff/dependabot/bundler/puma-5.0.4 2020-11-02 21:53:49 +00:00
dependabot-preview[bot]
f74d239a77 Bump puma from 5.0.2 to 5.0.4
Bumps [puma](https://github.com/puma/puma) from 5.0.2 to 5.0.4.
- [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/v5.0.2...v5.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-02 20:40:50 +00:00
dependabot-preview[bot]
f2b5927d11 Merge pull request #2670 from Growstuff/dependabot/bundler/omniauth-facebook-8.0.0 2020-11-02 20:38:49 +00:00
dependabot-preview[bot]
97e887673d Bump omniauth-facebook from 7.0.0 to 8.0.0
Bumps [omniauth-facebook](https://github.com/simi/omniauth-facebook) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/simi/omniauth-facebook/releases)
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/simi/omniauth-facebook/compare/v7.0.0...v8.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-02 18:05:50 +00:00
Rowan Crawford
3c8b59811b ws, is there no prettier equivalent? 2020-11-03 07:03:13 +13:00
Rowan Crawford
5afbdf7096 CONTRIBUTORS.md 2020-11-03 07:03:13 +13:00
Rowan Crawford
7d2525cad6 If you get a harvest without a planting the harvest chart wouldn't show 2020-11-03 07:03:13 +13:00
Rowan Crawford
c889b63611 the answer is not mutating @crop 2020-11-03 07:03:13 +13:00
Brenda Wallace
d36d5ff1e3 mark test as javascript 2020-11-03 07:03:13 +13:00
Rowan Crawford
86c832d6ad ws 2020-11-03 07:03:13 +13:00
Rowan Crawford
59a693ec1f test doesn't work because don't understand how to write specs 2020-11-03 07:03:13 +13:00
Rowan Crawford
63972763ec Put if statements about each chart block 2020-11-03 07:03:13 +13:00
Awesome Code
b6f8eba243 Auto corrected by following Format Css Code 2020-11-03 07:01:06 +13:00
Brenda Wallace
fae896e38e Merge remote-tracking branch 'upstream/mainline' into dev
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/overrides.scss
2020-10-29 09:37:42 +13:00
dependabot-preview[bot]
9bcf0aba0e [Security] Bump lodash from 4.17.14 to 4.17.20
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.14 to 4.17.20. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.14...4.17.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-29 09:36:02 +13:00
dependabot-preview[bot]
506c66af84 Merge pull request #2672 from Growstuff/dependabot/bundler/scout_apm-2.6.10 2020-10-27 02:15:22 +00:00
dependabot-preview[bot]
94c78e0bf4 Bump scout_apm from 2.6.9 to 2.6.10
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.9 to 2.6.10.
- [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.9...v2.6.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-26 23:41:34 +00:00
dependabot-preview[bot]
72db013fbe Merge pull request #2669 from Growstuff/dependabot/bundler/oj-3.10.15 2020-10-26 23:39:31 +00:00
dependabot-preview[bot]
8ea96d08a9 Bump oj from 3.10.14 to 3.10.15
Bumps [oj](https://github.com/ohler55/oj) from 3.10.14 to 3.10.15.
- [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.14...v3.10.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-26 20:57:42 +00:00
dependabot-preview[bot]
f56bb5c7cf Bump platform-api from 3.0.0 to 3.2.0
Bumps [platform-api](https://github.com/heroku/platform-api) from 3.0.0 to 3.2.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/v3.0.0...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-27 09:54:13 +13:00
dependabot-preview[bot]
a731cadef9 Bump chartkick from 3.4.1 to 3.4.2
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.4.1 to 3.4.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.4.1...v3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-27 09:53:43 +13:00
dependabot-preview[bot]
c929a11ddf Merge pull request #2666 from Growstuff/dependabot/bundler/capybara-screenshot-1.0.25 2020-10-24 04:28:08 +00:00
dependabot-preview[bot]
0f7af8e04b Bump capybara-screenshot from 1.0.24 to 1.0.25
Bumps [capybara-screenshot](https://github.com/mattheworiordan/capybara-screenshot) from 1.0.24 to 1.0.25.
- [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.24...v1.0.25)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-24 03:23:15 +00:00
dependabot-preview[bot]
202caa0b45 Bump rubocop-rspec from 1.43.2 to 1.44.1
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.43.2 to 1.44.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.43.2...v1.44.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-24 16:20:52 +13:00
dependabot-preview[bot]
ea509954c0 Bump font-awesome-sass from 5.13.0 to 5.15.1
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.13.0 to 5.15.1.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.13.0...5.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 13:20:16 +13:00
Awesome Code
8bd8904baa Auto corrected by following Format Css Code 2020-10-20 12:18:51 +13:00
Brenda Wallace
7d1e1dd29f Cards raised on hover 2020-10-20 12:03:06 +13:00
Brenda Wallace
61b03c5d71 Make the connecting to flickr more obvious
by making it a button with an icon
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
f9cbabb35f Bump timecop from 0.9.1 to 0.9.2
Bumps [timecop](https://github.com/travisjeffery/timecop) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/travisjeffery/timecop/releases)
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md)
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.1...v0.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
ad2acd46d4 Bump rubocop from 0.93.0 to 0.93.1
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.0 to 0.93.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.93.0...v0.93.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
4ec7134fdf Bump geocoder from 1.6.3 to 1.6.4
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.6.3 to 1.6.4.
- [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.3...v1.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
d52f4c0afa Bump rubocop from 0.92.0 to 0.93.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.92.0 to 0.93.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.92.0...v0.93.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
f7cf49bdcd Bump haml from 5.1.2 to 5.2.0
Bumps [haml](https://github.com/haml/haml) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v5.1.2...v5.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
4e1711849e Bump better_errors from 2.8.2 to 2.8.3
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.2...v2.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
9f43a18600 Bump chartkick from 3.4.0 to 3.4.1
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.4.0 to 3.4.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.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
7f515c58f8 Bump dalli from 2.7.10 to 2.7.11
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.10 to 2.7.11.
- [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.10...v2.7.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
4960b33ed2 Bump faker from 2.13.0 to 2.14.0
Bumps [faker](https://github.com/faker-ruby/faker) from 2.13.0 to 2.14.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.13.0...v2.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
f5217b0709 Bump validate_url from 1.0.11 to 1.0.13
Bumps [validate_url](https://github.com/perfectline/validates_url) from 1.0.11 to 1.0.13.
- [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-10-20 12:03:06 +13:00
dependabot-preview[bot]
010bd4553a Bump rubocop from 0.91.0 to 0.92.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.91.0 to 0.92.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.91.0...v0.92.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
7c3d8de35a Bump puma from 4.3.6 to 5.0.2
Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 5.0.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.6...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
b49fddefd1 Bump better_errors from 2.7.1 to 2.8.2
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.7.1 to 2.8.2.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
5b2b5f2af4 Bump haml_lint from 0.35.0 to 0.36.0
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.35.0 to 0.36.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.35.0...v0.36.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
0f2f3ac51e Bump devise from 4.7.2 to 4.7.3
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.2 to 4.7.3.
- [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.2...v4.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
8508d21585 Bump query_diet from 0.6.2 to 0.7.0
Bumps [query_diet](https://github.com/makandra/query_diet) from 0.6.2 to 0.7.0.
- [Release notes](https://github.com/makandra/query_diet/releases)
- [Changelog](https://github.com/makandra/query_diet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/makandra/query_diet/compare/v0.6.2...v0.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
bb23534b97 Bump rubocop-rails from 2.8.0 to 2.8.1
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.0 to 2.8.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.8.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
Brenda Wallace
452f58ccf6 bump codeclimate to rubocop 0.91 2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
28a117dad6 Bump rubocop from 0.90.0 to 0.91.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.90.0 to 0.91.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.90.0...v0.91.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
Brenda Wallace
bec1ab8c5b Match Gemfile ruby version in .ruby-version 2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
57dcacdfec Bump percy-capybara from 4.3.2 to 4.3.3
Bumps [percy-capybara](https://github.com/percy/percy-capybara) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/percy/percy-capybara/releases)
- [Commits](https://github.com/percy/percy-capybara/compare/v4.3.2...v4.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
3e38e30f4f Bump unicorn from 5.6.0 to 5.7.0
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.6.0 to 5.7.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
454a8857df Bump rspectre from 0.0.1 to 0.0.3
Bumps [rspectre](https://github.com/dgollahon/rspectre) from 0.0.1 to 0.0.3.
- [Release notes](https://github.com/dgollahon/rspectre/releases)
- [Changelog](https://github.com/dgollahon/rspectre/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dgollahon/rspectre/compare/v0.0.1...v0.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
fbfbc67a05 Bump sidekiq from 6.1.1 to 6.1.2
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.1 to 6.1.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.1.1...v6.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
99f38bcfba Bump leaflet-rails from 1.6.0 to 1.7.0
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases)
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
7beec65fe9 Bump rack-protection from 2.0.8.1 to 2.1.0
Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.8.1 to 2.1.0.
- [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.8.1...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
dependabot-preview[bot]
5961bd3a3f Bump oj from 3.10.13 to 3.10.14
Bumps [oj](https://github.com/ohler55/oj) from 3.10.13 to 3.10.14.
- [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.13...v3.10.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-20 12:03:06 +13:00
Brenda Wallace
5b272a5d33 Merge remote-tracking branch 'upstream/mainline' into dev 2020-10-16 15:48:35 +13:00
Brenda Wallace
7c526d4b11 Cards raised on hover 2020-10-16 15:46:34 +13:00
Brenda Wallace
b9e68d09ca Make the connecting to flickr more obvious
by making it a button with an icon
2020-10-16 12:05:42 +13:00
dependabot-preview[bot]
8a3e310a84 Bump timecop from 0.9.1 to 0.9.2
Bumps [timecop](https://github.com/travisjeffery/timecop) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/travisjeffery/timecop/releases)
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md)
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.1...v0.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-16 11:07:38 +13:00
dependabot-preview[bot]
b23b372c8c Bump rubocop from 0.93.0 to 0.93.1
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.0 to 0.93.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.93.0...v0.93.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-14 16:20:23 +13:00
dependabot-preview[bot]
98dc9636df Bump geocoder from 1.6.3 to 1.6.4
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.6.3 to 1.6.4.
- [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.3...v1.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-12 18:34:12 +13:00
dependabot-preview[bot]
b965f09ee3 Merge pull request #2659 from Growstuff/dependabot/bundler/rubocop-0.93.0 2020-10-10 06:50:01 +00:00
dependabot-preview[bot]
e8a5936eca Bump rubocop from 0.92.0 to 0.93.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.92.0 to 0.93.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.92.0...v0.93.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-10 06:27:38 +00:00
dependabot-preview[bot]
d247be5b12 Merge pull request #2655 from Growstuff/dependabot/bundler/haml-5.2.0 2020-10-10 06:25:53 +00:00
dependabot-preview[bot]
45a48394e6 Bump haml from 5.1.2 to 5.2.0
Bumps [haml](https://github.com/haml/haml) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v5.1.2...v5.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-10 05:58:15 +00:00
dependabot-preview[bot]
504163bda8 Merge pull request #2656 from Growstuff/dependabot/bundler/better_errors-2.8.3 2020-10-10 05:56:34 +00:00
dependabot-preview[bot]
fbe65988d1 Bump better_errors from 2.8.2 to 2.8.3
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.8.2...v2.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-10 05:34:42 +00:00
dependabot-preview[bot]
0f178d8608 Bump chartkick from 3.4.0 to 3.4.1
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.4.0 to 3.4.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.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-10 18:32:48 +13:00
dependabot-preview[bot]
985356e055 Merge pull request #2651 from Growstuff/dependabot/bundler/dalli-2.7.11 2020-10-02 00:28:23 +00:00
dependabot-preview[bot]
3baa39cb72 Bump dalli from 2.7.10 to 2.7.11
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.10 to 2.7.11.
- [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.10...v2.7.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-02 00:07:46 +00:00
dependabot-preview[bot]
b68e6844ab Merge pull request #2641 from Growstuff/dependabot/bundler/faker-2.14.0 2020-10-02 00:06:01 +00:00
dependabot-preview[bot]
75fec864fd Bump faker from 2.13.0 to 2.14.0
Bumps [faker](https://github.com/faker-ruby/faker) from 2.13.0 to 2.14.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.13.0...v2.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-01 23:44:10 +00:00
dependabot-preview[bot]
9af346ffb1 Merge pull request #2648 from Growstuff/dependabot/bundler/validate_url-1.0.13 2020-10-01 23:42:26 +00:00
dependabot-preview[bot]
100db699ae Bump validate_url from 1.0.11 to 1.0.13
Bumps [validate_url](https://github.com/perfectline/validates_url) from 1.0.11 to 1.0.13.
- [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-10-01 23:20:49 +00:00
dependabot-preview[bot]
205b1967de Merge pull request #2650 from Growstuff/dependabot/bundler/rubocop-0.92.0 2020-10-01 23:18:44 +00:00
dependabot-preview[bot]
aacd276359 Bump rubocop from 0.91.0 to 0.92.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.91.0 to 0.92.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.91.0...v0.92.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-01 22:53:29 +00:00
dependabot-preview[bot]
bd2b917b0b Merge pull request #2652 from Growstuff/dependabot/bundler/puma-5.0.2 2020-10-01 22:51:36 +00:00
dependabot-preview[bot]
526a6688bc Bump puma from 4.3.6 to 5.0.2
Bumps [puma](https://github.com/puma/puma) from 4.3.6 to 5.0.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.6...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-01 22:11:14 +00:00
dependabot-preview[bot]
40f82843b2 Merge pull request #2654 from Growstuff/dependabot/bundler/better_errors-2.8.2 2020-10-01 22:09:17 +00:00
dependabot-preview[bot]
1a1a70bebc Bump better_errors from 2.7.1 to 2.8.2
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.7.1 to 2.8.2.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-01 21:47:58 +00:00
dependabot-preview[bot]
ea707c082a Merge pull request #2653 from Growstuff/dependabot/bundler/haml_lint-0.36.0 2020-10-01 21:45:49 +00:00
dependabot-preview[bot]
137385ea6f Bump haml_lint from 0.35.0 to 0.36.0
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.35.0 to 0.36.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.35.0...v0.36.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-01 08:06:34 +00:00
dependabot-preview[bot]
84102b7ed9 Bump devise from 4.7.2 to 4.7.3
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.2 to 4.7.3.
- [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.2...v4.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-28 18:58:23 +13:00
dependabot-preview[bot]
a350cc02d4 Bump query_diet from 0.6.2 to 0.7.0
Bumps [query_diet](https://github.com/makandra/query_diet) from 0.6.2 to 0.7.0.
- [Release notes](https://github.com/makandra/query_diet/releases)
- [Changelog](https://github.com/makandra/query_diet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/makandra/query_diet/compare/v0.6.2...v0.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-28 18:47:38 +13:00
dependabot-preview[bot]
9782708a78 Merge pull request #2640 from Growstuff/dependabot/bundler/rubocop-rails-2.8.1 2020-09-18 04:17:57 +00:00
dependabot-preview[bot]
89e3a05003 Bump rubocop-rails from 2.8.0 to 2.8.1
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.8.0 to 2.8.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.8.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-18 03:57:04 +00:00
Brenda Wallace
0300471762 bump codeclimate to rubocop 0.91 2020-09-18 15:54:57 +12:00
dependabot-preview[bot]
f1fa7dce55 Bump rubocop from 0.90.0 to 0.91.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.90.0 to 0.91.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.90.0...v0.91.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-18 15:54:57 +12:00
Brenda Wallace
30d7d4a288 Match Gemfile ruby version in .ruby-version 2020-09-14 09:24:40 +12:00
dependabot-preview[bot]
ca2407928c Bump percy-capybara from 4.3.2 to 4.3.3
Bumps [percy-capybara](https://github.com/percy/percy-capybara) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/percy/percy-capybara/releases)
- [Commits](https://github.com/percy/percy-capybara/compare/v4.3.2...v4.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-11 16:21:13 +12:00
dependabot-preview[bot]
48dfdbb1a7 Merge pull request #2636 from Growstuff/dependabot/bundler/unicorn-5.7.0 2020-09-10 03:11:20 +00:00
dependabot-preview[bot]
ce0d93b8e1 Bump unicorn from 5.6.0 to 5.7.0
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.6.0 to 5.7.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-10 02:48:57 +00:00
dependabot-preview[bot]
e8762d9808 Merge pull request #2635 from Growstuff/dependabot/bundler/rspectre-0.0.3 2020-09-10 02:47:10 +00:00
dependabot-preview[bot]
c2486c27e3 Bump rspectre from 0.0.1 to 0.0.3
Bumps [rspectre](https://github.com/dgollahon/rspectre) from 0.0.1 to 0.0.3.
- [Release notes](https://github.com/dgollahon/rspectre/releases)
- [Changelog](https://github.com/dgollahon/rspectre/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dgollahon/rspectre/compare/v0.0.1...v0.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-10 02:25:08 +00:00
dependabot-preview[bot]
03d0fd6fd7 Merge pull request #2633 from Growstuff/dependabot/bundler/sidekiq-6.1.2 2020-09-10 02:23:29 +00:00
dependabot-preview[bot]
5eacbbf661 Bump sidekiq from 6.1.1 to 6.1.2
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.1 to 6.1.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.1.1...v6.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 07:14:07 +00:00
dependabot-preview[bot]
893240610a Merge pull request #2631 from Growstuff/dependabot/bundler/leaflet-rails-1.7.0 2020-09-08 05:03:19 +00:00
dependabot-preview[bot]
5275b4975e Bump leaflet-rails from 1.6.0 to 1.7.0
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/axyjo/leaflet-rails/releases)
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 04:41:41 +00:00
dependabot-preview[bot]
e52c151306 Merge pull request #2632 from Growstuff/dependabot/bundler/rack-protection-2.1.0 2020-09-08 04:39:58 +00:00
dependabot-preview[bot]
ad8c3d647c Bump rack-protection from 2.0.8.1 to 2.1.0
Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.8.1 to 2.1.0.
- [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.8.1...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 04:19:12 +00:00
dependabot-preview[bot]
e591ecf377 Merge pull request #2630 from Growstuff/dependabot/bundler/oj-3.10.14 2020-09-08 04:17:08 +00:00
dependabot-preview[bot]
3c5e88f0f3 Bump oj from 3.10.13 to 3.10.14
Bumps [oj](https://github.com/ohler55/oj) from 3.10.13 to 3.10.14.
- [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.13...v3.10.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 03:57:31 +00:00
dependabot-preview[bot]
6c6c8b81e6 Bump puma from 4.3.5 to 4.3.6
Bumps [puma](https://github.com/puma/puma) from 4.3.5 to 4.3.6.
- [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.5...v4.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 15:56:26 +12:00
dependabot-preview[bot]
b241e17132 Bump rubocop-rails from 2.7.1 to 2.8.0
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.7.1 to 2.8.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.7.1...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 15:56:26 +12:00
dependabot-preview[bot]
18a8ae6ca3 Bump percy-capybara from 4.2.0 to 4.3.2
Bumps [percy-capybara](https://github.com/percy/percy-capybara) from 4.2.0 to 4.3.2.
- [Release notes](https://github.com/percy/percy-capybara/releases)
- [Commits](https://github.com/percy/percy-capybara/compare/v4.2.0...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 15:56:26 +12:00
Brenda Wallace
59e32e74ed bump rubocop to 0.90 on codeclimate 2020-09-08 15:56:26 +12:00
dependabot-preview[bot]
cfff7c1811 Bump rubocop from 0.89.1 to 0.90.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.89.1 to 0.90.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.89.1...v0.90.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 15:56:26 +12:00
dependabot-preview[bot]
c1d6d2c386 Bump oj from 3.10.12 to 3.10.13
Bumps [oj](https://github.com/ohler55/oj) from 3.10.12 to 3.10.13.
- [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.12...v3.10.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-08 15:56:26 +12:00
Brenda Wallace
1dfd9f0062 Merge pull request #2629 from Growstuff/dependabot/bundler/puma-4.3.6
Bump puma from 4.3.5 to 4.3.6
2020-09-08 15:55:37 +12:00
dependabot-preview[bot]
9956d64462 Bump puma from 4.3.5 to 4.3.6
Bumps [puma](https://github.com/puma/puma) from 4.3.5 to 4.3.6.
- [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.5...v4.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-07 07:42:27 +00:00
Brenda Wallace
82edcb8557 Merge branch 'mainline' into dev 2020-09-07 09:35:37 +12:00
Brenda Wallace
21330f55b0 Merge pull request #2627 from Growstuff/dependabot/bundler/rubocop-rails-2.8.0
Bump rubocop-rails from 2.7.1 to 2.8.0
2020-09-07 09:35:00 +12:00
dependabot-preview[bot]
08f583d33f Bump rubocop-rails from 2.7.1 to 2.8.0
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.7.1 to 2.8.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.7.1...v2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-04 07:15:40 +00:00
Brenda Wallace
7337f10c3e Merge pull request #2626 from Growstuff/dependabot/bundler/percy-capybara-4.3.2
Bump percy-capybara from 4.2.0 to 4.3.2
2020-09-04 09:24:40 +12:00
dependabot-preview[bot]
7f5013ce89 Bump percy-capybara from 4.2.0 to 4.3.2
Bumps [percy-capybara](https://github.com/percy/percy-capybara) from 4.2.0 to 4.3.2.
- [Release notes](https://github.com/percy/percy-capybara/releases)
- [Commits](https://github.com/percy/percy-capybara/compare/v4.2.0...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-03 07:15:40 +00:00
Brenda Wallace
a37a86f1ae Merge pull request #2625 from Growstuff/dependabot/bundler/rubocop-0.90.0
Bump rubocop from 0.89.1 to 0.90.0
2020-09-02 14:57:38 +12:00
Brenda Wallace
67f2d54ef8 bump rubocop to 0.90 on codeclimate 2020-09-02 10:34:59 +12:00
dependabot-preview[bot]
8ee5e9b01b Bump rubocop from 0.89.1 to 0.90.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.89.1 to 0.90.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.89.1...v0.90.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-01 08:11:44 +00:00
Brenda Wallace
f5f1d996be Merge pull request #2624 from Growstuff/dependabot/bundler/oj-3.10.13
Bump oj from 3.10.12 to 3.10.13
2020-09-01 10:51:24 +12:00
dependabot-preview[bot]
06b5443a22 Bump oj from 3.10.12 to 3.10.13
Bumps [oj](https://github.com/ohler55/oj) from 3.10.12 to 3.10.13.
- [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.12...v3.10.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-28 07:13:59 +00:00
Brenda Wallace
a2e9886366 Merge pull request #2620 from Growstuff/dev
Production deploy
2020-08-28 09:29:03 +12:00
dependabot-preview[bot]
5b3a1b1d48 Merge pull request #2622 from Growstuff/dependabot/bundler/omniauth-facebook-7.0.0 2020-08-27 09:35:42 +00:00
dependabot-preview[bot]
0e39b1ab4e Bump omniauth-facebook from 6.0.0 to 7.0.0
Bumps [omniauth-facebook](https://github.com/mkdynamic/omniauth-facebook) from 6.0.0 to 7.0.0.
- [Release notes](https://github.com/mkdynamic/omniauth-facebook/releases)
- [Changelog](https://github.com/simi/omniauth-facebook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mkdynamic/omniauth-facebook/compare/v6.0.0...v7.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-27 09:13:50 +00:00
Brenda Wallace
8e4212bdbc Merge pull request #2623 from Growstuff/dependabot/bundler/loofah-2.7.0
Bump loofah from 2.6.0 to 2.7.0
2020-08-27 21:11:54 +12:00
dependabot-preview[bot]
ddf366bd3c Bump loofah from 2.6.0 to 2.7.0
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.6.0 to 2.7.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.6.0...v2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-27 07:16:03 +00:00
dependabot-preview[bot]
ed81808f58 Bump scout_apm from 2.6.8 to 2.6.9
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.8 to 2.6.9.
- [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.8...v2.6.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-27 14:19:00 +12:00
dependabot-preview[bot]
2b8286a5d6 Bump oj from 3.10.8 to 3.10.12
Bumps [oj](https://github.com/ohler55/oj) from 3.10.8 to 3.10.12.
- [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.8...v3.10.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-27 11:33:35 +12:00
Brenda Wallace
5a883aa9b3 Merge remote-tracking branch 'upstream/dev' into dev 2020-08-27 11:32:27 +12:00
Brenda Wallace
2db6ff86e5 Merge remote-tracking branch 'upstream/mainline' into dev 2020-08-27 11:32:06 +12:00
dependabot-preview[bot]
aac7d7109f Bump rubocop-rspec from 1.42.0 to 1.43.2
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.42.0 to 1.43.2.
- [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.42.0...v1.43.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-27 07:57:57 +12:00
Awesome Code
10f72d2b21 Auto corrected by following Format Css Code 2020-08-26 12:39:47 +12:00
Brenda Wallace
1179346dd5 Elastic version in example env 2020-08-26 12:36:58 +12:00
Brenda
be64224477 Cache yarn on travis 2020-08-26 12:36:58 +12:00
Brenda
d3eda90000 Adding new cops 2020-08-26 12:36:58 +12:00
Brenda
0b3583e099 DRY crops controller more 2020-08-26 12:36:58 +12:00
Brenda Wallace
0108224e4e Tests for crop creation 2020-08-26 12:36:58 +12:00
Brenda Wallace
7def8881b4 Allow discard gem upgrade 2020-08-26 12:36:58 +12:00
Brenda Wallace
c4b4d382e2 Upgrade percy-capybara 2020-08-26 12:36:58 +12:00
Brenda Wallace
2a896f99f5 Upgrade omniauth 2020-08-26 12:36:58 +12:00
Brenda Wallace
94b481efaf Upgrade to rubocop 0.89 on codeclimate 2020-08-26 12:36:58 +12:00
Brenda Wallace
08ecd0ebee Source .env when checking for elastisearch 2020-08-26 12:36:58 +12:00
Brenda Wallace
a7ab356298 Updating the setup script 2020-08-26 12:36:58 +12:00
Brenda Wallace
e029252c04 Only build dev and mainline 2020-08-26 12:36:58 +12:00
Brenda Wallace
43c1ea21b3 Configure contributor check for github actions 2020-08-26 12:36:58 +12:00
Brenda
ff87a9fa5d gem updates 2020-08-26 12:36:58 +12:00
Brenda Wallace
5b2355bf42 check out repo 2020-08-26 12:36:58 +12:00
Brenda Wallace
1c9ff5c876 removing last mention of cloudmade
this company used to produce the leaflet widget, but that staff member moved elsewhere in like 2012 and took the code with them and made it open source. the credit is no longer needed
2020-08-26 12:36:58 +12:00
Brenda Wallace
f2b385bd5e Help view spec find the correct template 2020-08-26 12:36:58 +12:00
Brenda Wallace
b1b2661682 only run static checks on github 2020-08-26 12:36:58 +12:00
Brenda Wallace
5fec0d4eb9 Adding ru files to codeclimate 2020-08-26 12:36:58 +12:00
Brenda Wallace
552ff6a680 Explaning why brakeman is off 2020-08-26 12:36:58 +12:00
Brenda Wallace
fe0157641a Removing dependabot config 2020-08-26 12:36:58 +12:00
Brenda Wallace
83699656e4 Renaming notifier to new rails 6 style 2020-08-26 12:36:58 +12:00
Brenda Wallace
b9c411d385 Removed cloudmade test 2020-08-26 12:36:58 +12:00
Brenda Wallace
96f40c9c6b Comment out a migration that needs an old gem to work 2020-08-26 12:36:58 +12:00
Brenda Wallace
ec778394ab Upgrade to activemedian 0.2.0 2020-08-26 12:36:58 +12:00
Brenda Wallace
0a604ede52 Run github actions on push, pull request 2020-08-26 12:36:58 +12:00
Brenda Wallace
2ab935918c Removed extra steps on travis 2020-08-26 12:36:58 +12:00
Brenda Wallace
d6aefc1ac7 seperate steps on travis 2020-08-26 12:36:58 +12:00
Brenda Wallace
c1922e5bc3 Remove extra env variable 2020-08-26 12:36:58 +12:00
Brenda Wallace
bf6e2719a4 Update name from Notifier to NotifierMailer 2020-08-26 12:36:58 +12:00
Brenda Wallace
18750063e8 Prepare database in travis run 2020-08-26 12:36:58 +12:00
Brenda Wallace
9b6a1b9fce Removed contributor check from travis 2020-08-26 12:36:58 +12:00
Brenda Wallace
8016a35e49 Adding contributor check to github actions 2020-08-26 12:36:58 +12:00
Brenda Wallace
bcc722d0c2 Updating content type in tests to include charset 2020-08-26 12:36:58 +12:00
Brenda Wallace
5f2010daa2 Ensuring the postgresql media functions exist 2020-08-26 12:36:58 +12:00
Brenda Wallace
fb37cf8843 Adding github actions 2020-08-26 12:36:58 +12:00
Brenda Wallace
05dabd0ded ensure the activemedian methods are in the test db 2020-08-26 12:36:58 +12:00
Brenda Wallace
f1d830bfa9 fixed ambiguous negative 2020-08-26 12:36:58 +12:00
Brenda Wallace
63caea1a6a Use member.kpt in auth 2020-08-26 12:36:58 +12:00
Brenda Wallace
cebec27e80 Prefer ary[n..] over ary[n..-1]. 2020-08-26 12:36:58 +12:00
Brenda Wallace
328afa91fa removed redundant escaping 2020-08-26 12:36:58 +12:00
Brenda Wallace
9ecab8358e run travis-ci as test 2020-08-26 12:36:58 +12:00
Brenda Wallace
133f0a563f Add active median in test runner on travis-ci 2020-08-26 12:36:58 +12:00
Brenda Wallace
4906aaa180 Rename Notifer to NotifierMailer 2020-08-26 12:36:58 +12:00
Brenda Wallace
33944adf6c Rubocop indentation fixes 2020-08-26 12:36:58 +12:00
Brenda Wallace
958ee66e79 Apply suggestions from code review 2020-08-26 12:36:58 +12:00
Brenda Wallace
6a485e9f5f Disabling brakeman on codeclimate because it doesn't understand rails 6 2020-08-26 12:36:58 +12:00
Brenda Wallace
967ae22088 Apply suggestions from code review 2020-08-26 12:36:58 +12:00
Brenda
ef37f74c0f Splitting up complex method in photos controller 2020-08-26 12:36:58 +12:00
Brenda
16895d2ddb Added missing unique constraint to garden_types 2020-08-26 12:36:58 +12:00
Brenda Wallace
234c3c604f Rubocop target is rails 6.0 2020-08-26 12:36:58 +12:00
Brenda Wallace
23fac43cad Removing link to cloudmade
because they no longer exist and the domain is used by something else now
2020-08-26 12:36:58 +12:00
Brenda Wallace
8a5a19f0c6 Removing deprecated commented out parts of application.rb 2020-08-26 12:36:58 +12:00
Brenda
13c675d6f7 rewrote order by to not be raw sql 2020-08-26 12:36:58 +12:00
Brenda
59e0a13f42 removed redundant assignment 2020-08-26 12:36:58 +12:00
Brenda Wallace
64ce6ef886 Align end 2020-08-26 12:36:58 +12:00
Brenda
5573fbfbb6 foreign key declarations not needed anymore 2020-08-26 12:36:58 +12:00
Brenda Wallace
15d72d3769 Enable the new rubocop cops 2020-08-26 12:36:58 +12:00
Brenda
c63693a68c Rubocop fixes after rails 6 upgrades 2020-08-26 12:36:58 +12:00
Brenda Wallace
9dbf8b7c8f New robocops 2020-08-26 12:36:58 +12:00
Brenda Wallace
59efe92648 Upgrade to rails 6 2020-08-26 12:36:58 +12:00
Brenda Wallace
9d1feef226 Upgrade rails gem to 6 2020-08-26 12:36:58 +12:00
dependabot-preview[bot]
87a271cf69 Bump chartkick from 3.3.2 to 3.4.0
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.3.2 to 3.4.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.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-15 13:34:05 +12:00
dependabot-preview[bot]
a79efbc0dd [Security] Bump kramdown from 2.2.1 to 2.3.0
Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.2.1 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-15 13:34:05 +12:00
Brenda Wallace
15be089b83 Ignore the .env file 2020-08-15 13:34:05 +12:00
Brenda Wallace
807943da25 Remove figaro gem and use rails-dotenv 2020-08-15 13:34:05 +12:00
dependabot-preview[bot]
8c1a2356a6 Bump chartkick from 3.3.2 to 3.4.0
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.3.2 to 3.4.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.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-10 15:24:59 +12:00
Brenda Wallace
4016440aaa Merge branch 'mainline' into dev 2020-08-09 00:30:12 +12:00
dependabot-preview[bot]
7c8a0c9842 [Security] Bump kramdown from 2.2.1 to 2.3.0
Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.2.1 to 2.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-09 00:25:23 +12:00
Brenda Wallace
730d717e39 Merge pull request #2598 from Br3nda/feature/dotenv
Remove figaro gem and use rails-dotenv
2020-08-02 14:23:59 +12:00
Brenda Wallace
34b79eebad Merge pull request #2582 from Growstuff/dev
Production release
2020-08-02 14:23:46 +12:00
Brenda Wallace
3596ef1a10 Ignore the .env file 2020-08-02 08:20:52 +12:00
Brenda Wallace
92f8a84369 Remove figaro gem and use rails-dotenv 2020-08-01 20:24:21 +12:00
dependabot-preview[bot]
0e3ed813df Bump sidekiq from 6.0.7 to 6.1.1
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.7 to 6.1.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/v6.0.7...v6.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-01 20:22:29 +12:00
dependabot-preview[bot]
af72f42fb8 Bump rubocop-rspec from 1.40.0 to 1.42.0
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.40.0 to 1.42.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.42.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-08-01 20:22:14 +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
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
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
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
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
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
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 Morgan
c93fd78aa8 Merge branch 'dev' of gitmaco:Growstuff/growstuff into scopify 2016-11-29 09:58:02 -05: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
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
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
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
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
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
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
Marlena Compton
71c0bff3e0 add comments explaining each file per pull request 2015-03-06 07:03:06 -08: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
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
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
Yoong Kang Lim
e3db003bbc Added tests for the concern and member model 2015-02-10 20:18:26 +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
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
1140 changed files with 30186 additions and 17892 deletions

View File

@@ -1,36 +1,40 @@
engines:
rubocop:
enabled: true
scss-lint:
enabled: true
shellcheck:
enabled: true
eslint:
plugins:
brakeman:
enabled: false # codeclimate's brakeman is stuck in rails 5 rules
bundler-audit:
enabled: true
coffeelint:
enabled: true
brakeman:
enabled: true
bundler-audit:
enabled: true
duplication:
enabled: true
config:
languages:
- ruby
- javascript
editorconfig:
enabled: true
eslint:
enabled: true
fixme:
enabled: true
exclude_fingerprints: # rubocop_todo filename
- 63b8552079d106832fbe281566b6d028
- d38afbaaea3ecaa9a4cf046b07a01cec
- 57ff3968fd371d3e1f75c237d6c78acf
haml-lint:
enabled: true
nodesecurity:
enabled: true
rubocop:
enabled: true
channel: "rubocop-1-11"
scss-lint:
enabled: true
shellcheck:
enabled: true
ratings:
paths:
- "**.rb"
- "**.ru"
- "**.js"
- "**.coffee"
- "**.sass"
- "**.scss"
- "**.haml"
- Gemfile.lock
exclude_paths:
@@ -38,3 +42,6 @@ exclude_paths:
- db/
- spec/
- public/
- app/assets/stylesheets/bootstrap-accessibility.css
- app/assets/javascripts/bootstrap*
- app/assets/stylesheets/leaflet_overrides.scss

13
.editorconfig Normal file
View File

@@ -0,0 +1,13 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org
root = true
[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2

1
.esignore Normal file
View File

@@ -0,0 +1 @@
app/assets/javascripts/bootstrap-accessibility.min.js

11
.eslintrc.json Normal file
View File

@@ -0,0 +1,11 @@
{
"extends": "google",
"env": {
"browser": true,
"node": true
},
"rules": {
"no-var": "off",
"max-len": ["error", { "code": 120, "tabWidth": 4 }]
}
}

59
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,59 @@
version: 2
updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
time: "07:00"
open-pull-requests-limit: 10
versioning-strategy: lockfile-only
ignore:
- dependency-name: active_median
versions:
- "< 0.2.2, >= 0.2.1.a"
- dependency-name: rubocop
versions:
- "< 0.63, >= 0.62.a"
- dependency-name: rubocop
versions:
- "< 0.64, >= 0.63.a"
- dependency-name: sidekiq
versions:
- 5.2.4
- dependency-name: oj
versions:
- 3.11.4
- dependency-name: listen
versions:
- 3.5.0
- dependency-name: rspec-rails
versions:
- 4.1.0
- 5.0.0
- dependency-name: searchkick
versions:
- 4.4.3
- dependency-name: rswag-api
versions:
- 2.3.3
- dependency-name: rswag-specs
versions:
- 2.3.3
- dependency-name: rswag-ui
versions:
- 2.3.3
- dependency-name: timecop
versions:
- 0.9.3
- dependency-name: puma
versions:
- 5.2.0
- dependency-name: capybara
versions:
- 3.35.1
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
time: "07:00"
open-pull-requests-limit: 10

44
.github/workflows/brakeman-analysis.yml vendored Normal file
View File

@@ -0,0 +1,44 @@
# This workflow integrates Brakeman with GitHub's Code Scanning feature
# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
name: Brakeman Scan
# This section configures the trigger for the workflow. Feel free to customize depending on your convention
on:
push:
branches: [ dev ]
pull_request:
branches: [ dev ]
jobs:
brakeman-scan:
name: Brakeman Scan
runs-on: ubuntu-latest
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout
uses: actions/checkout@v2.3.4
# Customize the ruby version depending on your needs
- name: Setup Ruby
uses: actions/setup-ruby@v1.1.3
with:
ruby-version: '2.7'
- name: Setup Brakeman
env:
BRAKEMAN_VERSION: '4.10' # SARIF support is provided in Brakeman version 4.10+
run: |
gem install brakeman --version $BRAKEMAN_VERSION
# Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
- name: Scan
continue-on-error: true
run: |
brakeman -f sarif -o output.sarif.json .
# Upload the SARIF file generated in the previous step
- name: Upload SARIF
uses: github/codeql-action/upload-sarif@v1
with:
sarif_file: output.sarif.json

122
.github/workflows/ci.yml vendored Normal file
View File

@@ -0,0 +1,122 @@
name: CI
on: [pull_request]
jobs:
contributors:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- name: Install ruby version specified in .ruby-version
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: Install gem bundle
run: |
gem install bundler
bundle install
- name: Check contributors
run: |
bundle exec script/check_contributors_md.rb
rspec:
runs-on: ubuntu-latest
services:
db:
image: postgres
env:
##
# The Postgres service fails its docker health check unless you
# specify these environment variables
#
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: growstuff_test
ports: ['5432:5432']
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
env:
APP_DOMAIN_NAME: localhost:3000
APP_PROTOCOL: http
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
DEVISE_SECRET_KEY: secret
ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
GROWSTUFF_FLICKR_KEY: secretkey"
GROWSTUFF_FLICKR_SECRET: secretsecret
GROWSTUFF_SITE_NAME: "Growstuff (travis)"
RAILS_ENV: test
RAILS_SECRET_TOKEN: supersecret
steps:
- name: Checkout this repo
uses: actions/checkout@v2.3.4
- name: Configure sysctl limits
run: |
sudo swapoff -a
sudo sysctl -w vm.swappiness=1
sudo sysctl -w fs.file-max=262144
sudo sysctl -w vm.max_map_count=262144
- name: Start Elasticsearch
uses: elastic/elastic-github-actions/elasticsearch@master
with:
stack-version: 7.5.1
##
# Cache Yarn modules
#
# See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
#
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Setup yarn cache
uses: actions/cache@v2.1.5
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install required OS packages
run: |
sudo apt-get -y install libpq-dev google-chrome-stable
- name: Install NodeJS
uses: actions/setup-node@v2.4.0
with:
node-version: '12'
- name: Install Ruby (version given by .ruby-version) and Bundler
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: Install required JS packages
run: yarn install
- name: install chrome
run: sudo apt-get install google-chrome-stable
- name: Prepare database for testing
run: bundle exec rails db:prepare
- name: precompile assets
run: bundle exec rails assets:precompile
- name: index into elastic search
run: bundle exec rails search:reindex
- name: Run rspec (report results to Percy.io and CodeClimate)
run: bundle exec rspec spec -fd
- name: Report to code climate
run: |
gem install codeclimate-test-reporter
codeclimate-test-reporter

33
.gitignore vendored
View File

@@ -1,17 +1,32 @@
/log/*
.byebug_history
.bundle
.env
# Folders to ignore
/log
/doc
/tmp
/vendor
/coverage
/public
/node_modules
# Dev database (if they use sqlite)
/db/*.sqlite3
/tmp/*
coverage
# Editor and file system droppings
.pt
.*.sw*
*~
*.DS_Store
.idea/**
# Dev config files
config/application.yml
config/database.yml
credentials*.sh
Pathogen:
custom_plan.rb
zeus.json
.bundle
.idea/**
# Files that are created on Travis
cc-test-reporter
elasticsearch-*.deb
elasticsearch-*.deb.sha512

9
.haml-lint.yml Normal file
View File

@@ -0,0 +1,9 @@
linters:
LineLength:
max: 120
InstanceVariables:
enabled: false
IdNames:
enabled: false
ConsecutiveComments:
enabled: false

100
.overcommit.yml Normal file
View File

@@ -0,0 +1,100 @@
---
# Use this file to configure the Overcommit hooks you wish to use. This will
# extend the default configuration defined in:
# https://github.com/brigade/overcommit/blob/master/config/default.yml
#
# At the topmost level of this YAML file is a key representing type of hook
# being run (e.g. pre-commit, commit-msg, etc.). Within each type you can
# customize each hook, such as whether to only run it on certain files (via
# `include`), whether to only display output if it fails (via `quiet`), etc.
#
# For a complete list of hooks, see:
# https://github.com/brigade/overcommit/tree/master/lib/overcommit/hook
#
# For a complete list of options that you can use to customize hooks, see:
# https://github.com/brigade/overcommit#configuration
#
# Uncomment the following lines to make the configuration take effect.
PreCommit:
ALL:
quiet: false
problem_on_unmodified_line: warn
RuboCop:
enabled: true
command: ['bundle', 'exec', 'rubocop', '-D']
TrailingWhitespace:
enabled: true
exclude:
- '**/db/structure.sql' # Ignore trailing whitespace in generated files
CoffeeLint:
enabled: true
on_fail: warn
command: ['npm', 'run', 'coffeelint']
required_executable: 'npm'
HardTabs:
enabled: true
AuthorEmail:
enabled: false
AuthorName:
enabled: false
CssLint:
enabled: true
exclude:
- '**/bootstrap.min.css'
command: ['npm', 'run', 'csslint']
required_executable: 'npm'
HamlLint:
enabled: true
include:
- 'app/views/**'
command: ['bundle', 'exec', 'haml-lint']
JsonSyntax:
enabled: true
BundleAudit:
enabled: true
on_warn: warn
EsLint:
enabled: true
exclude:
- 'app/assets/**'
- 'spec/javascripts/support/vendor/**'
- '**/bootstrap*'
- 'app/assets/javascripts/highcharts.js'
command: ['./node_modules/.bin/eslint']
required_executable: 'npm'
ScssLint:
enabled: true
RailsSchemaUpToDate:
enabled: true
MergeConflicts:
enabled: true
YamlLint:
enabled: true
PostCheckout:
ALL:
quiet: false
BundleInstall:
enabled: true
RailsSchemaUpToDate:
enabled: true
PostMerge:
BundleInstall:
enabled: true
RailsSchemaUpToDate:
enabled: true
# PrePush:
# ALL:
# on_warn: fail # Treat all warnings as failures
# quiet: false
# # Brakeman:
# # enabled: true
# RSpec:
# enabled: true
# command: ['bundle', 'exec', 'rspec', '--fail-fast']
#
# IndexTags:
# enabled: true # Generate a tags file with `ctags` each time HEAD changes

View File

@@ -1,68 +1,63 @@
inherit_from: .rubocop_todo.yml
require: rubocop-rails
AllCops:
Include:
- 'Rakefile'
- 'config.ru'
- 'lib/**/*.rake'
NewCops: enable
Exclude:
- 'db/schema.rb'
- 'vendor/**/*'
TargetRailsVersion: 6.0
Style/FileName:
Rails:
Enabled: true
Naming/FileName:
Exclude:
- 'Guardfile'
- 'Gemfile'
- 'Gemfile.lock'
Layout/MultilineMethodCallIndentation:
EnforcedStyle: indented
Layout/HashAlignment:
EnforcedColonStyle: table
EnforcedHashRocketStyle: table
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: with_first_parameter, with_fixed_indentation
Layout/ParameterAlignment:
EnforcedStyle: with_fixed_indentation
Style/StringLiterals:
Enabled: false
Style/MultilineMethodCallIndentation:
EnforcedStyle: indented
# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
# SupportedStyles: with_first_parameter, with_fixed_indentation
Style/AlignParameters:
EnforcedStyle: with_fixed_indentation
Metrics/MethodLength:
Description: 'Avoid methods longer than 30 lines of code.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#short-methods'
# Set to 30 once all methods are fixed.
# Max: 30
Max: 104
# Remove the following once the code style matches
# Offense count: 59
Metrics/AbcSize:
Max: 115
# Offense count: 5
# Configuration parameters: CountComments.
Metrics/BlockLength:
Max: 62
# Offense count: 6
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 275
# Offense count: 6
Metrics/CyclomaticComplexity:
Max: 11
Metrics/LineLength:
Max: 120
# Offense count: 8
Metrics/PerceivedComplexity:
Max: 10
# See https://github.com/bbatsov/rubocop/issues/3629
Rails/HttpPositionalArguments:
Enabled: false
Style/PercentLiteralDelimiters:
PreferredDelimiters:
default: ()
'%i': ()
'%w': ()
Style/Documentation:
Enabled: false
Style/FrozenStringLiteralComment:
Enabled: false
# Configuration parameters: Include.
# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
Rails/Output:
Exclude:
- 'config/unicorn.rb'
- 'db/seeds.rb'
Metrics/BlockLength:
Exclude:
- 'spec/**/*'
- '**/*.rake'
- 'config/**/*.rb'
Layout/LineLength:
Max: 140
# Places we use update_all, etc even though it skips validations.
Rails/SkipsModelValidations:
Exclude:
- 'db/migrate/20190317023129_finished_boolean.rb'
- 'db/seeds.rb'

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1 +1 @@
2.3.1
2.7.2

253
.scss-lint.yml Normal file
View File

@@ -0,0 +1,253 @@
# Default application configuration that all configurations inherit from.
scss_files: "**/*.scss"
plugin_directories: ['.scss-linters']
# List of gem names to load custom linters from (make sure they are already
# installed)
plugin_gems: []
# Default severity of all linters.
severity: warning
linters:
BangFormat:
enabled: true
space_before_bang: true
space_after_bang: false
BemDepth:
enabled: false
max_elements: 1
BorderZero:
enabled: true
convention: zero # or `none`
ChainedClasses:
enabled: false
ColorKeyword:
enabled: true
ColorVariable:
enabled: true
Comment:
enabled: true
style: silent
DebugStatement:
enabled: true
DeclarationOrder:
enabled: true
DisableLinterReason:
enabled: false
DuplicateProperty:
enabled: true
ElsePlacement:
enabled: true
style: same_line # or 'new_line'
EmptyLineBetweenBlocks:
enabled: true
ignore_single_line_blocks: true
EmptyRule:
enabled: true
ExtendDirective:
enabled: false
FinalNewline:
enabled: true
present: true
HexLength:
enabled: false
style: short # or 'long'
HexNotation:
enabled: true
style: lowercase # or 'uppercase'
HexValidation:
enabled: true
IdSelector:
enabled: true
ImportantRule:
enabled: true
ImportPath:
enabled: true
leading_underscore: false
filename_extension: false
Indentation:
enabled: true
allow_non_nested_indentation: false
character: space # or 'tab'
width: 2
LeadingZero:
enabled: true
style: include_zero # or 'exclude_zero'
MergeableSelector:
enabled: true
force_nesting: true
NameFormat:
enabled: true
allow_leading_underscore: true
convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern
NestingDepth:
enabled: true
max_depth: 4
ignore_parent_selectors: false
PlaceholderInExtend:
enabled: false
PrivateNamingConvention:
enabled: false
prefix: _
PropertyCount:
enabled: true
include_nested: false
max_properties: 10
PropertySortOrder:
enabled: false
# ignore_unspecified: false
# min_properties: 2
# separate_groups: false
PropertySpelling:
enabled: true
extra_properties: []
disabled_properties: []
PropertyUnits:
enabled: true
global: [
'ch', 'em', 'ex', 'rem', # Font-relative lengths
'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
'vh', 'vw', 'vmin', 'vmax', # Viewport-percentage lengths
'deg', 'grad', 'rad', 'turn', # Angle
'ms', 's', # Duration
'Hz', 'kHz', # Frequency
'dpi', 'dpcm', 'dppx', # Resolution
'%'] # Other
properties: {}
PseudoElement:
enabled: true
QualifyingElement:
enabled: true
allow_element_with_attribute: false
allow_element_with_class: false
allow_element_with_id: false
SelectorDepth:
enabled: true
max_depth: 2
SelectorFormat:
enabled: true
convention: hyphenated_lowercase # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern
Shorthand:
enabled: true
allowed_shorthands: [1, 2, 3]
SingleLinePerProperty:
enabled: true
allow_single_line_rule_sets: true
SingleLinePerSelector:
enabled: true
SpaceAfterComma:
enabled: true
style: one_space # or 'no_space', or 'at_least_one_space'
SpaceAfterPropertyColon:
enabled: true
style: one_space # or 'no_space', or 'at_least_one_space', or 'aligned'
SpaceAfterPropertyName:
enabled: true
SpaceAfterVariableColon:
enabled: false
style: one_space # or 'no_space', 'at_least_one_space' or 'one_space_or_newline'
SpaceAfterVariableName:
enabled: true
SpaceAroundOperator:
enabled: true
style: one_space # or 'at_least_one_space', or 'no_space'
SpaceBeforeBrace:
enabled: true
style: space # or 'new_line'
allow_single_line_padding: false
SpaceBetweenParens:
enabled: true
spaces: 0
StringQuotes:
enabled: true
style: double_quotes # or single_quotes
TrailingSemicolon:
enabled: true
TrailingWhitespace:
enabled: true
TrailingZero:
enabled: false
TransitionAll:
enabled: false
UnnecessaryMantissa:
enabled: true
UnnecessaryParentReference:
enabled: true
UrlFormat:
enabled: true
UrlQuotes:
enabled: true
VariableForProperty:
enabled: false
properties: []
VendorPrefix:
enabled: true
identifier_list: base
additional_identifiers: []
excluded_identifiers: []
ZeroUnit:
enabled: true
Compass::*:
enabled: false

View File

@@ -1,58 +1,31 @@
sudo: false
sudo: required
language: ruby
dist: bionic
branches:
only:
- mainline
- dev
cache:
bundler: true
yarn: true
directories:
- travis_phantomjs
- tmp/cache/assets/test/sprockets
env:
matrix:
- GROWSTUFF_SITE_NAME="Growstuff (travis)" RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' GROWSTUFF_ELASTICSEARCH='true'
- GROWSTUFF_SITE_NAME="Growstuff (travis)" RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' GROWSTUFF_ELASTICSEARCH='false'
global:
secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
rvm:
- 2.3.1
before_install:
- export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
- >
if [ $(phantomjs --version) != '2.1.1' ]; then
PHANTOM_URL=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2;
rm -rf $PWD/travis_phantomjs;
mkdir -p $PWD/travis_phantomjs;
wget $PHANTOM_URL -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2;
tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs;
fi
- phantomjs --version
before_script:
- bundle exec rake db:create db:migrate db:test:prepare
- bundle exec rake assets:precompile
script:
- bundle exec rubocop --display-cop-names --rails
- script/gemfile_check
- bundle exec script/check_contributors_md
- bundle exec rake db:migrate --trace
- bundle exec rspec spec/
services:
- elasticsearch
- secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
before_deploy:
- bundle exec script/heroku_maintenance.rb on
deploy:
provider: heroku
api_key:
secure: WrQxf0fEKkCdXrjcejurobOnNNz3he4dDwjBbToXbQTQNDObPp7NetJrLsfM8FiUFEeOuvhIHHiDQtMvY720zGGAGxDptvgFS+0QHCUqoTRZA/yFfUmHlG2jROXTzk5uVK0AE4k6Ion5kX8+mM0EnMT/7u+MTFiukrJctSiEXfg=
secure: "WrQxf0fEKkCdXrjcejurobOnNNz3he4dDwjBbToXbQTQNDObPp7NetJrLsfM8FiUFEeOuvhIHHiDQtMvY720zGGAGxDptvgFS+0QHCUqoTRZA/yFfUmHlG2jROXTzk5uVK0AE4k6Ion5kX8+mM0EnMT/7u+MTFiukrJctSiEXfg="
on:
repo: Growstuff/growstuff
app:
dev: growstuff-staging
master: growstuff-prod
travis_deploy: tranquil-basin-3130
travis_containers: tranquil-basin-3130
mainline: growstuff-prod
run:
- "rake db:migrate"
- "script/deploy-tasks.sh"
- restart
after_deploy:
- bundle exec script/heroku_maintenance.rb off
addons:
code_climate:
repo_token: 462e015bbdaabfb20910fc07f2fea253410ecb131444e00f97dbf32dc6789ca6

View File

@@ -3,11 +3,32 @@ Thanks for contributing to Growstuff!
When you create a pull request, please include the following:
* Mention the issue it solves (eg. #123)
* Your code should follow our [Coding style guide](http://wiki.growstuff.org/index.php/Coding_style_guide)
* Your code should follow our [Coding style guide](https://github.com/Growstuff/growstuff/wiki/Development-process-overview#coding-practices)
* Make sure you have automated tests for your work, where possible.
* Add your name (and that of your pair partner, if any) to [CONTRIBUTORS.md](CONTRIBUTORS.md).
If you would like to discuss your work before submitting a pull request,
please join any of our [Discussion
forums](http://wiki.growstuff.org/index.php/Discussion_forums), where
our dev team will be happy to help you.
All pull requests should pass our automatic continuous integration and style
checks before being merged. You can run tests locally as follows:
- `rails spec` to run all Ruby tests
- `rails spec:models` to run Ruby model tests (or `rails spec:views` for view tests, etc)
- `rails static` to run all static checks (code style, unfixed Git conflicts, etc)
- `rspec ./spec/path/to/my_spec.rb` to run all Ruby tests in the file `my_spec.rb`
- `rspec ./spec/path/to/my_spec.rb:45` to run the Ruby test starting on line 45 of
`my_spec.rb`. RSpec will output a list of command-lines in this form for all
failing tests so you can easily re-run particular ones.
- `rspec --only-failures` to re-run all Ruby tests that failed last time.
Growstuff runs several linters and checkers before a change is merged. These
run from overcommit. To automatically run the same linters yourself you can
install overcommit too.
- `./script/install_linters`
You can run `rake -T` to see a list of available Rake tasks. If you can't get
some tests to pass, please submit a pull request anyway - we'll be happy to
help you debug the failures.
If you would like to discuss an idea before submitting a pull request,
please open a [GitHub Issue](https://github.com/growstuff/growstuff/issues),
where our dev team will be happy to help you.

View File

@@ -8,14 +8,15 @@ submit the change with your pull request.
## Committers
- Alex Bayley / [Skud](https://github.com/Skud)
- Cesy / [cesy](https://github.com/cesy)
- Miles Gould / [pozorvlak](https://github.com/pozorvlak)
- Taylor Griffin / [tygriffin](https://github.com/tygriffin)
- Mackenzie Morgan / [maco](https://github.com/maco)
- Brenda Wallace / [br3nda](https://github.com/br3nda)
## Contributors
- Alex Bayley / [Skud](https://github.com/Skud)
- Taylor Griffin / [tygriffin](https://github.com/tygriffin)
- Joseph Caudle / [jcaudle](https://github.com/jcaudle)
- Ricky Amianym / [amianym](https://github.com/amianym)
- Juliet Kemp / [julietk](https://github.com/julietk)
@@ -54,6 +55,8 @@ submit the change with your pull request.
- Rocky Jaiswal / [rocky-jaiswal](https://github.com/rocky-jaiswal)
- Robert Landreaux / [robertlandreaux](https://github.com/robertlandreaux)
- Savant Krishna / [sksavant](https://github.com/sksavant)
- Marlena Compton / [marlena](https://github/marlena)
- Ryan Dy / [rdy](https://github/rdy)
- Jake Yesbeck / [yez](https://github.com/yez)
- Mauricio Gonzalez / [mauricio-gonzalez](https://github.com/mauricio-gonzalez)
- Andrey Bazhutkin / [andrba](https://github.com/andrba)
@@ -71,4 +74,28 @@ submit the change with your pull request.
- Lucas Nogueira / [lucasnogueira](https://github.com/lucasnogueira)
- Charley Lewittes / [ctlewitt](https://github.com/ctlewitt)
- Kristine Nicole Polvoriza / [polveenomials](https://github.com/polveenomials)
- Brenda Wallace / [br3nda](https://github.com/br3nda)
- Jim Stallings / [jestallin](https://github.com/jestallin)
- Alyssa Ransbury / [alran](https://github.com/alran)
- Thomas Countz / [thomascountz](https://github.com/thomascountz)
- Megan Talbot / [meganft](https://github.com/meganft)
- Arun Kumar / [arun1595](https://github.com/arun1595)
- Harry Brodsky / [hbrodsk1](https://github.com/hbrodsk1)
- Jeff Kingswood / [ancyentmariner](https://github.com/ancyentmariner)
- Logan Gingerich / [logangingerich](https://github.com/logangingerich)
- Mark Taffman / [mftaff](https://github.com/mftaff)
- Jennifer Kruse / [jenkr55](https://github.com/jenkr55)
- Christopher Bazin / [RobotScissors](https://github.com/robotscissors)
- Ahmed Shahin / [codeminator](https://www.github.com/codeminator)
- Brandon Baker / [brandonbaker40](https://github.com/brandonbaker40)
- Alex Darr / [apdarr](https://github.com/apdarr)
- Taylor William / [bestest-mensch](https://github.com/bestest-mensch)
- André Aubin / [lambda2](https://github.com/lambda2)
- Martina Simicic / [simicic](https://github.com/simicic)
- Rowan Crawford / [wombleton](https://github.com/wombleton)
- Le-jun - [lejun](https://github.com/le-jun)
## Bots
### Security and Dependency Updates
- DeppBot / [deppbot](https://github.com/deppbot)
- `dependabot[bot]` [dependabot](https://github.com/dependabot-bot) / [dependabot-preview](https://github.com/apps/dependabot-preview)

183
Gemfile
View File

@@ -1,43 +1,66 @@
# frozen_string_literal: true
source 'https://rubygems.org'
ruby '2.3.1'
# Match ruby version in .ruby-version
ruby File.read('.ruby-version')
gem 'rails', '~> 4.2.1'
gem 'rails', '6.0.3.2'
# Keeping old sprockets
# https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
gem "sprockets", "<4"
gem 'bundler', '>=1.1.5'
gem 'sass-rails', '~> 5.0.4'
gem 'coffee-rails', '~> 4.1.0'
gem 'coffee-rails'
gem 'haml'
gem 'sass-rails'
# API data
gem 'jsonapi-resources'
gem 'jsonapi-swagger'
gem 'rswag-api'
gem 'rswag-ui'
# CSS framework
gem 'bootstrap-sass', '~> 3.3.6'
gem "bootstrap", ">= 4.3.1"
gem 'material-sass', '4.1.1'
# Icons used by bootstrap/material-sass
gem 'material_icons'
# icons
gem 'font-awesome-sass'
gem 'uglifier', '~> 2.7.2' # JavaScript compressor
gem 'uglifier' # JavaScript compressor
gem 'oj' # Speeds up json
# planting and harvest predictions
# based on median values for the crop
gem 'active_median', '0.2.0'
gem 'active_record_union'
gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 5.0.2'
gem 'js-routes' # provides access to Rails routes in Javascript
gem 'flickraw'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'js-routes' # provides access to Rails routes in Javascript
gem 'leaflet-rails'
gem 'leaflet-markercluster-rails'
gem 'unicorn' # http server
gem 'pg'
gem 'figaro' # for handling config via ENV variables
gem 'cancancan', '~> 1.9' # for checking member privileges
gem 'gibbon', '~>1.2.0' # for Mailchimp newsletter subscriptions
gem 'cancancan' # for checking member privileges
gem 'csv_shaper' # CSV export
gem 'gibbon', '~>1.2.0' # for Mailchimp newsletter subscriptions
# Maps
gem 'leaflet-rails'
gem 'rails-assets-leaflet.markercluster', source: 'https://rails-assets.org'
gem 'pg', '< 1.0.0' # Upstream bug, see https://github.com/Growstuff/growstuff/pull/1539
gem 'ruby-units' # for unit conversion
gem 'unicorn' # http server
gem 'comfortable_mexican_sofa', '~> 1.12.0' # content management system
gem "comfortable_mexican_sofa", "~> 2.0.0"
gem 'kaminari' # pagination
gem 'bootstrap-kaminari-views' # bootstrap views for kaminari
gem 'activemerchant'
gem 'active_utils'
gem 'sidekiq'
@@ -45,13 +68,17 @@ gem 'sidekiq'
gem 'bluecloth'
# Pagination
gem 'will_paginate', '~> 3.0'
gem 'will_paginate'
gem 'will_paginate-bootstrap4'
# user signup/login/etc
gem 'devise', '>= 4.0.0'
gem 'devise'
# nicely formatted URLs
gem 'friendly_id', '~> 5.0.4'
gem 'friendly_id'
# validates URLs
gem "validate_url"
# gravatars
gem 'gravatar-ultimate'
@@ -62,65 +89,99 @@ gem 'geocoder'
# For easy calendar selection
gem 'bootstrap-datepicker-rails'
# For connecting to other services (eg Twitter)
gem 'omniauth'
gem 'omniauth-twitter'
gem 'omniauth-flickr', '>= 0.0.15'
gem 'omniauth-facebook'
# DRY-er easier bootstrap 4 forms
gem "bootstrap_form", ">= 4.2.0"
# client for Elasticsearch. Elasticsearch is a flexible
# and powerful, distributed, real-time search and analytics engine.
# An example of the use in the project is fuzzy crop search.
gem "elasticsearch-model"
gem "elasticsearch-rails"
# For connecting to other services (eg Twitter)
gem 'omniauth', '~> 1.3'
gem 'omniauth-facebook'
gem 'omniauth-flickr', '>= 0.0.15'
gem 'omniauth-twitter'
# Pretty charts
gem "chartkick"
# clever elastic search
gem 'elasticsearch', '< 7.0.0'
gem 'searchkick'
gem "hashie", ">= 3.5.3"
gem 'rake', '>= 10.0.0'
group :production, :staging do
gem 'newrelic_rpm'
# locale based flash notices for controllers
gem "responders"
# allows soft delete. Used for members.
gem 'discard', '>= 1.2'
gem 'xmlrpc' # fixes rake error - can be removed if not needed later
gem 'puma'
gem 'loofah', '>= 2.2.1'
gem 'rack-protection', '>= 2.0.1'
# Member to member messaging system
gem 'mailboxer'
gem 'faraday'
gem 'faraday_middleware'
gem 'rack-cors'
group :production do
gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
gem 'dalli'
gem 'memcachier'
gem 'rails_12factor' # supresses heroku plugin injection
gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
gem 'sparkpost_rails'
gem 'scout_apm' # monitoring
end
group :development do
# A debugger and irb alternative. Pry doesn't play nice
# with unicorn, so start a Webrick server when debugging
# with Pry
gem 'pry'
gem 'better_errors'
gem 'binding_of_caller'
gem 'letter_opener'
gem 'quiet_assets'
gem 'guard'
gem 'guard-rspec'
gem 'listen'
end
group :development, :test do
gem 'haml-rails' # HTML templating language
gem 'rspec-rails' # unit testing framework
gem 'bullet' # performance tuning by finding unnecesary queries
gem 'byebug' # debugging
gem 'capybara' # integration tests
gem 'capybara-email' # integration tests for email
gem 'capybara-screenshot' # for test debugging
gem 'database_cleaner'
gem 'factory_bot_rails' # for creating test data
gem 'faker'
gem 'haml-rails' # HTML templating language
gem 'query_diet'
gem 'rspec-activemodel-mocks'
gem 'byebug' # debugging
gem 'database_cleaner', '~> 1.5.0'
gem 'webrat' # provides HTML matchers for view tests
gem 'factory_girl_rails' # for creating test data
gem 'coveralls', require: false # coverage analysis
gem 'capybara' # integration tests
gem 'capybara-email' # integration tests for email
gem 'capybara-screenshot' # for test debugging
gem 'poltergeist' # for headless JS testing
gem 'i18n-tasks' # adds tests for finding missing and unused translations
gem 'selenium-webdriver'
gem "active_merchant-paypal-bogus-gateway"
gem 'rspec-rails' # unit testing framework
gem 'rswag-specs'
gem 'rubocop-rails'
gem 'rubocop-rspec'
gem 'webrat' # provides HTML matchers for view tests
gem 'dotenv-rails'
# cli utils
gem 'haml-i18n-extractor', require: false
gem 'haml_lint', '>= 0.25.1', require: false # Checks haml files for goodness
gem 'i18n-tasks', require: false # adds tests for finding missing and unused translations
gem 'rspectre', require: false # finds unused code in specs
gem 'rubocop', require: false
end
group :test do
gem 'codeclimate-test-reporter', require: false
gem 'percy-capybara'
gem 'rails-controller-testing'
gem 'selenium-webdriver'
gem 'timecop'
gem 'webdrivers'
end
group :travis do
gem 'heroku-api'
gem 'platform-api'
end

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,13 +1,15 @@
# frozen_string_literal: true
guard :rspec,
cmd: 'bundle exec rspec --format documentation',
cmd: 'bundle exec rspec --format documentation',
failed_mode: :keep do
watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/libs/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }
watch('spec/spec_helper.rb') { "spec" }
# Rails example
watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
watch('config/routes.rb') { "spec/routing" }
end
end

View File

@@ -1 +1 @@
web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
web: bundle exec puma -C config/puma.rb

View File

@@ -1,15 +1,15 @@
# Growstuff
# 🌱 Growstuff
[![Build Status](https://travis-ci.org/Growstuff/growstuff.png)](https://travis-ci.org/Growstuff/growstuff)
[![Coverage Status](https://coveralls.io/repos/Growstuff/growstuff/badge.png)](https://coveralls.io/r/Growstuff/growstuff)
![Build status](https://github.com/Growstuff/growstuff/workflows/CI/badge.svg)
[![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
Welcome to the Growstuff project.
Growstuff is an open source/open data project to create a website for
food gardeners. We crowdsource information on what our members are
growing and harvesting, aggregate it, and make it available as open data
via our API.
You can find our app at https://www.growstuff.org
Growstuff is an open source/open data project for food gardeners. We
crowdsource information on what our members are growing and harvesting,
aggregate it, and make it available as open data via our API.
Growstuff was founded in 2012 and has been built by dozens of
[contributors](CONTRIBUTORS.md). We are an inclusive, welcoming project, and
@@ -17,10 +17,9 @@ encourage participation from people of all backgrounds and skill levels.
## Important links
* [Issues](http://github.com/Growstuff/growstuff/issues) (features we're
* [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
working on, known bugs, etc)
* [Discussion forums](http://talk.growstuff.org/) (design ideas, planning releases)
* [IRC](https://webchat.freenode.net/) growstuff channel (general chat, brainstorming and troubleshooting) or [Gitter](https://gitter.im/Growstuff/growstuff)
* [![Gitter](https://badges.gitter.im/Growstuff/growstuff.svg)](https://gitter.im/Growstuff/growstuff?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc. Help by migrating from the [old wiki](https://web.archive.org/web/*/wiki.growstuff.org))
## For coders
@@ -30,8 +29,7 @@ frontend features. We welcome contributions -- see
[CONTRIBUTING](CONTRIBUTING.md) for details.
* To set up your development environment, see [Getting started](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide).
* We encourage [pair programming](http://wiki.growstuff.org/index.php/Pairing), especially for newer developers. [Find a pair programming partner.](http://talk.growstuff.org/t/find-a-pair-programming-partner/13)
* Drop in to our [discussion forums](http://talk.growstuff.org/), IRC or Gitter to chat to other developers, get help, etc.
* We encourage [pair programming](http://wiki.growstuff.org/index.php/Pairing), especially for newer developers.
* You may also be interested in our [API](https://github.com/Growstuff/growstuff/wiki/API).
## For designers, writers, researchers, data wranglers, and other contributors
@@ -41,23 +39,25 @@ your skills and interests.
You might like to check out:
* The [Get Involved](http://wiki.growstuff.org/index.php/Get_involved)
* The [New Contributor Guide](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide)
page on our wiki, which has lots of detail for different areas
* [Growstuff Talk](http://talk.growstuff.org/) especially the [Idea category](http://talk.growstuff.org/c/idea)
Here on Github, you might find these useful:
* [Github Project Board](https://github.com/orgs/Growstuff/projects/1) has stories in "ready" that can be worked on.
* [needs: design](https://github.com/Growstuff/growstuff/labels/needs:%20design) - tasks requiring high-level design
* [needs: visual design](https://github.com/Growstuff/growstuff/labels/needs:%20visual design) - tasks requiring visual/graphical design
* [needs: visual design](https://github.com/Growstuff/growstuff/labels/needs:%20visual+design) - tasks requiring visual/graphical design
* [needs: documentation](https://github.com/Growstuff/growstuff/labels/needs:%20documentation)
* [needs: data](https://github.com/Growstuff/growstuff/labels/needs:%20data) - tasks requiring data entry, data design, data import, or similar
* [curated:beginner](https://github.com/Growstuff/growstuff/labels/curated:%20beginner) - tasks that are ideal for beginner programmers or people new to the project
Feel free to comment on any of the issues you find there, or open up a broader conversation on [Growstuff Talk](http://talk.growstuff.org).
Feel free to comment on any of the issues on [Github](https://github.com/Growstuff/growstuff/issues).
## Contact
For more information about this project, contact [info@growstuff.org](mailto:info@growstuff.org).
Security Issues: If you find an authorization bypass or data breach, please contact our maintainers directly at [maintainers@growstuff.org](mailto:maintainers@growstuff.org).
You can also contact us on [Twitter](http://twitter.com/growstufforg/) or
[Facebook](https://www.facebook.com/pages/Growstuff/1531133417099494).
[Facebook](https://www.facebook.com/pages/Growstuff/1531133417099494) or [Github](https://github.com/Growstuff/growstuff/issues)..

6
Rakefile Normal file → Executable file
View File

@@ -1,8 +1,10 @@
#!/usr/bin/env rake
# frozen_string_literal: true
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require 'rake/dsl_definition'
require File.expand_path('../config/application', __FILE__)
require File.expand_path('config/application', __dir__)
Growstuff::Application.load_tasks
Rails.application.load_tasks

33
TECH.md Normal file
View File

@@ -0,0 +1,33 @@
## Elastic search
Elasticsearch is used to retrieve data used in many pages. When data is
created, updated, or deleted, and index of this data is saved into elastic
search. This is denormlised data, which for us means it's saved into elastic
search in a structure ready to be displayed onto our pages. Data in postgres,
on the other hand, is saved in a different structure, that ensures data
integrity.
For example, a crop needs a default photo. The photo used is the most "liked"
photo of plantings, seeds or harvests for that crop. To get this from
postgresql you'd need to look up the crops tables, the
plantings,seeds,harvests, the photos, and then the likes. Instead of doing
that on every display of a crop photo, we calculate this at data change and
saved into the Elasticsearch index for crops.
### Installing Elasticsearch
Currently we use elastic search 7. You can check if this is still true by
looking for the `ELASTIC_SEARCH_VERSION` variable in the `.travis.yml` file
To install ES on a debian/ubuntu machine you can use the same script used in
travis-ci:
```
export ELASTIC_SEARCH_VERSION="7.5.1-amd64" ./script/install_elasticsearch.sh
```
You can check that it started happily using:
```
./script/check_elasticsearch.sh
```

51
app.json Normal file
View File

@@ -0,0 +1,51 @@
{
"name": "growstuff",
"stack": "heroku-18",
"description": "Open data project for small-scale food growers",
"scripts": {
"postdeploy": "bundle exec rails db:seed"
},
"env": {
"GROWSTUFF_ELASTICSEARCH": {
"required": true
},
"GROWSTUFF_FACEBOOK_KEY": {
"required": true
},
"GROWSTUFF_FACEBOOK_SECRET": {
"required": true
},
"GROWSTUFF_FLICKR_KEY": {
"required": true
},
"GROWSTUFF_FLICKR_SECRET": {
"required": true
},
"GROWSTUFF_SITE_NAME": {
"required": true
},
"GROWSTUFF_EMAIL": {
"required": true
},
"MAIL_SENDER_HOST": {
"required": true
}
},
"formation": {
"web": {
"quantity": 1
}
},
"addons": [
"bonsai",
"heroku-postgresql",
"memcachier",
"newrelic",
"scout",
"sendgrid"
],
"buildpacks": [
{ "url": "heroku/nodejs" },
{ "url": "heroku/ruby" }
]
}

View File

@@ -0,0 +1,3 @@
// = link_tree ../images
// = link_directory ../javascripts .js
// = link_directory ../stylesheets .css

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 965 B

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 51 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

@@ -0,0 +1 @@
Icons in this folder attributable to Icons8.com. Used with permission.

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#512DA8" d="M31.9,10H12.2l3.4-5.1c0.4-0.6,1-0.9,1.7-0.9h9.6c0.7,0,1.3,0.3,1.7,0.9L31.9,10z"/><path fill="#8668C5" d="M12,9H6V7.2C6,6.5,6.5,6,7.2,6h3.6C11.5,6,12,6.5,12,7.2V9z"/><path fill="#5E35B1" d="M38,40H6c-2.2,0-4-1.8-4-4V12c0-2.2,1.8-4,4-4h32c2.2,0,4,1.8,4,4v24C42,38.2,40.2,40,38,40"/><path fill="#512DA8" d="M10,24c0-6.6,5.4-12,12-12s12,5.4,12,12c0,6.6-5.4,12-12,12S10,30.6,10,24z"/><path fill="#B388FF" d="M22 15A9 9 0 1 0 22 33A9 9 0 1 0 22 15Z"/><path fill="#C7A7FF" d="M26.9,20.8c-1.2-1.4-3-2.2-4.8-2.2s-3.6,0.8-4.8,2.2c-0.5,0.5-0.4,1.3,0.1,1.8c0.5,0.5,1.3,0.4,1.8-0.1c1.5-1.7,4.3-1.7,5.8,0c0.3,0.3,0.6,0.4,1,0.4c0.3,0,0.6-0.1,0.9-0.3C27.4,22.2,27.4,21.4,26.9,20.8z"/><path fill="#8668C5" d="M9 9.9A2 1.5 0 1 0 9 12.9A2 1.5 0 1 0 9 9.9Z"/><path fill="#4CAF50" d="M36 26A10 10 0 1 0 36 46A10 10 0 1 0 36 26Z"/><path fill="#FFF" d="M42 34L38 34 38 30 34 30 34 34 30 34 30 38 34 38 34 42 38 42 38 38 42 38z"/></svg>

After

Width:  |  Height:  |  Size: 1019 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M19,36c0,3.9,3,7,5,7s5-3.1,5-7s-1-7-5-7S19,32.1,19,36z"/><path fill="#795548" d="M21 21c0 1.7 1 10 3 10s3-8.3 3-10-1.3-3-3-3S21 19.3 21 21zM29 13c0 5-3 3-5 3s-5 2-5-3c0-2.8 2-7 5-7S29 10.2 29 13z"/><path fill="#5d4037" d="M14.3 18.8l6.7 3c0-.3 0-.6 0-.8 0-.5.1-.9.3-1.3l-5.6-2.5-4.8-6.8c-.3-.4-.9-.6-1.4-.2-.5.3-.6.9-.2 1.4L14.3 18.8zM27 21c0 .2 0 .5 0 .8l6.7-3 5.2-7.2c.3-.4.2-1.1-.2-1.4-.4-.3-1.1-.2-1.4.2l-4.8 6.8-5.6 2.5C26.9 20.1 27 20.5 27 21zM21.6 26c-.1-.7-.2-1.4-.3-2h-6.1l-5.8-2.9c-.5-.2-1.1 0-1.3.4-.2.5 0 1.1.4 1.3l6.2 3.1H21.6zM39.9 21.6c-.2-.5-.8-.7-1.3-.4L32.8 24h-6.1c-.1.6-.2 1.3-.3 2h6.9l6.2-3.1C39.9 22.6 40.1 22 39.9 21.6zM22.5 29.2c-.2-.5-.4-1-.5-1.6l-8.7 2.6-4.2 8.4c-.2.5 0 1.1.4 1.3C9.7 40 9.8 40 10 40c.4 0 .7-.2.9-.6l3.8-7.6 6.3-1.9C21.4 29.6 21.9 29.3 22.5 29.2zM34.7 30.2L26 27.6c-.2.6-.3 1.1-.5 1.6.6.2 1.1.4 1.5.8l6.3 1.9 3.8 7.6c.2.4.5.6.9.6.2 0 .3 0 .4-.1.5-.2.7-.8.4-1.3L34.7 30.2zM32.4 10H26c-.6 0-1-.4-1-1s.4-1 1-1h5.6l3.7-3.7c.4-.4 1-.4 1.4 0s.4 1 0 1.4L32.4 10zM22 10h-6.4l-4.3-4.3c-.4-.4-.4-1 0-1.4s1-.4 1.4 0L16.4 8H22c.6 0 1 .4 1 1S22.6 10 22 10z"/><path fill="#4e342e" d="M20.7 30.2c1 .5 2.1.8 3.3.8s2.3-.3 3.3-.8C26.6 29.4 25.5 29 24 29S21.4 29.4 20.7 30.2zM24 35c1.7 0 3.4-.4 4.9-1.2-.1-.7-.3-1.4-.5-2l-.1.1C27 32.6 25.5 33 24 33c-1.5 0-3-.4-4.3-1.1l-.1-.1c-.2.6-.4 1.3-.5 2C20.6 34.6 22.3 35 24 35zM24 37c-1.7 0-3.4-.4-5-1 0 0 0 0 0 0 0 .8.1 1.5.3 2.2 1.5.5 3.1.8 4.7.8s3.1-.3 4.7-.8c.2-.7.3-1.4.3-2.2 0 0 0 0 0 0C27.4 36.6 25.7 37 24 37zM28.2 39.5c-.2.4-.4.8-.7 1.1C26.3 40.9 25.2 41 24 41s-2.3-.1-3.5-.4c1 1.5 2.4 2.4 3.5 2.4C25.3 43 27.1 41.6 28.2 39.5zM24 18c-1.4 0-2.7 1-2.9 2.4 0 0 0 0 0 0 .7 0 1.3-.1 1.9-.2.4-.1.8-.2 1-.2s.6.1 1 .2c.6.1 1.2.2 1.9.2 0 0 0 0 0 0C26.7 19 25.4 18 24 18z"/><path fill="#4e342e" d="M24 16c-.3 0-.7.1-1 .1V19h2v-2.9C24.7 16.1 24.3 16 24 16zM26.1 5.9c0 .3.1.6.1.9C26.6 7.1 27 7.5 27.3 8L28 8c-.1-.5-.2-.9-.4-1.3-.2-.4-.4-.8-.6-1.2-.5-.7-1.2-1.3-2-1.5C25.6 4.5 25.9 5.2 26.1 5.9zM21.9 6.8c0-.3 0-.6.1-.9C22.1 5.2 22.4 4.5 23 4c-.8.2-1.5.8-2 1.5-.2.4-.5.8-.6 1.2C20.2 7.1 20.1 7.5 20 8l.7 0C21 7.5 21.4 7.1 21.9 6.8z"/><path d="M22 12c0 .6-.4 1-1 1s-1-.4-1-1 .4-1 1-1S22 11.4 22 12zM28 12c0 .6-.4 1-1 1s-1-.4-1-1 .4-1 1-1S28 11.4 28 12z"/></svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#42a5f5" d="M29.4,21L29.4,21c0,0-6.7-13.7-9.7-14.9c-1.9-0.7-3.5,6.2-0.8,10.4c2.2,3.6,9.1,5.8,9.1,5.8l0,0 c0.1,0,0.1,0.1,0.2,0.1c0.5,0.2,1.1-0.1,1.3-0.6C29.6,21.6,29.6,21.3,29.4,21z"/><path fill="#5d4037" d="M29.5 31.9C29.5 31.9 29.5 31.9 29.5 31.9c.1-.2.2-.4.2-.6 0 0 0 0 0 0 .2-.6.3-1.2.3-1.8 0-2.7-1.7-5-4-6-3.6-2.2-6.4-.2-8 2.5-.2.3-.4.6-.5 1C13.6 35.4 19.2 41.1 20 42c1.4-5.1 6.9-4.3 9.3-9.8C29.4 32.1 29.5 32 29.5 31.9L29.5 31.9zM35 14c-.2 0-.3 0-.4-.1-.5-.2-.7-.8-.4-1.3l1.2-2.4L40.8 9c.5-.1 1.1.2 1.2.8.1.5-.2 1.1-.8 1.2l-4.5.9-.8 1.6C35.7 13.8 35.4 14 35 14z"/><path fill="#5d4037" d="M33,13c-0.4,0-0.8-0.3-0.9-0.7l-1.3-3.9l6.9-2.3c0.5-0.2,1.1,0.1,1.3,0.6c0.2,0.5-0.1,1.1-0.6,1.3 l-5.1,1.7l0.7,2.1c0.2,0.5-0.1,1.1-0.6,1.3C33.2,13,33.1,13,33,13z"/><path fill="#ffc107" d="M26.8 35.6c.2-.2.4-.3.6-.5-2.1.5-4.3.5-6.3.2-1.1-.2-2.2-.5-3.3-.8-.5-.2-1.1-.4-1.6-.6.1 1.3.4 2.5.8 3.6.1 0 .1 0 .2 0 1.3.1 2.6 0 3.8-.1C23 37 25 36.4 26.8 35.6zM18.7 24.9c.4.5.9 1 1.4 1.5 1.1 1.1 2.3 2 3.6 2.7 1.3.8 2.7 1.3 4.1 1.6.7.1 1.4.2 2 .3 0-.2.1-.3.1-.5-1.9-.6-3.7-1.6-5.1-3-.9-.9-1.7-1.9-2.4-3-.3-.5-.6-1.1-.9-1.7 0 0 0 0 0-.1C20.4 23.1 19.5 23.9 18.7 24.9zM22.8 31.3c-1.2-.6-2.4-1.4-3.5-2.2-.7-.5-1.4-1.1-2-1.7-.5 1.2-.9 2.4-1 3.5.5.3 1 .5 1.5.7 1.4.6 2.9 1.1 4.3 1.5 2.1.5 4.4.7 6.5.4.1-.2.2-.3.3-.5C26.8 32.9 24.7 32.2 22.8 31.3z"/><path fill="#795548" d="M32.8,25.8c-2.1,2.1-4.7,1.3-6.8-0.8c-2.1-2.1-2.8-4.7-0.8-6.8c2.1-2.1,4.7-1.3,6.8,0.8 C34.1,21.1,34.8,23.7,32.8,25.8z"/><path fill="#8d6e63" d="M37.8,18.9c-0.9,2-4.8,1.1-7.4-0.1c-2-0.9-2.9-3.3-2-5.4c0.9-2.1,3.1-2.6,5.2-2.1 C36.1,12,38.7,16.8,37.8,18.9z"/><path fill="#4e342e" d="M32.6,19.6c-0.8-0.2-1.5-0.5-2.2-0.8c-0.8-0.4-1.4-1-1.8-1.7c-0.7-0.1-2.2,0-2.9,0.9 c0.6,1.4,0.8,3.5,2.3,4.1c2.9,1.1,4.8,0.7,5.9,0C33.6,21.2,33.2,20.4,32.6,19.6z"/><path fill="#3e2723" d="M35.4,17.3c-0.5,0.7-2,0.5-3.5-0.6s-2.3-2.6-1.8-3.3c0.5-0.7,2-0.5,3.5,0.6 C35.1,15.1,35.9,16.6,35.4,17.3z"/><path fill="#90caf9" d="M28.6,20.2L28.6,20.2C28.6,20.2,12.2,6,9,6c-2,0-1,7,3,10c3.4,2.5,15.8,6,15.8,6l0,0 c0.1,0,0.2,0.1,0.2,0.1c0.6,0,1-0.4,1-1C29,20.7,28.8,20.4,28.6,20.2z"/></svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#455a64" d="M34.4 44.8l-3-2c-.2-.2-.4-.4-.4-.7l-.9-6.6-3.7-2.8 1.2-1.6 4 3c.2.2.4.4.4.7l.9 6.6 2.6 1.8L34.4 44.8zM35.3 33.7l-2-2c-.1-.1-.2-.3-.3-.5l-.8-3.4L27.8 27l.4-2 5 1c.4.1.7.4.8.7l.9 3.7 1.8 1.8L35.3 33.7zM29.4 22.9l-.7-1.9 3.9-1.6-2.4-4c-.2-.3-.2-.7 0-1.1l2-3 1.7 1.1L32.2 15l2.7 4.5c.2.3.2.6.1.8-.1.3-.3.5-.6.6L29.4 22.9zM13.6 44.8l-1.1-1.7 2.6-1.8.9-6.6c0-.3.2-.5.4-.7l4-3 1.2 1.6-3.7 2.8L17 42.1c0 .3-.2.5-.4.7L13.6 44.8zM12.7 33.7l-1.4-1.4 1.8-1.8.9-3.7c.1-.4.4-.7.8-.7l5-1 .4 2-4.4.9L15 31.2c0 .2-.1.3-.3.5L12.7 33.7zM18.6 22.9l-5-2c-.3-.1-.5-.3-.6-.6C13 20 13 19.7 13.1 19.5l2.7-4.5-1.6-2.5 1.7-1.1 2 3c.2.3.2.7 0 1.1l-2.4 4 3.9 1.6L18.6 22.9z"/><path fill="#4db6ac" d="M26 14h-2C24 4.2 38.3 3 38.9 3l.1 2C38.9 5 26 6 26 14zM24 14h-2C22 6 9.1 5 8.9 5l.1-2C9.7 3 24 4.2 24 14z"/><path fill="#00695c" d="M27,20.8c0,1.7-1.4,3-3,3s-3-1.4-3-3V15c0-1.7,1.4-3,3-3s3,1.4,3,3V20.8z"/><path fill="#26a69a" d="M24,42c-6,0-7-22-7-22c0-1.1,4-2,7-2s7,0.9,7,2C31,20,30,42,24,42z"/><path fill="#00897b" d="M23,41.8c0.3,0.1,0.6,0.2,1,0.2s0.7-0.1,1-0.2V18c-0.3,0-0.7,0-1,0s-0.7,0-1,0V41.8z"/></svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 7.8 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#455A64" d="M33.906,27.118C33.474,23.776,31.156,12,20,12c0,0-3.554,0.003-6.196,3.727c-0.079-0.094-0.144-0.178-0.244-0.287C13.545,15.423,12,13.813,12,11.5C12,9.288,14.432,7,18.5,7c4.5,0,5.635,1.928,5.654,1.975c0.262,0.785,1.114,1.214,1.897,0.948c0.786-0.262,1.21-1.111,0.948-1.897C26.945,7.861,25,4,18.5,4C12.554,4,9,7.813,9,11.5c0,3.58,2.34,5.961,2.439,6.061c0.34,0.339,0.643,0.617,0.929,0.87c-0.746,1.905-1.261,4.381-1.35,7.583L11,26v16c0,0,0,0,2,0s2,0,2,0v-5c0,0,1-9,4-9s3,4,3,4v10c0,0,0,0,2,0s2,0,2,0V32c0,0,0-1.999,2-1.999S30,32,30,32v10c0,0,0,0,2,0s2,0,2,0V32v-4v-0.999L33.906,27.118z"/><path fill="#455A64" d="M32.22 15A6.5 6.5 0 1 0 32.22 28A6.5 6.5 0 1 0 32.22 15Z"/><path fill="#37474F" d="M38.307 19.236c.496-1.729 1.035-4.369.413-6.236l-3.591 2.693C36.589 16.426 37.731 17.691 38.307 19.236zM29.481 15.611L26 13c-.575 1.725-.158 4.108.301 5.825C26.941 17.409 28.073 16.267 29.481 15.611z"/><g><path fill="#FFEB3B" d="M36.72 19c0 0 .292 3-1.5 3-.827 0-1.499 0-1.499 0s-.334-3 1.499-3C36.048 19 36.72 19 36.72 19zM27.72 19.002c0 0-.374 2.998 1.5 2.998.828 0 1.5.002 1.5.002S31.096 19 29.22 19C28.392 19 27.72 19.002 27.72 19.002z"/></g><g><path fill="#263238" d="M26 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H26zM15 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H15zM34 42c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2H34zM32.22 28c-2.236 0-4.209-1.13-5.378-2.851-.16-.235-.301-.485-.43-.742-.026-.054-.053-.108-.078-.163-.241-.516-.416-1.069-.515-1.648-.012-.069-.022-.138-.032-.208-.039-.292-.067-.587-.067-.889 0-.953.215-1.853.583-2.668-.001-.002-.001-.005-.002-.007 0-.001.001-.001.001-.002-.209-.789-.409-1.719-.509-2.66-.002-.013-.004-.026-.005-.039-.098-.952-.091-1.914.114-2.754-.578-.302-1.199-.56-1.863-.77-.562 1.931-.262 4.268.169 6.105-.312.875-.488 1.813-.488 2.795 0 4.688 3.813 8.5 8.5 8.5.61 0 1.206-.068 1.78-.191v-2.062C33.434 27.908 32.838 28 32.22 28z"/><path fill="#263238" d="M32.72,24c0,0-0.542,0.75-1,0l-1-0.998v-1L33.721,22v1L32.72,24z"/></g></svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#ff3d00" d="M34,11l-6-6h-8l-6,6h-3v28c0,2.2,1.8,4,4,4h18c2.2,0,4-1.8,4-4V11H34z"/><path fill="#ff6e40" d="M11,7h26c1.1,0,2,0.9,2,2v2H9V9C9,7.9,9.9,7,11,7z"/><path fill="#fafafa" d="M15.515 25H32.486000000000004V29H15.515z" transform="rotate(-45.001 24 27)"/><path fill="#fafafa" d="M22 18.515H26V35.486000000000004H22z" transform="rotate(-45.001 24 27)"/></svg>

After

Width:  |  Height:  |  Size: 456 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#ef9a9a" d="M35.018 34.126c-2.546-.192-6.051 1.718-7.434 2.939-2.035-.094-4.119-.123-5.881.17-1.252-.665-3.652-1.256-5.101-1.347-.31-.441-.68-.838-1.041-1.227-.752-.807-1.401-1.504-1.401-2.388l-8.832-2.847C5.113 30.292 5 31.276 5 32.274 5 40.997 11.889 46 23.9 46c4.289 0 9.829-1.611 12.547-5.225.687-.953 2.086-3.07 1.053-5.153C37.166 35.002 36.465 34.239 35.018 34.126zM39.006 6.987c-1.39-2.409-4.498-4.6-9.373-4.002-4.736-2.198-8.342-.257-9.879 1.35-1.332.178-2.902 1.274-2.911 1.281-1.67 1.233-2.328 2.48-2.67 4.769-.169 1.031.114 2.004.775 2.669.761.768 1.979 1.008 3.311.674 1.281-.281 2.183-.706 3.177-1.243.911-.493 1.772-.959 2.779-1.18 3.076-.678 7.137-.188 8.914 2.007.41.578.605 1.227.482 1.558-.367.925-2.058 1.4-3.177 1.715l-.304.087c-2.162.519-4.22.928-6.129 1.294l-1.074.214c-3.256.644-6.946 1.375-10.097 2.869l.429.903 0 .001 3.779 5.711c0 0 .551 1.048.921 1.048 1.862 0 4.3-.47 6.254-1.61 1.763.149 6.246-.408 8.326-1.726 2.135.065 4.613-.855 6.431-2.422 1.312-1.13 2.14-2.499 2.375-3.906C42.949 17.832 43 14.899 43 14.537 43 10.033 40.722 7.642 39.006 6.987z"/><path fill="#e98888" d="M34.76 12.15l-.04-.05-.04-.05c-1.56-1.92-4.4-3.03-7.79-3.03-1.07 0-2.11.11-3.1.33-1.29.28-2.31.84-3.31 1.38-.94.51-1.64.82-2.65 1.04l-.03.01-.03.01c-.23.06-.45.09-.65.09s-1.87.057-2.95-1.5c-.17 1.04.12 2.01.78 2.67.53.55 1.3.82 2.17.82.36 0 .75-.04 1.14-.14 1.28-.28 2.18-.71 3.18-1.25.91-.49 1.77-.95 2.77-1.18.85-.18 1.76-.28 2.68-.28 2.45 0 4.95.7 6.24 2.29.41.58.6 1.23.48 1.56-.37.92-2.06 1.4-3.18 1.71l-.3.09c-2.16.52-4.22.93-6.13 1.3l-1.07.21c-3.26.64-6.95 1.37-10.1 2.87l.857 2.013 2.023-1.033c2.46-.87 5.16-1.4 7.61-1.89l1.06-.21c1.93-.37 4.02-.79 6.22-1.31l.04-.01.04-.02.3-.08c1.49-.42 3.76-1.06 4.51-2.94C36.03 14.11 35.07 12.59 34.76 12.15zM37.5 35.62c-.958 2.07-1.809 2.893-2.65 3.95C32.479 42.547 27.57 44 23.9 44 17.59 44 7 42.48 7 32.27l.083-.77L5.33 29.43C5.11 30.29 5 31.28 5 32.27 5 41 11.89 46 23.9 46c4.29 0 9.83-1.61 12.55-5.22C37.13 39.82 38.53 37.71 37.5 35.62z"/><path fill="#e67a7a" d="M13.152,20.9c-4.191,0.301-6.373,2.483-7.262,4.485c-0.911,2.052-0.962,2.64-0.804,5.389 c3.934,2.501,9.189,2.138,9.189,2.138c2-1.297,3.376-2.9,3.718-4.201C17.021,24.047,13.152,20.9,13.152,20.9z"/><path fill="#e57373" d="M29.43 42.67c-.19.15-.41.22-.63.22-.27 0-.53-.11-.72-.33-.44-.52-.97-2.07-1.27-3.54-.14-.71-.23-1.41-.23-1.95v-.04c.33.01.67.02 1 .04.21-.19.48-.4.79-.61.13.16.21.38.21.61 0 .47.08 1.05.2 1.63.25 1.16.65 2.31.84 2.58C29.92 41.72 29.85 42.35 29.43 42.67zM22.68 37.1c.04.22 0 .46-.13.67-.19.3-.39.83-.56 1.42-.35 1.19-.62 2.63-.62 2.99 0 .55-.45 1-1 1s-1-.45-1-1c0-.56.29-2.16.71-3.56.21-.7.45-1.34.7-1.79.35.13.66.26.92.4C22.02 37.18 22.34 37.14 22.68 37.1zM17.59 36c-.03.29-.2.56-.46.73-.37.23-.8.58-1.24.95-.94.81-1.86 1.76-2.03 2.06-.19.33-.54.53-.9.53-.15 0-.3-.03-.44-.11-.47-.24-.69-.79-.47-1.27.24-.52 1.22-1.54 2.22-2.43.61-.55 1.22-1.04 1.7-1.35.22.25.44.51.63.78C16.89 35.91 17.23 35.95 17.59 36zM25.21 27.101v.01c-.38.02-.72.01-1-.01-.28.17-.58.32-.88.46-.08-.14-.12-.29-.12-.46 0-1.83-.5-4.76-.66-5.24-.17-.52.12-1.08.64-1.25.53-.17 1.09.11 1.26.64C24.68 21.951 25.21 25.071 25.21 27.101zM33.54 25.341c-.34.04-.67.05-1 .04-.26.16-.55.32-.88.46h-.01c-.07-.14-.11-.29-.11-.46 0-1.64-.84-4.56-1.06-5.01-.24-.5-.03-1.1.46-1.34.5-.24 1.1-.04 1.34.46C32.66 20.251 33.53 23.421 33.54 25.341zM42.03 18.311c-.19.28-.41.54-.68.74-.06.32-.14.64-.26.96-.21-.05-.4-.17-.54-.36-.76-.99-2.89-2.21-3.62-2.39-.54-.13-.86-.68-.73-1.21.13-.54.67-.87 1.21-.73C38.51 15.591 40.94 16.981 42.03 18.311zM39.87 7.452c-.1.2-.27.37-.5.46-.47.2-2.25 1.84-2.68 2.39-.2.25-.49.38-.78.38-.22 0-.44-.07-.62-.21-.44-.35-.51-.98-.17-1.41.37-.46 2.24-2.35 3.32-2.92.22.28.41.56.57.84C39.28 7.092 39.58 7.242 39.87 7.452zM30.6 3.232c-.33 1.28-.46 3.49-.38 3.99.08.54-.29 1.05-.84 1.14-.05.01-.1.01-.15.01-.48 0-.91-.35-.99-.85-.13-.85.05-3.33.43-4.79.01-.05.03-.09.04-.13.3.11.61.24.92.38.34-.04.67-.07.99-.08C30.64 3.012 30.63 3.122 30.6 3.232zM22.62 9.162c-.19.14-.4.21-.62.21-.3 0-.59-.13-.79-.38-.31-.41-2.17-3.34-2.42-4.4.32-.12.64-.22.96-.26.21-.22.46-.45.75-.66.11.12.19.28.23.46.15.56 1.67 3.13 2.06 3.62C23.13 8.192 23.05 8.822 22.62 9.162zM14.78 22.53c0 0-7.197 1.262-7.71 9.24-.761-.323-1.34-.59-1.98-1-.16-2.74-.11-3.33.8-5.38.89-2.01 3.07-4.19 7.26-4.49C13.15 20.9 13.87 21.49 14.78 22.53z"/></svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#E57373" d="M42.583,9.067l-3.651-3.65c-0.555-0.556-1.459-0.556-2.015,0l-1.718,1.72l5.664,5.664l1.72-1.718C43.139,10.526,43.139,9.625,42.583,9.067"/><path fill="#FF9800" d="M4.465 21.524H40.471999999999994V29.535H4.465z" transform="rotate(134.999 22.469 25.53)"/><path fill="#B0BEC5" d="M34.61 7.379H38.616V15.392H34.61z" transform="rotate(-45.02 36.61 11.385)"/><path fill="#FFC107" d="M6.905 35.43L5 43 12.571 41.094z"/><path fill="#37474F" d="M5.965 39.172L5 43 8.827 42.035z"/></svg>

After

Width:  |  Height:  |  Size: 581 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#9fa8da" d="M9,45H6V12c0,0,0.584-5,1.542-5S9,12,9,12V45z"/><path fill="#9fa8da" d="M7.5 3A2.5 2.5 0 1 0 7.5 8A2.5 2.5 0 1 0 7.5 3Z"/><path fill="#e0dddc" d="M6 9H42V33H6z"/><path fill="#546e7a" d="M12 9H18V15H12zM18 15H24V21H18zM36 9H42V15H36zM24 9H30V15H24zM30 15H36V21H30zM12 21H18V27H12zM18 27H24V33H18zM6 15H12V21H6zM6 27H12V33H6zM36 21H42V27H36zM24 21H30V27H24zM30 27H36V33H30z"/></svg>

After

Width:  |  Height:  |  Size: 486 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="96" version="1.1" viewBox="0 0 48 48"><g id="surface1"><path fill="#CFD8DC" d="M 5 38 L 5 14 L 43 14 L 43 38 C 43 40.199219 41.199219 42 39 42 L 9 42 C 6.800781 42 5 40.199219 5 38 Z"/><path fill="#F44336" d="M 43 10 L 43 16 L 5 16 L 5 10 C 5 7.800781 6.800781 6 9 6 L 39 6 C 41.199219 6 43 7.800781 43 10 Z"/><path fill="#B71C1C" d="M 36 10 C 36 11.65625 34.65625 13 33 13 C 31.34375 13 30 11.65625 30 10 C 30 8.34375 31.34375 7 33 7 C 34.65625 7 36 8.34375 36 10 Z"/><path fill="#B71C1C" d="M 18 10 C 18 11.65625 16.65625 13 15 13 C 13.34375 13 12 11.65625 12 10 C 12 8.34375 13.34375 7 15 7 C 16.65625 7 18 8.34375 18 10 Z"/><path fill="#B0BEC5" d="M 33 3 C 31.898438 3 31 3.898438 31 5 L 31 10 C 31 11.101563 31.898438 12 33 12 C 34.101563 12 35 11.101563 35 10 L 35 5 C 35 3.898438 34.101563 3 33 3 Z"/><path fill="#B0BEC5" d="M 15 3 C 13.898438 3 13 3.898438 13 5 L 13 10 C 13 11.101563 13.898438 12 15 12 C 16.101563 12 17 11.101563 17 10 L 17 5 C 17 3.898438 16.101563 3 15 3 Z"/><path fill="#90A4AE" d="M 13 20 L 17 20 L 17 24 L 13 24 Z"/><path fill="#90A4AE" d="M 19 20 L 23 20 L 23 24 L 19 24 Z"/><path fill="#90A4AE" d="M 25 20 L 29 20 L 29 24 L 25 24 Z"/><path fill="#90A4AE" d="M 31 20 L 35 20 L 35 24 L 31 24 Z"/><path fill="#90A4AE" d="M 13 26 L 17 26 L 17 30 L 13 30 Z"/><path fill="#90A4AE" d="M 19 26 L 23 26 L 23 30 L 19 30 Z"/><path fill="#90A4AE" d="M 25 26 L 29 26 L 29 30 L 25 30 Z"/><path fill="#90A4AE" d="M 31 26 L 35 26 L 35 30 L 31 30 Z"/><path fill="#90A4AE" d="M 13 32 L 17 32 L 17 36 L 13 36 Z"/><path fill="#90A4AE" d="M 19 32 L 23 32 L 23 36 L 19 36 Z"/><path fill="#90A4AE" d="M 25 32 L 29 32 L 29 36 L 25 36 Z"/><path fill="#90A4AE" d="M 31 32 L 35 32 L 35 36 L 31 36 Z"/></g></svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#3e2723" d="M32 34L16 34 15 18 33 18z"/><path fill="#3f51b5" d="M29,33L29,33l-5,1l-5-1c0,0-11,1.986-11,13h32C40,35.025,29,33,29,33"/><path fill="#ff9800" d="M24 39L19 33 19 27 29 27 29 33z"/><path fill="#4caf50" d="M30,33.254V42H18v-8.748c-0.945,0.28-2.445,0.823-4,1.791V42v2v2h20v-2v-2v-6.941C32.444,34.086,30.944,33.536,30,33.254z"/><path fill="#1b5e20" d="M15,44c0-0.553,0.447-1,1-1c0.552,0,1,0.447,1,1s-0.448,1-1,1C15.447,45,15,44.553,15,44z M32,45c0.552,0,1-0.447,1-1s-0.448-1-1-1c-0.553,0-1,0.447-1,1S31.447,45,32,45z"/><path fill="#ce8b05" d="M24 13A17 5.5 0 1 0 24 24A17 5.5 0 1 0 24 13Z"/><path fill="#fbc02d" d="M28,3c-2,0-2,2-4,2s-2-2-4-2s-6,6.029-6,11v0.059C16.808,13.396,20.257,13,24,13c3.742,0,7.191,0.396,10,1.059V14C34,9.029,30,3,28,3z"/><path fill="#ffb74d" d="M24,15c-4.716,0-7.609,0.906-9,1.499V23c0,4.971,4.028,9,9,9c4.971,0,9-4.029,9-9v-6.501C31.609,15.906,28.716,15,24,15z"/><path fill="#795548" d="M24 15c-7 0-10 2-10 2l0 0-3.747 4.731C9.981 24.408 10 26.766 10 28l6 6V21l10.051-5.935C25.407 15.026 24.73 15 24 15zM37.747 21.731L34 17c0 0-1.551-1.024-4.998-1.606L32 19v15l6-6C38 26.766 38.019 24.408 37.747 21.731z"/><path fill="#ed9f21" d="M14.422,11C14.158,12.004,14,13.023,14,14c0,0,4-1,10-1s10,1,10,1c0-0.977-0.159-1.996-0.423-3c0,0-5.577-1-9.577-1S14.422,11,14.422,11z"/><path fill="#784719" d="M27,23c0-0.551,0.448-1,1-1s1,0.449,1,1s-0.448,1-1,1S27,23.551,27,23 M19,23c0,0.551,0.448,1,1,1s1-0.449,1-1s-0.448-1-1-1S19,22.449,19,23"/></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#9fa8da" d="M44,29H30V18.029l7-4.546l7,4.546V29z"/><path fill="#0d47a1" d="M39,24h-4v-4h4V24z"/><path fill="#b71c1c" d="M45 17.56L45 21 37 14.44 29 21 29 17.56 37 11z"/><path fill="#9fa8da" d="M18,29H4V18.029l7-4.546l7,4.546V29z"/><path fill="#0d47a1" d="M13,20H9v4h4V20z"/><path fill="#b71c1c" d="M19 17.56L19 21 11 14.44 3 21 3 17.56 11 11z"/><path fill="#e8eaf6" d="M33,31H15V15.571l9-6l9,6V31z"/><path fill="#1565c0" d="M27,18h-6v6h6V18z"/><path fill="#9fa8da" d="M33 18H34V20H33zM14 18H15V20H14z"/><path fill="#d32f2f" d="M34 14.2L34 19 24 10.8 14 19 14 14.2 24 6z"/><path fill="#8bc34a" d="M34.5,27C22.793,27,11.754,27.535,2,28.477V43h44V27.176C42.255,27.062,38.416,27,34.5,27z"/><path fill="#689f38" d="M18.688 27.338C11.93 28.534 6.153 30.466 2 32.891v6.101c6.106-5.784 13.729-9.952 22.202-11.846C22.34 27.197 20.501 27.26 18.688 27.338zM39.379 43c1.637-8.041 3.51-13.562 5.523-15.849-.35-.01-.706-.016-1.057-.024-3.131 2.26-6.019 7.818-8.489 15.873H39.379zM26.579 43c4.07-8.157 8.84-13.753 14.012-15.948-.455-.007-.917-.009-1.374-.015C32.511 29.231 26.39 34.864 21.325 43H26.579zM12.608 43c6.085-8.142 13.693-13.821 22.115-15.998C34.648 27.002 34.575 27 34.5 27c-.556 0-1.103.007-1.656.009C22.392 29.2 13.026 34.899 5.728 43H12.608z"/></svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#388E3C" d="M20,42.986C20,26.007,27.264,11.928,29,9c-0.852,2.774-3,8-3,34.014L20,42.986z"/><path fill="#388E3C" d="M24,42.975C24,29.27,34.963,13.556,38,11c-1.684,2.342-8,12.291-8,32.025L24,42.975z"/><path fill="#388E3C" d="M19,43c0-17-5.631-25.871-7-28c1.765,1.823,13,16.016,13,28H19z"/><g><path fill="#8BC34A" d="M29 43c0-13.638 11.218-24.641 13-26-1.431 1.717-7 11-7 26H29zM14 43c0-15.034-6.457-24.327-8-26 1.877 1.3 14 12.746 14 26H14z"/></g><g><path fill="#4CAF50" d="M19.428 22.989c.372 1.44.668 2.895.917 4.356 2.538 4.838 4.652 10.449 4.655 15.647l2-.017c-.25-3.555-.745-7.176-1.516-10.682-.777-3.517-1.833-6.964-3.214-10.265-1.376-3.3-3.074-6.455-5.105-9.354C15.124 9.794 12.796 7.09 10 5c2.458 2.462 4.324 5.409 5.879 8.447C17.42 16.501 18.587 19.713 19.428 22.989zM21.001 43c0 .008-.001.017-.001.024L24 43H21.001z"/></g></svg>

After

Width:  |  Height:  |  Size: 931 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#8BC34A" d="M30.8,18.2c-2.4,0.7-3.6,3.4-2.1,5.4c-0.9,0.5-2.1,1.6-3.2,3.3c-0.1-4.4,0.3-8.7,1.3-11.8c1.4,1.4,3.1,1.2,4.6-0.1c2.7-2.4,0.3-8.1,1.5-9.9c-1.4,0-6.9,0.5-9.2,3.3c-1.5,1.9-0.9,4.6,1.6,5.1c-1.4,3.4-1.9,8.3-1.9,13.1c-0.8-1.2-1.9-2.4-3.3-3.3c2.8-2.2,2-5.7-0.9-7.2C14.9,13.7,7.8,16.3,6,17c2.6,1.6,2.4,10,7.2,11.6c3.1,1,5.5,0,6.1-3.7c4,2.9,4.7,8.1,4.8,8.2c0.1,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0c0.5-0.1,0.9-0.5,0.9-1l0,0c0-3.9,1.8-6.1,3.1-7.1c0.1,2.5,1.8,3.5,4.2,3.3c3.9-0.5,5.4-7.1,7.7-8C39.8,20.2,34.6,17.2,30.8,18.2z"/><path fill="#689F38" d="M13.2,28.6C8.4,27,8.6,18.6,6,17c0,0,0,0,0,0c2.3,0.2,5.8,2.1,13.4,6.8c0,0,0,0,0,0C19.1,28.4,16.6,29.7,13.2,28.6z M33.3,29c3.9-0.5,5.4-7.1,7.7-8c0,0,0,0,0,0c-1.8-0.2-5.2,0.7-11.8,3.1c0,0,0,0,0,0C28.6,27.8,30.5,29.3,33.3,29z M31.5,14.9c3.1-3,0.3-8.1,1.5-9.9c0,0,0,0,0,0c-1.5,0.8-3.6,3.2-7.2,8.5c0,0,0,0,0,0C27.3,16.5,29.5,16.6,31.5,14.9z"/><path fill="#795548" d="M9,42h9.7h12.6h4.1h5.2c0.8-0.7,1.4-1.8,1.4-3c0-2.2-1.8-4-4-4c-0.4,0-0.8,0.1-1.2,0.2c-0.6-1.9-2.3-3.2-4.3-3.2c-1.3,0-2.5,0.6-3.3,1.4C28.1,32.5,26.6,32,25,32c-2.1,0-4,0.9-5.3,2.4C19.2,34.2,18.6,34,18,34c-1.1,0-2,0.4-2.7,1.1C14.7,34.4,13.9,34,13,34c-1.4,0-2.5,0.9-2.9,2.2C9.8,36.1,9.4,36,9,36c-1.7,0-3,1.3-3,3S7.3,42,9,42z"/><path fill="#8D6E63" d="M38,40C38,40,38,40,38,40c0-1.7-1.3-3-3-3c-1.5,0-2.7,1.1-2.9,2.4C31.3,38.6,30.2,38,29,38c-1.3,0-2.5,0.7-3.2,1.7c-0.5-1.6-2-2.7-3.8-2.7c-1.1,0-2,0.4-2.7,1.1C18.7,37.4,17.9,37,17,37c-1.4,0-2.5,0.9-2.9,2.2C13.8,39.1,13.4,39,13,39c-1.9,0-3.4,1.3-3.9,3h26h2.1H40C39.8,41,39,40.2,38,40z"/></svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" version="1.1" viewBox="0 0 48 48"><g id="surface1027379"><path fill="#F9A825" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 21.292969 15.804688 C 21.242188 16.882812 21.152344 22.007812 21 23 L 25 23 C 25 20 24.566406 16.632812 24.273438 15.476562 C 23.980469 14.335938 23.644531 13.210938 23.246094 12.109375 C 22.453125 9.917969 21.4375 7.769531 20 6 C 20.855469 8.105469 21.167969 10.320312 21.289062 12.511719 C 21.34375 13.609375 21.339844 14.710938 21.292969 15.804688 Z M 19 23 C 19 13.820312 13.316406 10.726562 12.261719 10.203125 C 11.203125 9.6875 10.113281 9.269531 9 9 C 10.953125 10.171875 15 12.835938 15 23 Z M 38 7 C 35.894531 8.191406 33.945312 9.757812 32.296875 11.707031 C 31.476562 12.6875 29 16.75 29 23 L 33 23 C 33 11.707031 36.304688 8.714844 38 7 Z M 29.105469 28 C 29.796875 35.339844 33.992188 41.3125 34.1875 41.582031 L 35.8125 40.421875 C 35.769531 40.359375 32.652344 34.726562 32.09375 28 Z M 15.90625 28 C 15.347656 34.726562 12.230469 40.359375 12.1875 40.421875 L 13.8125 41.582031 C 14.007812 41.3125 18.203125 35.339844 18.894531 28 Z M 24.0625 28 C 24.46875 35.550781 26.941406 43.820312 27.019531 44.195312 L 28.980469 43.804688 C 28.964844 43.714844 27.316406 35.398438 27.039062 28 Z M 20.960938 28 C 20.683594 35.394531 19.039062 43.714844 19.019531 43.804688 L 20.980469 44.199219 C 21.058594 43.820312 23.53125 35.550781 23.9375 28 Z M 34 26 C 34 25.445312 33.554688 25 33 25 L 15 25 C 14.445312 25 14 25.445312 14 26 C 14 26.554688 14.445312 27 15 27 L 33 27 C 33.554688 27 34 26.554688 34 26 Z M 34 26"/><path fill="#D88A19" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 18.925781 28 C 18.414062 35.816406 15.140625 42.480469 15.105469 42.554688 L 16.894531 43.449219 C 17.050781 43.136719 21.289062 36.265625 21.914062 28 Z M 16.558594 8.621094 C 17.183594 9.65625 17.601562 10.785156 17.863281 11.9375 C 18.128906 13.09375 18.242188 14.273438 18.253906 15.457031 C 18.253906 15.851562 18.246094 16.675781 18.230469 17.644531 C 18.695312 19.144531 19 20.90625 19 23 L 21 23 C 21.152344 22.007812 21.242188 16.882812 21.292969 15.804688 C 21.300781 15.660156 21.296875 15.515625 21.304688 15.371094 C 21.273438 15.234375 21.246094 15.109375 21.21875 15.011719 C 20.851562 13.703125 20.371094 12.421875 19.730469 11.222656 C 19.09375 10.027344 18.296875 8.910156 17.332031 7.992188 C 16.367188 7.078125 15.238281 6.324219 14 6 C 15.101562 6.632812 15.925781 7.597656 16.558594 8.621094 Z M 25 23 L 29.5 23 L 29 23 C 29 21.511719 29.144531 20.152344 29.367188 18.925781 C 29.363281 17.339844 29.398438 15.78125 29.472656 15.144531 C 29.617188 13.835938 29.921875 12.523438 30.363281 11.234375 C 30.804688 9.945312 31.386719 8.679688 32.074219 7.464844 C 32.769531 6.253906 33.5625 5.074219 34.5 4 C 33.335938 4.828125 32.265625 5.8125 31.269531 6.871094 C 30.277344 7.9375 29.363281 9.101562 28.566406 10.359375 C 27.765625 11.621094 27.082031 12.980469 26.558594 14.429688 C 26.265625 15.226562 25.972656 17.144531 25.769531 19.042969 C 25.707031 17.40625 25.652344 15.777344 25.617188 15.136719 C 25.546875 13.855469 25.539062 12.570312 25.632812 11.289062 C 25.726562 10.011719 25.914062 8.738281 26.28125 7.5 C 26.644531 6.265625 27.183594 5.058594 28 4 C 26.941406 4.820312 26.070312 5.910156 25.363281 7.097656 C 24.65625 8.285156 24.113281 9.574219 23.671875 10.890625 C 23.542969 11.269531 23.417969 11.738281 23.296875 12.257812 C 23.671875 13.3125 23.996094 14.386719 24.273438 15.476562 C 24.566406 16.632812 25 20 25 23 Z M 14.8125 28 C 13.855469 33.394531 9.410156 37.191406 9.359375 37.234375 L 10.640625 38.769531 C 10.875 38.574219 15.898438 34.296875 16.835938 28 Z M 33.1875 28 L 31.164062 28 C 32.101562 34.300781 37.125 38.574219 37.359375 38.769531 L 38.640625 37.234375 C 38.589844 37.191406 34.144531 33.394531 33.1875 28 Z M 26.085938 28 C 26.710938 36.265625 30.949219 43.136719 31.105469 43.449219 L 32.894531 42.554688 C 32.859375 42.480469 29.585938 35.816406 29.074219 28 Z M 23 28 L 25 28 L 25 44 L 23 44 Z M 23 28"/><path fill="#C47814" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 34 24 C 34 24.554688 33.554688 25 33 25 L 15 25 C 14.445312 25 14 24.554688 14 24 C 14 23.445312 14.445312 23 15 23 L 33 23 C 33.554688 23 34 23.445312 34 24 Z M 34 28 C 34 28.554688 33.554688 29 33 29 L 15 29 C 14.445312 29 14 28.554688 14 28 C 14 27.445312 14.445312 27 15 27 L 33 27 C 33.554688 27 34 27.445312 34 28 Z M 34 28"/><path fill="#43A047" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38"/><path fill="#FFF" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36"/></g></svg>

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#F9A825" d="M21.293 15.803C21.242 16.881 21.154 22.008 21 23h4c0-2.999-.435-6.369-.725-7.523-.293-1.141-.632-2.265-1.028-3.366C22.452 9.918 21.439 7.77 20 6c.857 2.105 1.168 4.32 1.288 6.513C21.344 13.611 21.341 14.71 21.293 15.803zM19 23c0-9.18-5.682-12.275-6.737-12.797C11.204 9.686 10.114 9.271 9 9.001c1.952 1.171 6 3.833 6 13.999H19zM38 7c-2.107 1.193-4.054 2.756-5.703 4.706C31.478 12.687 29 16.751 29 22.999h4C33 11.706 36.305 8.713 38 7zM29.106 28c.69 7.338 4.886 13.311 5.08 13.582l1.628-1.162c-.045-.062-3.163-5.695-3.721-12.42H29.106zM15.907 28c-.558 6.725-3.677 12.358-3.721 12.42l1.628 1.162c.194-.271 4.39-6.244 5.081-13.582H15.907zM24.062 28c.406 7.549 2.881 15.819 2.958 16.197l1.961-.393C28.963 43.714 27.316 35.4 27.04 28H24.062zM20.96 28c-.276 7.396-1.922 15.714-1.94 15.805l1.961.393c.076-.378 2.551-8.648 2.958-16.197H20.96zM34 26c0-.553-.447-1-1-1H15c-.553 0-1 .447-1 1l0 0c0 .553.447 1 1 1h18C33.553 27 34 26.553 34 26L34 26z"/><g><path fill="#D88A19" d="M18.926 28c-.511 7.815-3.785 14.482-3.821 14.555l1.789.894c.156-.311 4.395-7.183 5.021-15.448H18.926zM16.557 8.622c.626 1.034 1.043 2.164 1.308 3.317.265 1.154.376 2.336.387 3.518.003.394-.005 1.218-.023 2.187C18.696 19.146 19 20.907 19 23h2c.154-.992.242-6.119.293-7.197.006-.143.005-.287.01-.43-.029-.137-.057-.262-.085-.362-.366-1.308-.848-2.59-1.486-3.788-.637-1.197-1.434-2.311-2.4-3.232C16.368 7.08 15.238 6.324 14 6 15.103 6.632 15.927 7.599 16.557 8.622zM25 23h.5H26h3.5c0 0 0 0 0-.001H29c0-1.486.143-2.845.368-4.072-.003-1.586.03-3.146.103-3.784.147-1.306.451-2.62.894-3.908.441-1.289 1.02-2.554 1.71-3.77C32.77 6.252 33.562 5.073 34.5 4c-1.166.829-2.233 1.811-3.23 2.871-.993 1.065-1.905 2.229-2.704 3.489s-1.483 2.622-2.009 4.071c-.292.794-.583 2.714-.786 4.611-.065-1.635-.118-3.264-.154-3.905-.072-1.282-.079-2.566.014-3.846.094-1.278.285-2.554.65-3.791C26.645 6.267 27.182 5.06 28 4c-1.057.822-1.931 1.912-2.635 3.098-.708 1.188-1.253 2.475-1.694 3.791-.128.38-.253.849-.375 1.369.374 1.055.699 2.129.979 3.219C24.565 16.631 25 20.001 25 23zM14.811 28c-.954 5.393-5.402 9.191-5.452 9.233l1.281 1.536c.235-.196 5.258-4.471 6.196-10.77H14.811zM33.189 28h-2.025c.938 6.299 5.961 10.573 6.195 10.77l1.282-1.536C38.591 37.191 34.143 33.393 33.189 28zM26.084 28c.627 8.266 4.866 15.138 5.021 15.448l1.789-.894c-.036-.072-3.31-6.739-3.821-14.555H26.084zM23 28H25V44H23z"/></g><g><path fill="#C47814" d="M34 24c0 .553-.447 1-1 1H15c-.553 0-1-.447-1-1l0 0c0-.553.447-1 1-1h18C33.553 23 34 23.447 34 24L34 24zM34 28c0 .553-.447 1-1 1H15c-.553 0-1-.447-1-1l0 0c0-.553.447-1 1-1h18C33.553 27 34 27.447 34 28L34 28z"/></g></svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#2196F3" d="M37.891,11.663c0.919,0.613,2.16,0.364,2.773-0.555s0.364-2.161-0.555-2.773c-0.919-0.613-4.387-0.419-4.387-0.419S36.972,11.051,37.891,11.663z"/><path fill="#4CAF50" d="M37.5,21H10v3h27.5c0.827,0,1.5,0.673,1.5,1.5S38.327,27,37.5,27H10v3h27.5c2.481,0,4.5-2.019,4.5-4.5S39.981,21,37.5,21z"/><path fill="#4CAF50" d="M38,33H10.5C9.673,33,9,32.327,9,31.5S9.673,30,10.5,30H38v-3H10.5C8.019,27,6,29.019,6,31.5S8.019,36,10.5,36H38V33z"/><path fill="#4CAF50" d="M37.5 33H10v3h27.5c.827 0 1.5.673 1.5 1.5S38.327 39 37.5 39H6v3h31.5c2.481 0 4.5-2.019 4.5-4.5S39.981 33 37.5 33zM9 19.5c0-.176-3-.171-3 0 0 2.481 2.019 4.5 4.5 4.5H38v-3H10.5C9.673 21 9 20.327 9 19.5z"/><path fill="#4CAF50" d="M9,19.437H6c0-5.107,4.173-6.213,10.491-7.887c1.644-0.436,9.91-2.885,11.98-3.506l0.863,2.873c-2.118,0.636-10.409,3.092-12.075,3.533C10.459,16.252,9,16.879,9,19.437z"/><path fill="#37474F" d="M33.423 9.619L26.992 12.563 25.577 7.766 32.573 6.744z"/><path fill="#2E7D32" d="M27.275,13.521c0.156,0.528-0.146,1.085-0.675,1.242l-0.96,0.282c-0.529,0.158-1.086-0.146-1.242-0.676l-1.982-6.712c-0.156-0.531,0.146-1.088,0.676-1.243l0.959-0.284c0.529-0.155,1.085,0.148,1.242,0.676L27.275,13.521z"/></svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#37474f" d="M29 19c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l5.4-2.7V8.5l4.4-3.3c.4-.3 1.1-.2 1.4.2.3.4.2 1.1-.2 1.4L36 9.5v6.1l-6.6 3.3C29.3 19 29.2 19 29 19zM19 19c-.1 0-.3 0-.4-.1L12 15.6V9.5L8.4 6.8C8 6.5 7.9 5.8 8.2 5.4c.3-.4 1-.5 1.4-.2L14 8.5v5.9l5.4 2.7c.5.2.7.8.4 1.3C19.7 18.8 19.4 19 19 19zM38 42c-.2 0-.3 0-.4-.1l-6.5-3.2-1-7.9-2.4-.8c-.5-.2-.8-.7-.6-1.3.2-.5.7-.8 1.3-.6l3.6 1.2 1 8.1 5.5 2.8c.5.2.7.8.4 1.3C38.7 41.8 38.4 42 38 42zM41 35c-.2 0-.3 0-.4-.1l-4.5-2.2-1-8.9-5.4-1.8c-.5-.2-.8-.7-.6-1.3.2-.5.7-.8 1.3-.6l6.6 2.2 1 9.1 3.5 1.8c.5.2.7.8.4 1.3C41.7 34.8 41.4 35 41 35zM10 42c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l5.5-2.8 1-8.1 3.6-1.2c.5-.2 1.1.1 1.3.6.2.5-.1 1.1-.6 1.3l-2.4.8-1 7.9-6.5 3.2C10.3 42 10.2 42 10 42zM7 35c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l3.5-1.8 1-9.1 6.6-2.2c.5-.2 1.1.1 1.3.6.2.5-.1 1.1-.6 1.3l-5.4 1.8-1 8.9-4.5 2.2C7.3 35 7.2 35 7 35zM28 16c0 1.1-.9 2-2 2h-4c-1.1 0-2-.9-2-2v-3c0-1.1.9-2 2-2h4c1.1 0 2 .9 2 2V16z"/><path fill="#37474f" d="M25,12h-2V8.3l0.7-0.2C23.8,8,26,7.2,26,5h2c0,2.7-1.9,4.1-3,4.6V12z"/><path fill="#37474f" d="M23.7,9.9C23.5,9.9,20,8.7,20,5h2c0,2.2,2.2,3,2.3,3.1L23.7,9.9z"/><path fill="#8bc34a" d="M15.9,34c0,0,1,8,8.1,8c7.1,0,8.1-8,8.1-8l0.8-8c0,0,0.2-2-1.9-2c-2,0-12.2,0-14.3,0 c-2,0-1.9,2-1.9,2L15.9,34z"/><path fill="#2e7d32" d="M25,24c-0.7,0-1.3,0-2,0v17.9c0.3,0,0.6,0.1,1,0.1s0.7,0,1-0.1V24z"/><path fill="#43a047" d="M29 40.1V24c-.6 0-1.3 0-2 0v17.4C27.8 41.1 28.5 40.6 29 40.1zM32.2 34l.8-8c0 0 .3-2-2-2v13.6C31.9 35.9 32.2 34 32.2 34zM21 41.4V24c-.7 0-1.4 0-2 0v16.1C19.6 40.6 20.2 41.1 21 41.4zM15 26l.8 8c0 0 .3 1.9 1.1 3.5V24C14.8 24 15 26 15 26z"/><path fill="#2e7d32" d="M25,14H23c-5.9,0-8,3.8-8,8c0,1.9,2.2,2,2.2,2h13.6c0,0,2.2,0,2.2-1.9C33,17.8,30.9,14,25,14z"/><path fill="#09350b" d="M21,24c0,0,1-2,3-2s3,2,3,2c-2,0-3,6-3,6S23,24,21,24z"/></svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#5d4037" d="M27,13c0,1.7-1.3,3-3,3s-3-1.3-3-3l-2-2c0-1.7,3.3-4,5-4s5,2.3,5,4L27,13z"/><path fill="#5d4037" d="M17 15l5 2h4l5-2c0-3-2-4-2-4H19C19 11 17 12 17 15zM41 29c-.1 0-.2 0-.3-.1l-6.6-2.2L33 20.2c-.1-.5.3-1.1.8-1.2.5-.1 1.1.3 1.2.8l.9 5.4 5.4 1.8c.5.2.8.7.6 1.3C41.8 28.7 41.4 29 41 29zM41 42c-.2 0-.3 0-.4-.1l-4.4-2.2-2.1-6.4c-.2-.5.1-1.1.6-1.3.5-.2 1.1.1 1.3.6l1.9 5.6 3.6 1.8c.5.2.7.8.4 1.3C41.7 41.8 41.4 42 41 42zM7 29c-.4 0-.8-.3-.9-.7-.2-.5.1-1.1.6-1.3l5.4-1.8.9-5.4c.1-.5.6-.9 1.2-.8.5.1.9.6.8 1.2l-1.1 6.6L7.3 29C7.2 29 7.1 29 7 29zM7 42c-.4 0-.7-.2-.9-.6-.2-.5 0-1.1.4-1.3l3.6-1.8 1.9-5.6c.2-.5.7-.8 1.3-.6.5.2.8.7.6 1.3l-2.1 6.4-4.4 2.2C7.3 42 7.2 42 7 42z"/><path fill="#5d4037" d="M37.6,19H24c-0.6,0-1-0.4-1-1s0.4-1,1-1h12.4l2.7-4.5c0.3-0.5,0.9-0.6,1.4-0.3 c0.5,0.3,0.6,0.9,0.3,1.4L37.6,19z"/><path fill="#5d4037" d="M24 19H10.4l-3.3-5.5C6.9 13 7 12.4 7.5 12.1 8 11.9 8.6 12 8.9 12.5l2.7 4.5H24c.6 0 1 .4 1 1S24.6 19 24 19zM23 10c-.3 0-.5-.1-.7-.3C22.2 9.6 20.5 8 17 8c-.6 0-1-.4-1-1s.4-1 1-1c4.4 0 6.6 2.2 6.7 2.3.4.4.4 1 0 1.4C23.5 9.9 23.3 10 23 10z"/><path fill="#5d4037" d="M25,10c-0.3,0-0.5-0.1-0.7-0.3c-0.4-0.4-0.4-1,0-1.4C24.4,8.2,26.6,6,31,6c0.6,0,1,0.4,1,1 s-0.4,1-1,1c-3.5,0-5.2,1.6-5.3,1.7C25.5,9.9,25.3,10,25,10z"/><path fill="#b71c1c" d="M23,20h2v22h-2V20z"/><path fill="#ff3d00" d="M15.2,17c-2.4,2.4-4.2,5.8-4.2,10c0,8.8,7.7,15,12,15l1-23l1,23c4.3,0,12-6.2,12-15 c0-4.2-1.8-7.6-4.2-10H15.2z"/><path fill="#3e2723" d="M24 22c2.8 0 5-2.2 5-5H19C19 19.8 21.2 22 24 22zM32 28.5c0 1.4-1.1 2.5-2.5 2.5S27 29.9 27 28.5s1.1-2.5 2.5-2.5S32 27.1 32 28.5zM21 28.5c0 1.4-1.1 2.5-2.5 2.5S16 29.9 16 28.5s1.1-2.5 2.5-2.5S21 27.1 21 28.5zM13.3 22.4c-.5 1-.4 2.1.4 2.5.7.4 1.7-.1 2.3-1.1.5-1 .4-2.1-.4-2.5C14.8 20.9 13.8 21.4 13.3 22.4zM34.9 22.4c-.5-1-1.5-1.4-2.3-1.1s-.9 1.5-.4 2.5c.5 1 1.5 1.4 2.3 1.1C35.3 24.5 35.5 23.4 34.9 22.4zM29.4 37.6c.6.6 1.7.4 2.5-.4s.9-1.9.4-2.5-1.7-.4-2.5.4S28.8 37.1 29.4 37.6zM19.2 37.6c.6-.6.4-1.7-.4-2.5s-1.9-.9-2.5-.4-.4 1.7.4 2.5S18.6 38.2 19.2 37.6z"/><path fill="#a1887f" d="M29 11h-2v2c0 .6.4 1 1 1h2.9C30.5 11.8 29 11 29 11zM19 11h2v2c0 .6-.4 1-1 1h-2.9C17.5 11.8 19 11 19 11z"/></svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#DB8509" d="M24 34.001A4 4 0 1 0 24 42.001 4 4 0 1 0 24 34.001zM26 11c0 1.104-.896 2-2 2l0 0c-1.104 0-2-.896-2-2V7c0-1.104.896-2 2-2l0 0c1.104 0 2 .896 2 2V11z"/><path fill="#BC6F0A" d="M27.887,38.91C27.955,38.617,28,38.314,28,38.001c0-0.383-0.07-0.746-0.172-1.097C26.609,36.965,25.333,37,24,37s-2.609-0.035-3.829-0.096C20.071,37.255,20,37.618,20,38.001c0,0.313,0.045,0.616,0.113,0.909C21.584,38.979,22.926,39,24,39S26.416,38.979,27.887,38.91z"/><path fill="#FFC107" d="M33,33V16.801c0-4.97-4.029-9-9-9s-9,4.03-9,9V33H33z"/><path fill="#FFC107" d="M41,33c0,2.209-7.059,4-17,4S7,35.209,7,33s7.059-4,17-4S41,30.791,41,33z"/><path fill="#FFC107" d="M7,33c0-1.999,8-9.001,8-12s18-3.001,18,0s8,9.999,8,12S7,34.999,7,33z"/><path fill="#FFE082" d="M9.275,29.424c-0.491,0.593-0.929,1.146-1.295,1.65c1.622,0.655,8.15,3.062,16.562,3.062c4.746,0,10.089-0.78,15.476-3.064c-0.362-0.499-0.796-1.046-1.281-1.632C25.699,34.724,12.698,30.68,9.275,29.424z"/></svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 48 48" width="48" height="48"><path fill="#64B5F6" d="M12.3 12.3H40.3V40.3H12.3z" transform="rotate(18.558 26.274 26.27)"/><path fill="#1E88E5" d="M15.6 15.4H37.6V35.4H15.6z" transform="rotate(18.042 26.563 25.412)"/><path fill="#90CAF9" d="M8.1 8.1H36.1V36.1H8.1z" transform="rotate(10.454 22.134 22.135)"/><path fill="#42A5F5" d="M11.3 11.2H33.3V31.2H11.3z" transform="rotate(10.068 22.284 21.207)"/><path fill="#BBDEFB" d="M4 4H32V32H4z"/><path fill="#4CAF50" d="M7 7H29V27H7z"/><path fill="#FFF" d="M16 13c0-1.1.9-2 2-2s2 .9 2 2-2 4-2 4S16 14.1 16 13zM20 21c0 1.1-.9 2-2 2s-2-.9-2-2 2-4 2-4S20 19.9 20 21z"/><path fill="#FFF" d="M13.5 16.7c-1-.6-1.3-1.8-.7-2.7.6-1 1.8-1.3 2.7-.7 1 .6 2.5 3.7 2.5 3.7S14.5 17.3 13.5 16.7zM22.5 17.3c1 .6 1.3 1.8.7 2.7-.6 1-1.8 1.3-2.7.7C19.5 20.2 18 17 18 17S21.5 16.7 22.5 17.3z"/><path fill="#FFF" d="M22.5 16.7c1-.6 1.3-1.8.7-2.7-.6-1-1.8-1.3-2.7-.7C19.5 13.8 18 17 18 17S21.5 17.3 22.5 16.7zM13.5 17.3c-1 .6-1.3 1.8-.7 2.7.6 1 1.8 1.3 2.7.7 1-.6 2.5-3.7 2.5-3.7S14.5 16.7 13.5 17.3z"/><path fill="#FFC107" d="M18 15A2 2 0 1 0 18 19A2 2 0 1 0 18 15Z"/></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#cfd8dc" d="M20 5H24V43H20z"/><path fill="#b0bec5" d="M24 5H28V43H24z" transform="rotate(-180 26 24)"/><path fill="#455a64" d="M28 11L25 11 25 10 26 9 28 9zM20 16L23 16 23 15 22 14 20 14zM28 22L25 22 25 21 26 20 28 20zM20 27L23 27 23 26 22 25 20 25zM28 34L25 34 25 33 26 32 28 32zM20 39L23 39 23 38 22 37 20 37z"/><path fill="#cfd8dc" d="M38 5L32 5 35 43 41 43z"/><path fill="#b0bec5" d="M38 5L35 5 38 43 41 43z"/><path fill="#455a64" d="M38 34L40.175 34 40.025 32 39 32 38 33zM37 9L36 10 36 11 38.45 11 38.3 9zM37 39L37 38 36 37 34.4 37 34.55 39zM38 20L37 21 37 22 39.275 22 39.125 20zM36 27L36 26 35 25 33.5 25 33.65 27zM32.825 16L35 16 35 15 34 14 32.675 14z"/><path fill="#cfd8dc" d="M13,5H7c0,0,3,13.047,3,38h6C16,18.047,13,5,13,5z"/><path fill="#b0bec5" d="M13,5h-3c0,0,3,13.047,3,38h3C16,18.047,13,5,13,5z"/><g><path fill="#455a64" d="M8.538 16H11v-1l-1-1H8.314C8.388 14.636 8.463 15.302 8.538 16zM12 27v-1l-1-1H9.327c.045.652.089 1.32.13 2H12zM11 10v1h2.939c-.098-.733-.192-1.397-.28-2H12L11 10zM13 20l-1 1v1h3.101c-.056-.684-.112-1.354-.17-2H13zM13 34h2.801c-.025-.677-.052-1.344-.08-2H14l-1 1V34zM13 38l-1-1H9.894c.017.658.033 1.324.046 2H13V38z"/></g></svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#f3e5f5" d="M29,3c0,9,9,10,8.5,21c-0.3,7.4-6,13.5-13.5,13.5S10.3,31.4,10,24c-0.5-11,9-12,9-21"/><path fill="#9c27b0" d="M24,39c-8.3,0-15-6.7-15-15c0-6.1,2.7-9.4,5.1-12.3C16.2,9.1,18,6.9,18,3h2c0,4.6-2.2,7.3-4.4,10 c-2.3,2.8-4.6,5.6-4.6,11c0,7.2,5.8,13,13,13c7.2,0,13-5.8,13-13c0-5.4-2.3-8.3-4.6-11C30.2,10.3,28,7.6,28,3h2 c0,3.9,1.8,6.1,3.9,8.7C36.3,14.6,39,17.9,39,24C39,32.3,32.3,39,24,39z"/><path fill="#e1bee7" d="M24,37c-6.1,0-11-4.9-11-11c0-4.3,1.5-6.7,3.1-9.2C18,13.7,20,10.5,20,3h2c0,8.1-2.2,11.7-4.2,14.8 C16.3,20.2,15,22.3,15,26c0,5,4,9,9,9c5,0,9-4,9-9c0-3.7-1.3-5.8-2.8-8.1C28.2,14.7,26,11.1,26,3h2c0,7.5,2,10.7,3.9,13.8 c1.6,2.5,3.1,4.9,3.1,9.2C35,32.1,30.1,37,24,37z"/><path fill="#e1bee7" d="M24,35c-3.9,0-7-3.1-7-7c0-1.3,0.5-2.9,1.3-5.1C19.7,18.6,21.9,12.2,22,3l2,0 c-0.1,9.5-2.3,16.1-3.8,20.5c-0.7,2-1.2,3.5-1.2,4.5c0,2.8,2.2,5,5,5s5-2.2,5-5c0-1.7-0.7-3.6-1.5-6.1C26,17.7,24,11.9,24,3h2 c0,8.6,1.9,14.2,3.4,18.3C30.3,23.9,31,26,31,28C31,31.9,27.9,35,24,35z"/><path fill="#e1bee7" d="M21,30c0-1.7,3-13,3-13s3,11.3,3,13s-1.3,3-3,3S21,31.7,21,30z"/><path fill="#ab47bc" d="M22,31c0-1.1,2-7,2-7s2,5.9,2,7s-0.9,2-2,2S22,32.1,22,31z"/><path fill="#5d4037" d="M26.9,36.7C26,36.9,25,37,24,37s-2-0.1-2.9-0.3L19,42l2.7-3.2L21,44l2.2-5.1L24,45l0.8-6.1L27,44 l-0.7-5.2L29,42L26.9,36.7z"/></svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#8BC34A" d="M14,35c0,0-2.3-14,13-14c10,0,17,8,17,8s-7.5,12-19,12C16,41,14,35,14,35z M18,18c0-6.1-6-12-6-12s-7.3,4.3-8,13s5.8,10.7,5.8,10.7S18,26.8,18,18z"/><path fill="#689F38" d="M44,29c0,0-7.5,12-19,12c-6,0-8.9-2.7-10.2-4.5c-2.9,2.5-3.9,4.8-3.9,4.9C10.8,41.8,10.4,42,10,42c-0.1,0-0.3,0-0.4-0.1c-0.5-0.2-0.7-0.8-0.5-1.3c0.1-0.3,2.6-5.8,10.2-9.4C30.3,25.4,44,29,44,29z M11,35c0.1,0,0.2,0,0.3-0.1c0.5-0.2,0.8-0.8,0.6-1.3c-0.5-1.5-0.9-2.9-1.1-4.4C13,28.2,18,24.9,18,18c0-6.1-6-12-6-12s-0.4,1.1-1,3c0,0,0,0,0,0c-0.2,0.5-5.2,13.6-0.9,25.3C10.2,34.7,10.6,35,11,35z"/></svg>

After

Width:  |  Height:  |  Size: 663 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#2196f3" d="M44,24c0,11.044-8.956,20-20,20S4,35.044,4,24S12.956,4,24,4S44,12.956,44,24z"/><path fill="#e3f2fd" d="M23.758 31.145c-.727 0-1.328.234-1.797.711-.469.473-.703 1.074-.703 1.805 0 .719.23 1.313.688 1.781.461.469 1.063.703 1.816.703.75 0 1.352-.234 1.813-.703.457-.469.688-1.063.688-1.781 0-.73-.234-1.332-.703-1.805C25.094 31.387 24.48 31.145 23.758 31.145zM29.184 14.586C27.969 13.527 26.266 13 24.07 13c-2.176 0-3.895.559-5.152 1.672-1.191 1.055-1.824 2.504-1.902 4.328H17v1h4.5l.008-.703c.02-.824.262-1.473.723-1.941.457-.473 1.074-.707 1.84-.707 1.617 0 2.422.871 2.422 2.617 0 .578-.152 1.129-.465 1.648-.309.52-.934 1.195-1.871 2.027-.938.828-1.582 1.672-1.934 2.527-.355.855-.531 2.086-.531 3.531h3.98l.063-1.023c.113-1.012.563-1.891 1.352-2.645l1.262-1.191c.98-.949 1.672-1.813 2.063-2.59.395-.781.594-1.609.594-2.484C31 17.137 30.395 15.645 29.184 14.586z"/></svg>

After

Width:  |  Height:  |  Size: 978 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 48 48"><path fill="#7CB342" d="M42.36,3.967c-1.839,0-7.27,0.669-11.36,8.033c-5,9-6,10-8,12S11,34,11,34s-5,4-6,8c0,0,1.943,2,5.972,2S23,44,34,33c8-9,8-19,8-19s0-2,0-6c0-3.162,1-4,1-4S42.769,3.967,42.36,3.967L42.36,3.967z"/><path fill="#388E3C" d="M32.748,12.971c-5.136,9.245-6.204,10.314-8.334,12.443c-2.055,2.055-11.753,9.818-12.165,10.147c-1.058,0.851-3.663,3.288-4.838,5.676C8.157,41.606,9.335,42,10.972,42c3.909,0,11.18,0,21.572-10.372c7.32-8.268,7.455-17.541,7.456-17.633V8c0-0.626,0.034-1.186,0.094-1.688C38.004,6.935,35.17,8.612,32.748,12.971z"/><path fill="#C5E1A5" d="M34.5 18A2.5 2.5 0 1 0 34.5 23 2.5 2.5 0 1 0 34.5 18zM37 11A2 2 0 1 0 37 15 2 2 0 1 0 37 11zM30 24A3 3 0 1 0 30 30 3 3 0 1 0 30 24zM24.5 30A2.5 2.5 0 1 0 24.5 35 2.5 2.5 0 1 0 24.5 30zM19 35A2 2 0 1 0 19 39 2 2 0 1 0 19 35zM13 37A2 2 0 1 0 13 41 2 2 0 1 0 13 37z"/><path fill="#8BC34A" d="M43,4c0,0-7-1-12,8s-6,10-8,12S11,34,11,34s-5,4-6,8c0,0,10-3,21-14c8-9,7-13,13-20C41.058,5.599,43,4,43,4z"/></svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 48 48"><desc>root</desc><path fill="#388e3c" d="M42.6,18.9c0,0-0.1-0.1-0.1-0.1c-0.5-0.6,0.2-0.1,0.4-0.4c0.2-0.3-0.5-0.9-0.7-1.1 c-0.4-0.3-0.8-0.5-1.3-0.6c0.2,0,0.6,0,0.6-0.2c0-0.2-0.6-0.5-0.8-0.6c-0.4-0.2-0.8-0.4-1.2-0.6c-0.4-0.1-0.7-0.1-1.1-0.1 c0.1-0.1,0.3-0.1,0.4-0.3c-0.4-0.6-2.2-0.3-2.7,0.1c0.2-0.2,0.3-0.5-0.1-0.5c-0.3,0-0.6,0.1-0.9,0.2c-4.2,1.3-7,4.2-7.9,5.2 c-0.9,1-1.3,1.9-1.3,1.9c1.2-1.2,2.7-2.3,4.3-3.1c1-0.5,2.8-1.2,3.9-0.5c0.3,0.2,0.5,0.4,0.8,0.4c0-0.1,0.1-0.2,0.1-0.3 c0.3,0.3,0,0.8,0.3,1.2c0.4,0.5,0.7,0.3,1.1,0c-0.1,0.4,0,1,0.3,1.4c0.3,0.4,0.8,0.4,0.9-0.1c0.1,0.5,0.7,2.3,1.5,1.5 c0.5-0.5,0.8-1.6,0.5-2.2c0.3,0.4,0.6,1.1,1,1.4c0.4,0.3,0.8,0.3,1.3,0.1c0.6-0.4,0.6-1,0.6-1.6c0-0.4,0.1-0.1,0.3-0.2 C43.2,19.6,42.8,19.1,42.6,18.9z"/><path fill="#388e3c" d="M29.1,5.4C29.2,5.4,29.2,5.5,29.1,5.4c0.7,0.6,0.2-0.1,0.5-0.3c0.3-0.2,0.9,0.5,1.1,0.7 c0.3,0.4,0.5,0.8,0.6,1.3c0-0.2,0-0.6,0.2-0.6c0.2,0,0.5,0.6,0.6,0.8c0.2,0.4,0.4,0.8,0.6,1.2c0.1,0.4,0.1,0.7,0.1,1.1 c0.1-0.1,0.1-0.3,0.3-0.4c0.6,0.4,0.3,2.2-0.1,2.7c0.2-0.2,0.5-0.3,0.5,0.1c0,0.3-0.1,0.6-0.2,0.9c-1.3,4.2-4.2,7-5.2,7.9 c-1,0.9-1.9,1.3-1.9,1.3c1.2-1.2,2.3-2.7,3.1-4.3c0.5-1,1.2-2.8,0.5-3.9c-0.2-0.3-0.4-0.5-0.4-0.8c0.1,0,0.2-0.1,0.3-0.1 c-0.3-0.3-0.8,0-1.2-0.3c-0.5-0.4-0.3-0.7,0-1.1c-0.4,0.1-1,0-1.4-0.3c-0.4-0.3-0.4-0.8,0.1-0.9c-0.5-0.1-2.3-0.7-1.5-1.5 c0.5-0.5,1.6-0.8,2.2-0.5c-0.3-0.3-1.1-0.6-1.4-1c-0.3-0.4-0.3-0.8-0.1-1.3c0.4-0.6,1-0.6,1.6-0.6c0.4,0,0.1-0.1,0.2-0.3 C28.4,4.8,28.9,5.2,29.1,5.4z"/><path fill="#4caf50" d="M41.6,6.4c-0.8-0.8-1.6-0.3-2.3,0.4c0.2-0.3,0-0.6-0.4-0.7c-0.3-0.1-0.6,0.1-0.8,0.3 c-0.4,0.4-0.4,1.1-0.4,1.6c-0.3-0.7-1.1-0.4-1.4,0.2c-0.2,0.5-0.2,1.1-0.2,1.6c-0.3-0.3-0.7-0.3-1.1,0.1c-1,1.1-1.1,4.1-6.1,8.9 c-0.1,0.1,0.2,0.3,0.2,0.3c6.1-5.9,7.8-5,9.1-6c0.3-0.3,0-0.5-0.3-0.6c0.4,0,0.8-0.1,1.1-0.1c0.5-0.1,1-0.2,1.4-0.5 c0.2-0.2,0.4-0.6,0.3-0.9c-0.2-0.3-0.5-0.3-0.8-0.3c0.6-0.1,1.3-0.2,1.8-0.6C42,9.6,42.1,9.3,42.1,9c0-0.2-0.2-0.7-0.5-0.6 C42.1,7.9,42.1,6.9,41.6,6.4z"/><path fill="#ff9800" d="M31,27.1c2-2,1.9-5.5-1.4-8.7C26.4,15.1,23,15,21,17C16.7,21.7,5.9,39.8,7.1,40.9 C8.1,41.9,24.7,32.4,31,27.1z"/><path fill="#ef6c00" d="M19.9 28.4c.2.2.4.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4l-4.5-4.5c-.4.6-.8 1.1-1.1 1.7L19.9 28.4zM19.5 18.8l1.9 1.9c.2.2.5.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4l-2.1-2.1C20.4 17.7 20 18.2 19.5 18.8zM9.4 36.9c.2.2.5.3.7.3.3 0 .5-.1.7-.3.4-.4.4-1 0-1.4l-1.2-1.2c-.4.7-.7 1.3-1 1.9L9.4 36.9zM26.9 25.3c-.4-.4-1-.4-1.4 0s-.4 1 0 1.4l2.6 2.6c.6-.4 1.1-.8 1.6-1.2L26.9 25.3zM17 35c-.3 0-.5-.1-.7-.3l-3.1-3.1c-.4-.4-.4-1 0-1.4s1-.4 1.4 0l3.1 3.1c.4.4.4 1 0 1.4C17.5 34.9 17.3 35 17 35z"/></svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 48 48"><desc>seed</desc><path fill="#E0AC6E" d="M36 19.999L16 6 4 22.999 25 36.999 31 36.999 38.072 25.394z"/><path fill="#5D4037" d="M36.484 35.725c1.26 1.201 2.741 1.631 3.299.953.562-.677-.008-2.203-1.269-3.404s-2.738-1.631-3.299-.952C34.654 32.996 35.225 34.522 36.484 35.725zM30.359 38.434c1.616.77 3.221.751 3.571-.042.355-.794-.673-2.063-2.29-2.828-1.616-.768-3.218-.752-3.57.043C27.715 36.398 28.743 37.665 30.359 38.434zM29.484 31.725c1.26 1.201 2.741 1.631 3.299.953.562-.677-.008-2.203-1.269-3.404s-2.738-1.631-3.299-.952C27.654 28.996 28.225 30.522 29.484 31.725zM40 39.999A3 1.5 0 1 0 40 42.999 3 1.5 0 1 0 40 39.999z"/><path fill="#FFCC80" d="M16 6L18.215 11.653 10 22.999 4 22.999 25 36.999 36 19.999z"/><path fill="#558B2F" d="M28,23c0,3.315-2.684,5.999-6,5.999S16,26.315,16,23c0-3.317,2.684-6.001,6-6.001S28,19.683,28,23"/><g><path fill="#FFF" d="M20.536 19.943c0-.829.655-1.498 1.464-1.498s1.464.669 1.464 1.498c0 .832-1.464 3.002-1.464 3.002S20.536 20.775 20.536 19.943M23.464 25.945c0 .831-.655 1.5-1.464 1.5s-1.464-.669-1.464-1.5 1.464-3 1.464-3S23.464 25.114 23.464 25.945"/><path fill="#FFF" d="M18.732 22.743c-.701-.415-.939-1.329-.536-2.049.403-.719 1.3-.964 2.001-.547C20.896 20.562 22 22.945 22 22.945S19.433 23.156 18.732 22.743M25.268 23.146c.701.415.939 1.331.536 2.049-.403.72-1.3.964-2.001.549C23.103 25.33 22 22.945 22 22.945S24.567 22.731 25.268 23.146"/><path fill="#FFF" d="M25.268 22.743c.701-.415.939-1.329.536-2.049-.403-.719-1.3-.964-2.001-.547C23.103 20.562 22 22.945 22 22.945S24.567 23.156 25.268 22.743M18.732 23.146c-.701.415-.939 1.331-.536 2.049.403.72 1.3.964 2.001.549C20.896 25.33 22 22.945 22 22.945S19.433 22.731 18.732 23.146"/></g><path fill="#FFC107" d="M23.5,23c0,0.828-0.671,1.499-1.5,1.499S20.5,23.828,20.5,23c0-0.83,0.671-1.501,1.5-1.501S23.5,22.17,23.5,23"/></svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 48 48"><desc>stem</desc><path fill="#558B2F" d="M22,16v28c0,1.1-0.9,2-2,2s-2-0.9-2-2V16H22z M26,16v28c0,1.1,0.9,2,2,2s2-0.9,2-2V16H26z"/><path fill="#1B5E20" d="M20,5c0,0,3,3.8,3,8.5S21.7,22,20,22s-3-3.8-3-8.5S20,5,20,5z M25,13.5c0,4.7,1.3,8.5,3,8.5s3-3.8,3-8.5S28,5,28,5S25,8.8,25,13.5z"/><path fill="#8BC34A" d="M26,16v28c0,1.1-0.9,2-2,2s-2-0.9-2-2V16H26z M30,16v28c0,1.1,0.9,2,2,2s2-0.9,2-2V16H30z M14,16v28c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2V16H14z"/><path fill="#689F38" d="M32,2c0,0,3,3.8,3,8.5S33.7,19,32,19c-1.7,0-3-3.8-3-8.5S32,2,32,2z M13,10.5c0,4.7,1.3,8.5,3,8.5s3-3.8,3-8.5S16,2,16,2S13,5.8,13,10.5z M21,10.5c0,4.7,1.3,8.5,3,8.5s3-3.8,3-8.5S24,2,24,2S21,5.8,21,10.5z"/><path fill="#2E7D32" d="M17,7c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1s1-3,1-3S17,6.4,17,7z M14,7c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S14,7,14,7z M18,7c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S18,7,18,7z M16,10c0,0-1,2.4-1,3s0.4,1,1,1c0.6,0,1-0.4,1-1S16,10,16,10z M13.4,14.7c0.2,0.9,0.4,1.7,0.7,2.3c0.5,0,1-0.5,1-1c0-0.6-1-3-1-3S13.7,13.9,13.4,14.7z M18,13c0,0-1,2.4-1,3c0,0.5,0.4,0.9,0.9,1c0.3-0.7,0.5-1.5,0.7-2.4C18.4,13.8,18,13,18,13z M16,16c0,0-1,2.4-1,3s0.4,1,1,1c0.6,0,1-0.4,1-1S16,16,16,16z M24,4c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S24,4,24,4z M22,7c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S22,7,22,7z M26,7c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S26,7,26,7z M24,10c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S24,10,24,10z M21.4,14.7c0.2,0.9,0.4,1.7,0.7,2.3c0.5,0,1-0.5,1-1c0-0.6-1-3-1-3S21.7,13.9,21.4,14.7z M26,13c0,0-1,2.4-1,3c0,0.5,0.4,0.9,0.9,1c0.3-0.7,0.5-1.5,0.7-2.4C26.4,13.8,26,13,26,13z M24,16c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S24,16,24,16z M32,4c0,0-1,2.4-1,3s0.4,1,1,1c0.6,0,1-0.4,1-1S32,4,32,4z M30,7c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S30,7,30,7z M34,7c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S34,7,34,7z M32,10c0,0-1,2.4-1,3s0.4,1,1,1c0.6,0,1-0.4,1-1S32,10,32,10z M29.4,14.7c0.2,0.9,0.4,1.7,0.7,2.3c0.5,0,1-0.5,1-1c0-0.6-1-3-1-3S29.7,13.9,29.4,14.7z M34,13c0,0-1,2.4-1,3c0,0.5,0.4,0.9,0.9,1c0.3-0.7,0.5-1.5,0.7-2.4C34.4,13.8,34,13,34,13z M32,16c0,0-1,2.4-1,3s0.4,1,1,1c0.6,0,1-0.4,1-1S32,16,32,16z"/><path fill="#558B2F" d="M17,26c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1s1-3,1-3S17,25.4,17,26z M24,23c0,0-1,2.4-1,3s0.4,1,1,1s1-0.4,1-1S24,23,24,23z M32,23c0,0-1,2.4-1,3s0.4,1,1,1c0.6,0,1-0.4,1-1S32,23,32,23z"/></svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50" height="50"><path fill="#EF6C00" d="M43,6c-0.1-1.1-1-1-1-1s-12.3-0.8-19.1,6c-3.7,3.8-5,7.8-6.2,11.4c-0.7,2.1-1.6,3.9-2.4,5.7C12.1,33,10.5,34.4,9,35c-0.7,0.3-3.4,0.2-4,1.4c-0.3,0.6,0.1,1.3,0.7,2c2.3,2.3,7.2,4.6,13,4.6c0.2,0,0.4,0,0.6,0c4.4-0.1,9.9-0.9,15.7-7c4.7-4.9,5.9-12.3,5.9-18c0-3.1-0.4-5.6-0.9-7C39.1,8.1,43,6.9,43,6z"/><path fill="#BF360C" d="M34,18c-0.4,0-0.7-0.2-0.9-0.5C31.8,15,29,15,29,15c0,0,0,0,0,0c-0.5,0-1-0.4-1-1c0-0.6,0.4-1,1-1c0.2,0,4-0.1,5.9,3.5c0.3,0.5,0.1,1.1-0.4,1.4C34.3,18,34.2,18,34,18z M35.5,25.9c0.5-0.3,0.7-0.9,0.4-1.3c-1.5-3-4.6-3.5-4.7-3.5c-0.6-0.1-1.1,0.3-1.1,0.8c-0.1,0.5,0.3,1.1,0.8,1.1c0,0,2.2,0.4,3.3,2.5c0.2,0.3,0.5,0.5,0.9,0.5C35.2,26,35.3,26,35.5,25.9z M25.4,26.9c0.5-0.2,0.8-0.8,0.5-1.3c-1-2.4-3.7-2.6-3.9-2.6c-0.5,0-1,0.4-1.1,0.9c0,0.5,0.4,1,0.9,1.1c0,0,1.7,0.2,2.2,1.4c0.2,0.4,0.5,0.6,0.9,0.6C25.1,27,25.3,27,25.4,26.9z M28.2,36c0.5-0.1,0.9-0.6,0.8-1.2c-0.4-1.7-1.9-2.6-2.7-2.8c-0.5-0.1-1.1,0.2-1.2,0.7c-0.1,0.5,0.2,1.1,0.7,1.2c0,0,1.1,0.3,1.3,1.2c0.1,0.5,0.5,0.8,1,0.8C28.1,36,28.1,36,28.2,36z M19.2,36c0.5-0.1,0.9-0.6,0.8-1.2c-0.4-1.8-1.9-2.6-2.8-2.8c-0.5-0.1-1.1,0.2-1.2,0.8c-0.1,0.5,0.2,1.1,0.8,1.2c0,0,1,0.2,1.2,1.2c0.1,0.5,0.5,0.8,1,0.8C19.1,36,19.1,36,19.2,36z"/><path fill="#D84315" d="M21,40c-7.8,0.4-9-5-9-5s-0.1-1.4,0.5-3.4c-1.3,2.1-2.4,2.9-3.5,3.4c-0.4,0.2-1.7,0.2-2.6,0.5c-0.6,0.2-1.1,0.5-1.3,0.9C5,36.6,4.9,36.7,5,36.9c0,0.5,0.3,1,0.8,1.5c2.3,2.3,7.2,4.6,13,4.6c0.2,0,0.4,0,0.6,0c1.6,0,3.4-0.2,5.3-0.6c1.6-0.4,3.3-1,5-2c0.7-0.4,1.4-0.9,2.1-1.4s1.4-1.1,2.2-1.8c0.4-0.3,0.7-0.7,1.1-1.1c1.8-1.8,3-4,3.9-6.4c0.3-0.8,0.6-1.6,0.8-2.4s0.4-1.6,0.6-2.4c0.2-0.8,0.3-1.6,0.4-2.4c0.1-1.2,0.2-2.3,0.2-3.4c0-0.4,0-0.7,0-1.1C41.2,30.9,28.8,39.6,21,40z"/></svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="100px" height="100px"><path fill="#d81b60" d="M28,20c-1.7,0-3,0.6-4,0.6S21.5,20,20,20c-5.5,0-9,4-9,9.1s4,9.9,8.4,9.9c-0.2,0-0.3,0-0.4,0 c4,0,5,4,5,4s1-4,5.5-4c-0.1,0-0.3,0-0.4,0c3.9,0,7.8-4.8,7.8-9.9S33.8,20,28,20z"/><path fill="#ad1457" d="M20.8 21.9c0 1.7 1.4 3.2 3.2 3.2s3.2-1.4 3.2-3.2c0-.7-.2-1.3-.6-1.8-1 .2-1.9.4-2.6.4-.7 0-1.6-.3-2.6-.4C21.1 20.6 20.8 21.3 20.8 21.9zM20.1 28H17c-.6 0-1-.4-1-1s.4-1 1-1h3.1c.6 0 1 .4 1 1S20.6 28 20.1 28zM32 29h-4c-.6 0-1-.4-1-1s.4-1 1-1h4c.6 0 1 .4 1 1S32.6 29 32 29zM23 33h-6.6c-.6 0-1-.4-1-1s.4-1 1-1H23c.6 0 1 .4 1 1S23.6 33 23 33zM29 37h-4.3c-.6 0-1-.4-1-1s.4-1 1-1H29c.6 0 1 .4 1 1S29.6 37 29 37z"/><path fill="#4caf50" d="M38.1,7.4c-0.4-0.4,0-0.2,0.1-0.5c0.2-0.4-0.6-0.5-1-0.5c-0.1,0-0.1,0-0.2,0c-1.1-0.1,0.1-0.3,0-0.8 s-1.3-0.4-1.6-0.4c-0.6,0.1-1.3,0.3-1.8,0.6c0.2-0.1,0.5-0.5,0.3-0.7c-0.2-0.2-1,0.1-1.3,0.1c-0.6,0.2-1.1,0.3-1.7,0.6 c-0.4,0.2-0.7,0.6-1.1,0.9c0-0.2,0.1-0.4,0.1-0.6c-0.9-0.2-2.4,1.7-2.3,2.6c0-0.4,0-1.1-0.5-0.7C26.9,8.4,24,11.5,24,18 c0,1.8,0,2.4,0,3.1c0,0.2,0,0.3,0,0.4V23c0.5,0,0.9-0.4,1-0.9c0,0,0,0,0,0c0.2-1.4,0.6-2.9,1.2-4.6c0.4-1.4,1-3,2.6-3.3 c0.4-0.1,1,0.1,1.4-0.3c-0.1-0.1-0.5-1.2-0.6-1.3c0.5,0.1,1,0.9,1.6,1c0.8,0.1,0.9-0.4,1-1c0.3,0.5,1,0.9,1.5,1 c0.6,0.1,1.1-0.4,0.7-1c0.6,0.4,2.8,1.6,2.8,0c0-0.9-0.8-2.2-1.6-2.5c0.6,0,1.5,0.4,2.2,0.3c0.6,0,1-0.4,1.2-1 C39.2,8.6,38.6,8,38.1,7.4z"/><path fill="#388e3c" d="M24,18c0-6.5-2.9-9.6-3.1-10c-0.5-0.4-0.5,0.3-0.5,0.7c0.1-0.9-1.4-2.8-2.3-2.6 c0,0.2,0.1,0.4,0.1,0.6c-0.4-0.3-0.7-0.7-1.1-0.9c-0.6-0.3-1.1-0.4-1.7-0.6c-0.3,0-1.1-0.3-1.3-0.1c-0.2,0.2,0.1,0.6,0.3,0.7 c-0.5-0.3-1.2-0.5-1.8-0.6c-0.3,0-1.5-0.1-1.6,0.4c-0.1,0.5,1.1,0.7,0,0.8c-0.1,0-0.1,0-0.2,0c-0.4,0-1.2,0.1-1,0.5 C9.9,7.2,10.3,7,9.9,7.4C9.4,8,8.8,8.6,9,9.5c0.2,0.6,0.6,1,1.2,1c0.7,0.1,1.6-0.3,2.2-0.3c-0.8,0.3-1.6,1.6-1.6,2.5 c0,1.6,2.2,0.4,2.8,0c-0.4,0.6,0.1,1.1,0.7,1c0.5-0.1,1.2-0.5,1.5-1c0.1,0.6,0.2,1.1,1,1c0.6-0.1,1.1-0.9,1.6-1 c-0.1,0.1-0.5,1.2-0.6,1.3c0.4,0.4,1,0.2,1.4,0.3c1.6,0.3,2.2,1.9,2.6,3.3c0.6,1.8,1,3.3,1.2,4.4c0,0.6,0.4,1,1,1v-2 C24,20.3,24,19.7,24,18z"/></svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" version="1.1" viewBox="0 0 48 48"><g id="surface1025178"><path fill="#8BC34A" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 24 25 C 23.398438 25 23 24.5 23 24 C 23 23.898438 23.101562 18.398438 19.699219 16.300781 C 19.199219 16 19.101562 15.398438 19.398438 14.898438 C 19.699219 14.398438 20.300781 14.300781 20.800781 14.601562 C 25.199219 17.398438 25.101562 23.800781 25.101562 24.101562 C 25 24.601562 24.5 25 24 25 Z M 24 25"/><path fill="#8BC34A" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 20.199219 7 C 15.398438 4.601562 7.898438 7.300781 6 8 C 8.800781 9.699219 8.398438 18.898438 13.5 20.601562 C 17.101562 21.800781 19.898438 20.398438 20.199219 15.398438 C 24.199219 13.101562 23.601562 8.699219 20.199219 7 Z M 24 28 C 23.398438 28 23 27.601562 23 27 L 23 24 C 23 16.199219 28.800781 15 28.800781 15 C 29.300781 14.898438 29.898438 15.300781 30 15.800781 C 30.101562 16.300781 29.699219 16.898438 29.199219 17 C 29 17 25 17.898438 25 24 L 25 27 C 25 27.601562 24.601562 28 24 28 Z M 24 28"/><path fill="#8BC34A" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 30.199219 8.300781 C 34.601562 6.898438 40.601562 11 42 12 C 39.398438 13 37.699219 21.300781 33.101562 21.898438 C 29.898438 22.300781 28.199219 20.601562 29 16 C 25.398438 13.199219 27.101562 9.199219 30.199219 8.300781 Z M 30.199219 8.300781"/><path fill="#689F38" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 13.5 20.601562 C 8.398438 18.898438 8.800781 9.699219 6 8 C 8.5 8.199219 12.101562 10.398438 20.199219 15.398438 C 19.898438 20.398438 17.199219 21.800781 13.5 20.601562 Z M 33.199219 21.898438 C 37.699219 21.300781 39.398438 13 42.101562 12 C 40 11.699219 36.699219 12.898438 29.101562 16 C 27.398438 20.5 29.898438 22.398438 33.199219 21.898438 Z M 33.199219 21.898438"/><path fill="#E64A19" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 13 27 L 16 42 L 32 42 L 35 27 Z M 13 27"/><path fill="#BF360C" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 35 30 L 13 30 C 12.398438 30 12 29.5 12 29 L 12 25 L 36 25 L 36 29 C 36 29.5 35.5 30 35 30 Z M 35 30"/><path fill="#43A047" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38"/><path fill="#FFF" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36"/></g></svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#e39d36" d="M32.4,29.1l-13.2,7.8c0,0,3.1,4,3.1,4l12.6-7.6c1.2-0.7,1.5-2.2,0.8-3.3 C35.1,28.8,33.6,28.4,32.4,29.1"/><path fill="#689f38" d="M32.7,13.2C31.1,8.5,23.8,5.7,22,5c0.8,2.9-4.8,8.8-2.5,13.2c1.6,3.1,4.6,4,8,0.8 C31.3,19.9,33.9,16.5,32.7,13.2z"/><path fill="#8bc34a" d="M27,26C27,26,27,26,27,26c-0.6,0-1-0.5-1-1.1c0-0.1,0.5-7.9-2.9-11.7c-0.4-0.4-0.3-1,0.1-1.4 c0.4-0.4,1-0.3,1.4,0.1c3.9,4.5,3.4,12.8,3.4,13.2C28,25.6,27.5,26,27,26z"/><path fill="#8bc34a" d="M19.6,18.2C17.3,13.8,22.8,7.9,22,5c1.5,1.7,3.5,5.5,5.5,14c0,0,0,0,0,0 C24.1,22.2,21.2,21.3,19.6,18.2z"/><path fill="#795548" d="M27 27c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S27 25.3 27 27zM33 32c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S33 30.3 33 32z"/><path fill="#795548" d="M30 29c0-1.7-1.6-3-3.5-3S23 27.3 23 29s1.6 3 3.5 3S30 30.7 30 29zM23 28c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S23 26.3 23 28z"/><path fill="#795548" d="M31 26.5c0 1.4-1.1 2.5-2.5 2.5S26 27.9 26 26.5s1.1-2.5 2.5-2.5S31 25.1 31 26.5zM36 30c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S36 28.9 36 30z"/><path fill="#795548" d="M34,27.5c0,1.4-1.1,2.5-2.5,2.5S29,28.9,29,27.5s1.1-2.5,2.5-2.5S34,26.1,34,27.5z"/><path fill="#ffb74d" d="M38.9,30.4l-12.4,7.3c0,0,0,0,0,0l-5.9-3.4l2.9,1.6c1.3,0.7,2.9,0.5,3.9-0.6 c1.3-1.5,0.9-3.8-0.8-4.7l-12.4-6.8c-1.1-0.6-2.5-0.6-3.7,0L5,27.1c0,0,0,0,0,0.1v10.7l4-2.6l15.1,8.2c1.2,0.6,2.6,0.6,3.8-0.1 l13.8-8.3c1.3-0.8,1.7-2.4,0.9-3.7C41.9,30.1,40.2,29.7,38.9,30.4"/><path fill="#eda740" d="M27.5,35.4c-0.7,0.9-1.9,1.2-3,1l-0.2,0.1l2.2,1.3l12.4-7.3c0.1-0.1,0.2-0.1,0.3-0.1 c-0.7-1.1-2.1-1.4-3.2-0.7l-7.8,4.6C28,34.6,27.8,35,27.5,35.4z"/><path fill="#eda740" d="M26.5,37.8L26.5,37.8l-1.3-0.9l-10.7-6l8,6.6C23.7,38.4,25.2,38.5,26.5,37.8"/><path fill="#ffcc80" d="M24.4,35.2c-0.9-0.5-0.6-1.3-0.1-2.2c0.5-0.9,0.9-1.6,1.8-1.1s1.3,1.6,0.8,2.5 C26.5,35.3,25.4,35.6,24.4,35.2"/></svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#8bc34a" d="M23,43c-0.6,0-1-0.4-1-1c0-0.2-0.1-5.4-5.4-8.1c-0.5-0.2-0.7-0.8-0.4-1.3c0.2-0.5,0.8-0.7,1.3-0.4 c6.5,3.2,6.6,9.6,6.6,9.9C24,42.6,23.6,43,23,43z"/><path fill="#8bc34a" d="M19.6 26.8C15.5 24.6 8.6 27.4 7 28c2.4 1.5 2.5 9.2 6.9 10.7 3.1 1.1 5.7-.3 5.9-4.6C23 32.3 22.5 28.3 19.6 26.8zM23 43c-.6 0-1-.4-1-1 0-6.7 4.6-7.9 4.8-8 .5-.1 1.1.2 1.2.7.1.5-.2 1.1-.7 1.2-.1 0-3.3 1-3.3 6C24 42.6 23.6 43 23 43z"/><path fill="#8bc34a" d="M27.8,28.2c3.8-1.1,9,2,10.2,2.8c-2.3,0.8-3.7,7.5-7.7,8c-2.8,0.3-4.7-1.2-4.1-4.8 C23.9,32.1,25.1,29,27.8,28.2z"/><path fill="#689f38" d="M13.9 38.7C9.5 37.2 9.4 29.5 7 28c0 0 0 0 0 0 2.1.2 5.9 1.6 12.8 6 0 0 0 0 0 0C19.6 38.4 17 39.7 13.9 38.7zM30.3 39c3.9-.5 5.4-7.1 7.7-8 0 0 0 0 0 0-1.8-.2-5.2.7-11.8 3.1 0 0 0 0 0 0C25.6 37.8 27.5 39.3 30.3 39z"/><path fill="#ff9800" d="M25,8h13v13H25V8z"/><path fill="#ff9800" d="M31.5,24L22,14.5L31.5,5l9.5,9.5L31.5,24z"/><path fill="#ffeb3b" d="M27,14.5c0,2.5,2,4.5,4.5,4.5s4.5-2,4.5-4.5c0-2.5-2-4.5-4.5-4.5S27,12,27,14.5"/></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="144" height="144"><path fill="#8bc34a" d="M24,25C24,25,24,25,24,25c-0.6,0-1-0.5-1-1c0-0.1,0.1-5.6-3.3-7.7c-0.5-0.3-0.6-0.9-0.3-1.4 c0.3-0.5,0.9-0.6,1.4-0.3c4.4,2.8,4.3,9.2,4.3,9.5C25,24.6,24.5,25,24,25z"/><path fill="#8bc34a" d="M20.2 7C15.4 4.6 7.9 7.3 6 8c2.8 1.7 2.4 10.9 7.5 12.6 3.6 1.2 6.4-.2 6.7-5.2C24.2 13.1 23.6 8.7 20.2 7zM24 28c-.6 0-1-.4-1-1v-3c0-7.8 5.8-9 5.8-9 .5-.1 1.1.3 1.2.8.1.5-.3 1.1-.8 1.2C29 17 25 17.9 25 24v3C25 27.6 24.6 28 24 28z"/><path fill="#8bc34a" d="M30.2,8.3C34.6,6.9,40.6,11,42,12c-2.6,1-4.3,9.3-8.9,9.9c-3.2,0.4-4.9-1.3-4.1-5.9 C25.4,13.2,27.1,9.2,30.2,8.3z"/><path fill="#689f38" d="M13.5 20.6C8.4 18.9 8.8 9.7 6 8c2.5.2 6.1 2.4 14.2 7.4C19.9 20.4 17.2 21.8 13.5 20.6zM33.2 21.9c4.5-.6 6.2-8.9 8.9-9.9-2.1-.3-5.4.9-13 4C27.4 20.5 29.9 22.4 33.2 21.9z"/><path fill="#e64a19" d="M13,27l3,15h16l3-15H13z"/><path fill="#bf360c" d="M35,30H13c-0.6,0-1-0.5-1-1v-4h24v4C36,29.5,35.5,30,35,30z"/></svg>

After

Width:  |  Height:  |  Size: 997 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#1565C0" d="M20,36h16l6,6V20c0-2.209-1.791-4-4-4H20c-2.209,0-4,1.791-4,4v12C16,34.209,17.791,36,20,36"/><path fill="#2196F3" d="M29,26H12l-6,6V10c0-2.209,1.791-4,4-4h19c2.209,0,4,1.791,4,4v12C33,24.209,31.209,26,29,26"/></svg>

After

Width:  |  Height:  |  Size: 321 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path fill="#546E7A" d="M13,32.827c-1.344-0.115-2.891-0.246-3-0.246c-0.87,0-1.694-0.174-2.44-0.479c-0.641-0.262-1.222-0.624-1.721-1.064c-0.323,0.695-0.434,1.492-0.238,2.293c1.009,4.12,4.382,5.409,7.399,5.628V32.827z"/><path fill="#CFD8DC" d="M35,31.002C31.78,36.152,26.075,41,20,41S9,36.075,9,30s4.925-11,11-11c0.7,0,4.159,0.002,6,0.002c0.918,0,2-1,2-2.002C42.667,16.752,39,24.002,35,31.002z"/><path fill="#78909C" d="M31,13c-5.524-2.763-15.654-2.004-15.749-2.014c-1.374-0.137-2.376-1.361-2.239-2.736c0.138-1.373,1.365-2.373,2.736-2.238c0.427,0.042,10.511-0.389,16.869,4.251c2.383,1.739,1.736,2.119,1.118,3.354C33.297,14.493,31.359,13.18,31,13z"/><path fill="#78909C" d="M44,20c0,3.313-6.687,3-10,3s-6-2.687-6-6s2.687-6,6-6S44,14,44,20z"/><path fill="#B0BEC5" d="M30.553,12.094C23.485,8.744,13.875,9.95,13.449,9.96c-1.377,0.029-2.477,1.17-2.449,2.55c0.028,1.381,1.17,2.478,2.551,2.449c0.09-0.002,8.996-1.756,14.882-0.191C28.869,13.684,29.61,12.757,30.553,12.094z"/><path fill="#90A4AE" d="M37 39V27.286c-.589 1.218-1.288 2.471-2 3.716-.827 1.323-1.82 2.625-2.94 3.831L33 40.005c0 0 0 1.995 2 1.995 1.115 0 4 0 4 0v-1C39 41 39 39 37 39zM25 32.5C25 41 15 39 12 39c0 0 0-1 0-6.5 0-3.59 2.91-6.5 6.5-6.5S25 28.91 25 32.5z"/><path fill="#90A4AE" d="M27,39H14h-2v3h17v-1C29,39.896,28.104,39,27,39z"/><path fill="#455A64" d="M40,17c0,0-1.594,0-2.422,0c-2,0-2.578-3-2.578-3s1.625,0,2.453,0C39.453,14,40,17,40,17z"/><path d="M37.5 14A1.5 1.5 0 1 0 37.5 17A1.5 1.5 0 1 0 37.5 14Z"/></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" version="1.1" viewBox="0 0 48 48"><g id="surface1048733"><path fill="#E0AC6E" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 36 20 L 16 6 L 4 23 L 25 37 L 31 37 L 38.070312 25.394531 Z M 36 20"/><path fill="#5D4037" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 36.484375 35.726562 C 37.742188 36.925781 39.226562 37.355469 39.78125 36.679688 C 40.34375 36 39.773438 34.476562 38.515625 33.273438 C 37.253906 32.074219 35.777344 31.644531 35.214844 32.320312 C 34.652344 32.996094 35.226562 34.523438 36.484375 35.726562 Z M 30.359375 38.433594 C 31.976562 39.203125 33.578125 39.183594 33.929688 38.390625 C 34.285156 37.597656 33.257812 36.328125 31.640625 35.5625 C 30.023438 34.796875 28.421875 34.8125 28.070312 35.605469 C 27.714844 36.398438 28.742188 37.664062 30.359375 38.433594 Z M 29.484375 31.726562 C 30.742188 32.925781 32.226562 33.355469 32.78125 32.679688 C 33.34375 32 32.773438 30.476562 31.515625 29.273438 C 30.253906 28.074219 28.777344 27.644531 28.214844 28.320312 C 27.652344 28.996094 28.226562 30.523438 29.484375 31.726562 Z M 40 40 C 38.34375 40 37 40.671875 37 41.5 C 37 42.328125 38.34375 43 40 43 C 41.65625 43 43 42.328125 43 41.5 C 43 40.671875 41.65625 40 40 40 Z M 40 40"/><path fill="#FFCC80" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 16 6 L 18.214844 11.652344 L 10 23 L 4 23 L 25 37 L 36 20 Z M 16 6"/><path fill="#558B2F" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 28 23 C 28 26.316406 25.316406 29 22 29 C 18.683594 29 16 26.316406 16 23 C 16 19.683594 18.683594 17 22 17 C 25.316406 17 28 19.683594 28 23"/><path fill="#FFF" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 20.535156 19.941406 C 20.535156 19.113281 21.191406 18.445312 22 18.445312 C 22.808594 18.445312 23.464844 19.113281 23.464844 19.941406 C 23.464844 20.773438 22 22.945312 22 22.945312 C 22 22.945312 20.535156 20.773438 20.535156 19.941406 M 23.464844 25.945312 C 23.464844 26.777344 22.808594 27.445312 22 27.445312 C 21.191406 27.445312 20.535156 26.777344 20.535156 25.945312 C 20.535156 25.113281 22 22.945312 22 22.945312 C 22 22.945312 23.464844 25.113281 23.464844 25.945312"/><path fill="#FFF" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 18.730469 22.742188 C 18.03125 22.328125 17.792969 21.414062 18.195312 20.695312 C 18.597656 19.976562 19.496094 19.730469 20.195312 20.148438 C 20.894531 20.5625 22 22.945312 22 22.945312 C 22 22.945312 19.433594 23.15625 18.730469 22.742188 M 25.269531 23.144531 C 25.96875 23.5625 26.207031 24.476562 25.804688 25.195312 C 25.402344 25.914062 24.503906 26.160156 23.804688 25.742188 C 23.101562 25.328125 22 22.945312 22 22.945312 C 22 22.945312 24.566406 22.730469 25.269531 23.144531"/><path fill="#FFF" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 25.269531 22.742188 C 25.96875 22.328125 26.207031 21.414062 25.804688 20.695312 C 25.402344 19.976562 24.503906 19.730469 23.804688 20.148438 C 23.101562 20.5625 22 22.945312 22 22.945312 C 22 22.945312 24.566406 23.15625 25.269531 22.742188 M 18.730469 23.144531 C 18.03125 23.5625 17.792969 24.476562 18.195312 25.195312 C 18.597656 25.914062 19.496094 26.160156 20.195312 25.742188 C 20.894531 25.328125 22 22.945312 22 22.945312 C 22 22.945312 19.433594 22.730469 18.730469 23.144531"/><path fill="#FFC107" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 23.5 23 C 23.5 23.828125 22.828125 24.5 22 24.5 C 21.171875 24.5 20.5 23.828125 20.5 23 C 20.5 22.171875 21.171875 21.5 22 21.5 C 22.828125 21.5 23.5 22.171875 23.5 23"/><path fill="#43A047" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38"/><path fill="#FFF" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36"/></g></svg>

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100" fill="0" version="1.1" viewBox="0 0 48 48"><g id="surface1"><path fill="#E0AC6E" d="M 36 20 L 16 6 L 4 23 L 25 37 L 31 37 L 38.070313 25.394531 Z"/><path fill="#5D4037" d="M 36.484375 35.726563 C 37.742188 36.925781 39.226563 37.355469 39.78125 36.679688 C 40.34375 36 39.773438 34.476563 38.515625 33.273438 C 37.253906 32.074219 35.777344 31.644531 35.214844 32.320313 C 34.652344 32.996094 35.226563 34.523438 36.484375 35.726563 Z"/><path fill="#5D4037" d="M 30.359375 38.433594 C 31.976563 39.203125 33.578125 39.183594 33.929688 38.390625 C 34.285156 37.597656 33.257813 36.328125 31.640625 35.5625 C 30.023438 34.796875 28.421875 34.8125 28.070313 35.605469 C 27.714844 36.398438 28.742188 37.664063 30.359375 38.433594 Z"/><path fill="#5D4037" d="M 29.484375 31.726563 C 30.742188 32.925781 32.226563 33.355469 32.78125 32.679688 C 33.34375 32 32.773438 30.476563 31.515625 29.273438 C 30.253906 28.074219 28.777344 27.644531 28.214844 28.320313 C 27.652344 28.996094 28.226563 30.523438 29.484375 31.726563 Z"/><path fill="#5D4037" d="M 43 41.5 C 43 40.671875 41.65625 40 40 40 C 38.34375 40 37 40.671875 37 41.5 C 37 42.328125 38.34375 43 40 43 C 41.65625 43 43 42.328125 43 41.5 Z"/><path fill="#FFCC80" d="M 16 6 L 18.214844 11.652344 L 10 23 L 4 23 L 25 37 L 36 20 Z"/><path fill="#558B2F" d="M 28 23 C 28 26.316406 25.316406 29 22 29 C 18.683594 29 16 26.316406 16 23 C 16 19.683594 18.683594 17 22 17 C 25.316406 17 28 19.683594 28 23"/><path fill="#FFF" d="M 20.535156 19.941406 C 20.535156 19.113281 21.191406 18.445313 22 18.445313 C 22.808594 18.445313 23.464844 19.113281 23.464844 19.941406 C 23.464844 20.773438 22 22.945313 22 22.945313 C 22 22.945313 20.535156 20.773438 20.535156 19.941406"/><path fill="#FFF" d="M 23.464844 25.945313 C 23.464844 26.777344 22.808594 27.445313 22 27.445313 C 21.191406 27.445313 20.535156 26.777344 20.535156 25.945313 C 20.535156 25.113281 22 22.945313 22 22.945313 C 22 22.945313 23.464844 25.113281 23.464844 25.945313"/><path fill="#FFF" d="M 18.730469 22.742188 C 18.03125 22.328125 17.792969 21.414063 18.195313 20.695313 C 18.597656 19.976563 19.496094 19.730469 20.195313 20.148438 C 20.894531 20.5625 22 22.945313 22 22.945313 C 22 22.945313 19.433594 23.15625 18.730469 22.742188"/><path fill="#FFF" d="M 25.269531 23.144531 C 25.96875 23.5625 26.207031 24.476563 25.804688 25.195313 C 25.402344 25.914063 24.503906 26.160156 23.804688 25.742188 C 23.101563 25.328125 22 22.945313 22 22.945313 C 22 22.945313 24.566406 22.730469 25.269531 23.144531"/><path fill="#FFF" d="M 25.269531 22.742188 C 25.96875 22.328125 26.207031 21.414063 25.804688 20.695313 C 25.402344 19.976563 24.503906 19.730469 23.804688 20.148438 C 23.101563 20.5625 22 22.945313 22 22.945313 C 22 22.945313 24.566406 23.15625 25.269531 22.742188"/><path fill="#FFF" d="M 18.730469 23.144531 C 18.03125 23.5625 17.792969 24.476563 18.195313 25.195313 C 18.597656 25.914063 19.496094 26.160156 20.195313 25.742188 C 20.894531 25.328125 22 22.945313 22 22.945313 C 22 22.945313 19.433594 22.730469 18.730469 23.144531"/><path fill="#FFC107" d="M 23.5 23 C 23.5 23.828125 22.828125 24.5 22 24.5 C 21.171875 24.5 20.5 23.828125 20.5 23 C 20.5 22.171875 21.171875 21.5 22 21.5 C 22.828125 21.5 23.5 22.171875 23.5 23"/></g></svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M20.6 8H28.400000000000002V10H20.6z" transform="rotate(-50.193 24.499 9.004)"/><path fill="#795548" d="M15.5 5.2H17.5V13.8H15.5z" transform="rotate(-35.537 16.501 9.504)"/><path fill="#795548" d="M24,13.9L24,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C19,29,17,32.9,12.7,34c-7.7,2-7,5-7,5s0,2,2,2s6.3,0,6.3,0s12,0,12-12C26,22,25,20.9,24,13.9z"/><path fill="#bcaaa4" d="M24,14.3c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,3.5,13,1,18c-3,6-8,6-10,6 c-1.5,0,0.4,0-5.3,0v0c0,0,0,2,2,2s6.3,0,6.3,0s13,1,13-10C27,24.1,25,22,24,14.3z"/><path fill="#8bc34a" d="M31,41c-0.3,0-0.6-0.1-0.8-0.4c-0.3-0.4-0.2-1.1,0.2-1.4c0.3-0.2,6.4-4.9,5.1-13 c-0.1-0.5,0.3-1.1,0.8-1.1c0.6-0.1,1.1,0.3,1.1,0.8c1.4,9.4-5.6,14.7-5.9,15C31.4,40.9,31.2,41,31,41z"/><path fill="#8bc34a" d="M37.1,17c-0.3,0.9-1.2,1.9-2.4,2.9c0.2,0.3,0.4,0.7,0.4,1.1c0,1.1-0.9,2-2,2c-0.2,0-0.4,0-0.6-0.1 c0.4,0.4,0.6,1,0.6,1.6c0,1.4-1.1,2.5-2.5,2.5c-0.8,0-1.5-0.4-1.9-0.9c-0.3,0.7-0.5,1.3-0.6,2.1c-0.2,3.6,2,5.9,6.9,4.6 c2.9,2.7,7.2,0.8,7.9-2.8C43.9,24.9,38.3,18.5,37.1,17z"/><path fill="#689f38" d="M37.1,17C37.1,17,37.1,17,37.1,17c-0.3,0.9-1.2,1.9-2.4,2.9c0.2,0.3,0.4,0.7,0.4,1.1 c0,1.1-0.9,2-2,2c-0.2,0-0.4,0-0.6-0.1c0.4,0.4,0.6,1,0.6,1.6c0,1.4-1.1,2.5-2.5,2.5c-0.8,0-1.5-0.4-1.9-0.9 c-0.3,0.7-0.5,1.3-0.6,2.1c-0.2,3.6,2,5.9,6.9,4.6c0,0,0,0,0,0C37.7,24,37.5,19.3,37.1,17z"/><path fill="#5d4037" d="M28 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S28 5.9 28 7zM17 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S17 5.9 17 7z"/></svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M34.6 8H42.4V10H34.6z" transform="rotate(-50.208 38.5 9.003)"/><path fill="#795548" d="M29.5 5.2H31.5V13.8H29.5z" transform="rotate(-35.537 30.502 9.504)"/><path fill="#795548" d="M38,13.9L38,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C34,30.1,27,31,19,32C7.9,33.4,6,39,6,39s0,2,2,2s20,0,20,0s12,0,12-12C40,22,39,20.9,38,13.9z"/><path fill="#bcaaa4" d="M38,14.3c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,2.5,13,0,18c-3,6-7,6-9,6c-1.5,0-13.3,0-19,0 v0c0,0,0,2,2,2s20,0,20,0s13,1,13-11C41,23.1,39,22,38,14.3z"/><path fill="#5d4037" d="M42 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S42 5.9 42 7zM31 7c0 1.1-.9 2-2 2s-2-.9-2-2c0-1.1.9-2 2-2S31 5.9 31 7z"/></svg>

After

Width:  |  Height:  |  Size: 813 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#795548" d="M38,13.9L38,13.9c-0.3-1.6-1.7-2.9-3.5-2.9c-1.9,0-3.5,1.6-3.5,3.5c0,0.2,0,0.4,0.1,0.6v0 c0,0,0,0.1,0,0.1C34,30.1,27,31,19,32C7.9,33.4,6,39,6,39s0,2,2,2s20,0,20,0s12,0,12-12C40,22,39,20.9,38,13.9z"/><path fill="#795548" d="M34.6 8H42.4V10H34.6z" transform="rotate(-50.208 38.5 8.98)"/><path fill="#795548" d="M29.5 5.2H31.5V13.8H29.5z" transform="rotate(-35.537 30.502 9.481)"/><path fill="#5d4037" d="M42 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S42 5.9 42 7zM31 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2S31 5.9 31 7z"/><path fill="#bcaaa4" d="M38,14.2c-0.3-0.7-1-1.3-2-1.3c-1.1,0-2,0.9-2,2c0,0.3,2.5,13,0,18c-3,6-7,6-9,6c-1.5,0-13.3,0-19,0 c0,0,0,2,2,2s20,0,20,0s13,1,13-11C41,23.1,39,22,38,14.2z"/><path fill="#4e342e" d="M31.8,19.9C31.7,19.9,31.7,19.9,31.8,19.9C32.4,30.3,26,31.1,19,32c-2.5,0.3-4.6,0.9-6.3,1.5 c-0.4,0.3-0.7,0.4-0.9,0.4c0,0,0,0,0,0c-0.4,0.2-0.7,0.3-1,0.5c0,0,0,0,0,0c-0.3,0.2-0.6,0.3-0.9,0.5c0,0,0,0,0,0 c1.8,1.4,4,2.4,6.3,2.8c0.3,0.1,0.6,0.1,1,0.2c0.1,0,0.2,0,0.3,0c0.6,0.1,1.4,0.1,2.2,0.1c0.7,0,1.3,0,1.9-0.1l0.4-0.1l0.4-0.2 c1.2-0.7,2.2-1.5,3.1-2.4c0.8-0.8,1.5-1.7,2-2.6c3-0.7,6.3-2.5,6.4-6.1C34,26.3,34.3,23.4,31.8,19.9z"/><path fill="#ff9800" d="M6,23c0-3.3,1.3-6.4,3.3-8.7c2.4-2.7,5.8-4.3,9.7-4.3c7.2,0,13,5.8,13,13c0,0.1,0.2,1.9-0.2,3.4 C30.7,31.5,25,31,25,31s-3.1,5-6,5C11.8,36,6,30.2,6,23z"/><path fill="#ffb74d" d="M17.4 16c.2 0 .4 0 .6 0 .5 0 1 .1 1.5.1.6-1.3 1.3-3.5 1.1-6C20.1 10.1 19.6 10 19 10c-.1 0-.2 0-.3 0C18.8 12.7 17.8 15.1 17.4 16zM14.5 16.8c.7-.3 1.4-.6 2.1-.7.2-1.7.1-3.8-.7-5.8-.7.2-1.3.4-1.9.6C14.8 13 14.7 15.3 14.5 16.8zM22.6 17.5c.8-1.3 2-3.5 2.4-6-.6-.3-1.2-.6-1.9-.8-.3 2.4-1.5 4.7-2.3 5.8C21.5 16.8 22.1 17.1 22.6 17.5zM9.4 23.8l.6.4c0-.1 0-.1 0-.2 0-.7.1-1.4.3-2-.6-.3-2.1-1-4.1-.9C6.1 21.7 6 22.4 6 23c0 0 0 .1 0 .1C8 22.9 9.4 23.8 9.4 23.8zM10.2 19.6l.6.8.2-.1c.7-1.3 1.7-2.4 3-3.1-.3-1.5-1.1-3.2-2.5-4.7-.5.4-1 .8-1.5 1.3C11.3 15.2 12 17 12 18v.7l-.2-.3c-.1-.1-1.2-1.8-3.5-2.8-.4.6-.7 1.1-1 1.7C9.1 18.1 10.1 19.5 10.2 19.6zM10.1 24.9l-.4.1c-.1 0-1.7.6-3 2 .2.7.5 1.4.9 2.1 1.1-1.6 2.7-2.2 2.8-2.2l.2-.1C10.3 26.3 10.1 25.6 10.1 24.9zM25.7 22.1l.7 1.9c1.5-.5 3.8-2.1 5-5-.3-1-.8-2-1.3-2.8C29.6 20.6 25.9 22 25.7 22.1zM24.4 19.9c.2-.1 3.1-1.6 4.1-5.6-.5-.6-1.1-1.1-1.7-1.6-.6 3.9-3.2 5.4-3.3 5.4l-.9.4L24.4 19.9zM26.2 29c1.5-.3 4-1.3 5.8-3.4.2-1.3 0-2.5 0-2.6 0-.5 0-1.1-.1-1.6C30.8 26.1 26 27 25.8 27l-.7 2.1L26.2 29z"/><path fill="#ce630b" d="M24.1,17.7C22.3,16,20,15,17.5,15c-2.5,0-4.8,1-6.6,2.7c-3,3-3,7.8,0,10.8c2.5,2.5,6.5,2.5,8.9,0 c1-1,1.5-2.3,1.5-3.7s-0.5-2.7-1.5-3.7c-0.8-0.8-1.9-1.3-3.1-1.3c-1.2,0-2.3,0.5-3.1,1.3c-1.5,1.5-1.5,3.8,0,5.3 c1.2,1.2,3.3,1.2,4.5,0c0.4-0.4,0.4-1,0-1.4s-1-0.4-1.4,0c-0.5,0.5-1.2,0.5-1.7,0c-0.7-0.7-0.7-1.8,0-2.4c0.9-0.9,2.5-0.9,3.4,0 c0.6,0.6,1,1.4,1,2.3c0,0.9-0.3,1.7-1,2.3c-1.7,1.7-4.4,1.7-6.1,0c-2.2-2.2-2.2-5.8,0-8c1.4-1.4,3.2-2.1,5.2-2.1 c2,0,3.8,0.8,5.2,2.1c3.7,3.7,3.7,9.6,0,13.3c-1.7,1.7-3.9,2.9-6.2,3.3c1.1,0.2,3,0.5,4.9,0.2c1-0.6,1.9-1.3,2.7-2.1 C28.5,29.4,28.5,22.2,24.1,17.7z"/></svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#c5cae9" d="M20.5,31.1l0.1-2.1c0,0,0-1-0.7-1.7c-0.7-0.7-1.9-0.8-1.9-0.8l-2-0.1l1.2-1.5 c0.2-0.3,0.8-1.1,0.8-1.9s-0.6-1.6-0.8-1.9l-1.1-1.4l1.8-0.2c0.3,0,1.4-0.3,1.9-0.8c0.5-0.5,0.7-1.5,0.7-1.8l0.1-1.7l1.4,1 c0.5,0.3,1.4,0.8,1.9,0.8c0.5,0,1.4-0.5,1.9-0.8l1.3-0.9l0.3,1.5c0.1,0.4,0.4,1.4,0.9,2c0.6,0.6,1.7,0.7,1.7,0.7l1.9,0.1l-1.2,1.5 C30.6,21.4,30,22.3,30,23c0,0.7,0.5,1.5,0.8,1.9l1.2,1.6l-2,0.1c0,0-1.2,0.1-1.8,0.7c-0.7,0.7-0.7,1.8-0.7,1.8l-0.1,2l-1.5-1.2 C25.6,29.6,24.7,29,24,29s-1.6,0.6-1.9,0.8L20.5,31.1z M24,27c0.6,0,1.3,0.2,1.8,0.4c0.2-0.5,0.5-1.1,1-1.6s1.1-0.8,1.6-1 C28.2,24.3,28,23.6,28,23c0-0.7,0.2-1.3,0.5-1.8c-0.5-0.2-1-0.5-1.5-1c-0.5-0.5-0.9-1.1-1.1-1.7C25.3,18.8,24.6,19,24,19 c-0.6,0-1.3-0.2-1.8-0.5c-0.2,0.6-0.5,1.2-1,1.6c-0.5,0.5-1.1,0.8-1.7,1c0.2,0.5,0.4,1.2,0.4,1.8c0,0.7-0.2,1.3-0.4,1.8 c0.6,0.2,1.2,0.5,1.7,1c0.5,0.5,0.8,1,1,1.6C22.8,27.2,23.4,27,24,27z"/><path fill="#c5cae9" d="M29.4,36.1l-0.7-0.3c0,0-2.6-0.9-4.6-0.9c-2,0-4.6,0.9-4.6,0.9l-0.7,0.2l-0.4-0.6c0,0-1.4-2-3-3.6 c-1.6-1.6-3.7-3.1-3.8-3.1l-0.6-0.4l0.2-0.7c0.2-0.9,0.9-3.4,0.9-4.7c0-1.3-0.6-3.8-0.9-4.7l-0.2-0.7l0.7-0.4c0,0,2.5-1.5,3.8-2.8 c1.3-1.3,2.8-3.8,2.8-3.8l0.5-0.7l0.8,0.3c0,0,2,0.8,4.5,0.8c2.6,0,4.5-0.8,4.5-0.8l0.8-0.3l0.5,0.7c0,0,1.4,2.2,3.1,3.9 c1.7,1.7,3.5,2.7,3.5,2.7l0.8,0.4l-0.4,0.8c0,0-0.8,2-0.8,4.5c0,2.6,0.8,4.5,0.8,4.5l0.3,0.7l-0.7,0.5c0,0-2.3,1.6-3.9,3.3 c-1.6,1.6-2.8,3.4-2.8,3.4L29.4,36.1z M13.2,27.5c0.8,0.6,2.2,1.7,3.4,2.9c1.2,1.2,2.2,2.5,2.8,3.3c1-0.3,2.9-0.8,4.6-0.8 c1.7,0,3.5,0.5,4.5,0.8c0.5-0.7,1.5-2,2.6-3.1c1.2-1.2,2.7-2.4,3.6-3C34.4,26.7,34,25,34,23c0-1.9,0.4-3.6,0.7-4.5 c-0.8-0.5-2-1.4-3.2-2.6c-1.3-1.3-2.4-2.8-2.9-3.6C27.6,12.6,26,13,24,13c-1.9,0-3.6-0.4-4.5-0.7c-0.6,0.9-1.7,2.5-2.7,3.5 c-1,1-2.7,2.1-3.6,2.7c0.3,1.1,0.8,3.1,0.8,4.5C14,24.4,13.5,26.5,13.2,27.5z"/><path fill="#c5cae9" d="M32.5,43.5l-1.1-0.6c0,0-3.6-1.9-7.4-1.9c-3.9,0-7.4,1.9-7.4,1.9l-1.1,0.6l-0.3-1.2 c0,0-1-3.9-3.8-6.6c-2.8-2.8-6.6-3.8-6.6-3.8l-1.2-0.3l0.5-1.1c0,0,1.9-4,1.9-7.4c0-3.5-1.3-7.2-1.4-7.3l-0.3-1l1-0.3 c0,0,3.8-1.3,6.6-4.1c2.7-2.7,3.8-5.6,3.8-5.6l0.5-1.3l1.1,0.9c0,0,2.3,1.7,6.8,1.7c4.5,0,6.8-1.9,6.9-1.9l1.2-1l0.4,1.5 c0,0,0.9,3.2,4.1,6.3c2.3,2.2,5.8,3.7,5.9,3.7l1,0.4l-0.4,1c0,0-1,2.3-1,7.1c0,4.7,1.8,7.3,1.8,7.3l0.9,1.2l-1.4,0.4 c0,0-3.7,0.9-6.6,3.8c-2.9,2.9-3.8,6.6-3.8,6.6L32.5,43.5z M6.4,30.3c1.5,0.5,4.2,1.8,6.4,4c2.2,2.2,3.4,4.9,4,6.4 C18.2,40,21,39,24,39c3,0,5.8,1,7.3,1.6c0.5-1.5,1.7-4.1,4-6.4c2.2-2.2,4.8-3.4,6.3-3.9C40.9,28.9,40,26.5,40,23 c0-3.5,0.5-5.8,0.9-7c-1.3-0.6-3.7-1.9-5.6-3.7c-2.4-2.3-3.7-4.6-4.2-6C29.7,7.1,27.4,8,24,8c-3.4,0-5.7-0.9-7-1.5 c-0.6,1.2-1.8,3.3-3.8,5.3C11,14,8.2,15.4,6.8,16C7.3,17.4,8,20.2,8,23C8,25.8,7,28.7,6.4,30.3z"/><path fill="#c5cae9" d="M22.2 24.8L31.3 2.7 33.2 3.5 25.8 21.2 43.5 13.8 44.3 15.7z"/><path fill="#c5cae9" d="M31.8 44.2L22.1 21.1 45.1 30.6 44.3 32.5 25.9 24.9 33.6 43.4z"/><path fill="#c5cae9" d="M16.4 44.2L14.5 43.4 22.2 24.8 3.5 32.6 2.7 30.7 25.8 21.2z"/><path fill="#c5cae9" d="M25.8 24.8L3.7 15.7 4.5 13.8 22.2 21.2 14.8 3.5 16.7 2.7z"/></svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><polygon fill="#546e7a" points="19.78,10 21.181,16 26.819,16 28.22,10"/><polygon fill="#90a4ae" points="21,15 21,41.674 27,41.108 27,15"/><rect width="10" height="2" x="19" y="9" fill="#78909c"/><path fill="#42a5f5" d="M9,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,14,9,14z"/><path fill="#42a5f5" d="M9,18c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,18,9,18z"/><path fill="#42a5f5" d="M9,10c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,10,9,10z"/><path fill="#42a5f5" d="M9,6C8.449,6,8,5.551,8,5s0.449-1,1-1s1,0.449,1,1S9.551,6,9,6z"/><path fill="#42a5f5" d="M13,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,14,13,14z"/><path fill="#42a5f5" d="M13,18c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,18,13,18z"/><path fill="#42a5f5" d="M13,10c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S13.551,10,13,10z"/><path fill="#42a5f5" d="M17,14c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S17.551,14,17,14z"/><path fill="#42a5f5" d="M9,22c-0.551,0-1-0.449-1-1s0.449-1,1-1s1,0.449,1,1S9.551,22,9,22z"/><path fill="#42a5f5" d="M38,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,13.551,38,13z"/><path fill="#42a5f5" d="M38,17c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,17.551,38,17z"/><path fill="#42a5f5" d="M38,9c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,9.551,38,9z"/><path fill="#42a5f5" d="M38,5c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,5.551,38,5z"/><path fill="#42a5f5" d="M34,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,13.551,34,13z"/><path fill="#42a5f5" d="M34,17c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,17.551,34,17z"/><path fill="#42a5f5" d="M34,9c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S34,9.551,34,9z"/><path fill="#42a5f5" d="M30,13c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S30,13.551,30,13z"/><path fill="#42a5f5" d="M38,21c0-0.551,0.449-1,1-1s1,0.449,1,1s-0.449,1-1,1S38,21.551,38,21z"/><path fill="#388e3c" d="M23.859,44c0-9.376,4.958-17.143,6.141-18.761c-0.581,1.532-2.048,4.392-2.048,18.761H23.859z"/><path fill="#4caf50" d="M20.437,32.952C20.676,33.748,21.841,39.193,22,40c1.638,2.673,0.997,1.129,1,4h2.333 c-0.161-1.963-0.495-3.972-0.991-5.909c-0.501-1.942-1.182-3.847-2.073-5.67c-0.887-1.823-1.983-3.564-3.293-5.165 c-1.315-1.592-2.817-3.085-4.621-4.239c1.585,1.359,2.789,2.988,3.792,4.664C19.142,29.369,19.893,31.144,20.437,32.952z"/><path fill="#388e3c" d="M25.793,44c0-7.57,7.072-16.249,9.029-17.66c-1.086,1.294-4.825,6.761-4.825,17.66H25.793z"/><path fill="#8bc34a" d="M29.018,44c0-7.531,7.237-13.622,8.386-14.373c-0.922,0.949-4.492,6.088-4.492,14.373H29.018z"/><path fill="#8bc34a" d="M16,44c0-8.304-4.005-13.449-5-14.373c1.212,0.718,9,7.052,9,14.373H16z"/><path fill="#8bc34a" d="M31.249,44C33,39,37.687,37.45,39,37c-2,2-3,4-3,7H31.249z"/><path fill="#8bc34a" d="M14.249,44c-0.249-3-2.249-7-4-9c2.751,1,6,4,7.751,9H14.249z"/><path fill="#388e3c" d="M19.16,44c0-9.389-2.633-14.288-3.515-15.464C16.784,29.543,24,37.381,24,44H19.16z"/></svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64" version="1.1" viewBox="0 0 48 48"><g id="surface1026554"><path fill="#8BC34A" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 30.800781 18.199219 C 28.398438 18.898438 27.199219 21.601562 28.699219 23.601562 C 27.800781 24.101562 26.601562 25.199219 25.5 26.898438 C 25.398438 22.5 25.800781 18.199219 26.800781 15.101562 C 28.199219 16.5 29.898438 16.300781 31.398438 15 C 34.101562 12.601562 31.699219 6.898438 32.898438 5.101562 C 31.5 5.101562 26 5.601562 23.699219 8.398438 C 22.199219 10.300781 22.800781 13 25.300781 13.5 C 23.898438 16.898438 23.398438 21.800781 23.398438 26.601562 C 22.601562 25.398438 21.5 24.199219 20.101562 23.300781 C 22.898438 21.101562 22.101562 17.601562 19.199219 16.101562 C 14.898438 13.699219 7.800781 16.300781 6 17 C 8.601562 18.601562 8.398438 27 13.199219 28.601562 C 16.300781 29.601562 18.699219 28.601562 19.300781 24.898438 C 23.300781 27.800781 24 33 24.101562 33.101562 C 24.199219 33.601562 24.601562 34 25.101562 34 L 25.199219 34 C 25.699219 33.898438 26.101562 33.5 26.101562 33 C 26.101562 29.101562 27.898438 26.898438 29.199219 25.898438 C 29.300781 28.398438 31 29.398438 33.398438 29.199219 C 37.300781 28.699219 38.800781 22.101562 41.101562 21.199219 C 39.800781 20.199219 34.601562 17.199219 30.800781 18.199219 Z M 30.800781 18.199219"/><path fill="#689F38" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 13.199219 28.601562 C 8.398438 27 8.601562 18.601562 6 17 C 8.300781 17.199219 11.800781 19.101562 19.398438 23.800781 C 19.101562 28.398438 16.601562 29.699219 13.199219 28.601562 Z M 33.300781 29 C 37.199219 28.5 38.699219 21.898438 41 21 C 39.199219 20.800781 35.800781 21.699219 29.199219 24.101562 C 28.601562 27.800781 30.5 29.300781 33.300781 29 Z M 31.5 14.898438 C 34.601562 11.898438 31.800781 6.800781 33 5 C 31.5 5.800781 29.398438 8.199219 25.800781 13.5 C 27.300781 16.5 29.5 16.601562 31.5 14.898438 Z M 31.5 14.898438"/><path fill="#795548" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 9 42 L 40.601562 42 C 41.398438 41.300781 42 40.199219 42 39 C 42 36.800781 40.199219 35 38 35 C 37.601562 35 37.199219 35.101562 36.800781 35.199219 C 36.199219 33.300781 34.5 32 32.5 32 C 31.199219 32 30 32.601562 29.199219 33.398438 C 28.101562 32.5 26.601562 32 25 32 C 22.898438 32 21 32.898438 19.699219 34.398438 C 19.199219 34.199219 18.601562 34 18 34 C 16.898438 34 16 34.398438 15.300781 35.101562 C 14.699219 34.398438 13.898438 34 13 34 C 11.601562 34 10.5 34.898438 10.101562 36.199219 C 9.800781 36.101562 9.398438 36 9 36 C 7.300781 36 6 37.300781 6 39 C 6 40.699219 7.300781 42 9 42 Z M 9 42"/><path fill="#8D6E63" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 38 40 C 38 38.300781 36.699219 37 35 37 C 33.5 37 32.300781 38.101562 32.101562 39.398438 C 31.300781 38.601562 30.199219 38 29 38 C 27.699219 38 26.5 38.699219 25.800781 39.699219 C 25.300781 38.101562 23.800781 37 22 37 C 20.898438 37 20 37.398438 19.300781 38.101562 C 18.699219 37.398438 17.898438 37 17 37 C 15.601562 37 14.5 37.898438 14.101562 39.199219 C 13.800781 39.101562 13.398438 39 13 39 C 11.101562 39 9.601562 40.300781 9.101562 42 L 40 42 C 39.800781 41 39 40.199219 38 40 Z M 38 40"/><path fill="#43A047" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 48 38 C 48 43.5 43.5 48 38 48 C 32.5 48 28 43.5 28 38 C 28 32.5 32.5 28 38 28 C 43.5 28 48 32.5 48 38"/><path fill="#FFF" fill-opacity="1" fill-rule="nonzero" stroke="none" d="M 44 36 L 40 36 L 40 32 L 36 32 L 36 36 L 32 36 L 32 40 L 36 40 L 36 44 L 40 44 L 40 40 L 44 40 Z M 44 36"/></g></svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#8BC34A" d="M30.8,18.2c-2.4,0.7-3.6,3.4-2.1,5.4c-0.9,0.5-2.1,1.6-3.2,3.3c-0.1-4.4,0.3-8.7,1.3-11.8c1.4,1.4,3.1,1.2,4.6-0.1c2.7-2.4,0.3-8.1,1.5-9.9c-1.4,0-6.9,0.5-9.2,3.3c-1.5,1.9-0.9,4.6,1.6,5.1c-1.4,3.4-1.9,8.3-1.9,13.1c-0.8-1.2-1.9-2.4-3.3-3.3c2.8-2.2,2-5.7-0.9-7.2C14.9,13.7,7.8,16.3,6,17c2.6,1.6,2.4,10,7.2,11.6c3.1,1,5.5,0,6.1-3.7c4,2.9,4.7,8.1,4.8,8.2c0.1,0.5,0.5,0.9,1,0.9c0,0,0.1,0,0.1,0c0.5-0.1,0.9-0.5,0.9-1l0,0c0-3.9,1.8-6.1,3.1-7.1c0.1,2.5,1.8,3.5,4.2,3.3c3.9-0.5,5.4-7.1,7.7-8C39.8,20.2,34.6,17.2,30.8,18.2z"/><path fill="#689F38" d="M13.2,28.6C8.4,27,8.6,18.6,6,17c0,0,0,0,0,0c2.3,0.2,5.8,2.1,13.4,6.8c0,0,0,0,0,0C19.1,28.4,16.6,29.7,13.2,28.6z M33.3,29c3.9-0.5,5.4-7.1,7.7-8c0,0,0,0,0,0c-1.8-0.2-5.2,0.7-11.8,3.1c0,0,0,0,0,0C28.6,27.8,30.5,29.3,33.3,29z M31.5,14.9c3.1-3,0.3-8.1,1.5-9.9c0,0,0,0,0,0c-1.5,0.8-3.6,3.2-7.2,8.5c0,0,0,0,0,0C27.3,16.5,29.5,16.6,31.5,14.9z"/><path fill="#795548" d="M9,42h9.7h12.6h4.1h5.2c0.8-0.7,1.4-1.8,1.4-3c0-2.2-1.8-4-4-4c-0.4,0-0.8,0.1-1.2,0.2c-0.6-1.9-2.3-3.2-4.3-3.2c-1.3,0-2.5,0.6-3.3,1.4C28.1,32.5,26.6,32,25,32c-2.1,0-4,0.9-5.3,2.4C19.2,34.2,18.6,34,18,34c-1.1,0-2,0.4-2.7,1.1C14.7,34.4,13.9,34,13,34c-1.4,0-2.5,0.9-2.9,2.2C9.8,36.1,9.4,36,9,36c-1.7,0-3,1.3-3,3S7.3,42,9,42z"/><path fill="#8D6E63" d="M38,40C38,40,38,40,38,40c0-1.7-1.3-3-3-3c-1.5,0-2.7,1.1-2.9,2.4C31.3,38.6,30.2,38,29,38c-1.3,0-2.5,0.7-3.2,1.7c-0.5-1.6-2-2.7-3.8-2.7c-1.1,0-2,0.4-2.7,1.1C18.7,37.4,17.9,37,17,37c-1.4,0-2.5,0.9-2.9,2.2C13.8,39.1,13.4,39,13,39c-1.9,0-3.4,1.3-3.9,3h26h2.1H40C39.8,41,39,40.2,38,40z"/></svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#607d8b" d="M43,36.333C43,32.651,36.15,28,24,28S5,32.651,5,36.333C5,40.015,11.85,43,24,43S43,40.015,43,36.333z"/><path fill="#d7ccc8" d="M41,23.923C41,20.864,31.864,16,27,16c-8.837,0-16,2.864-16,5.923s7.181,5.617,16,6.177C35.776,28.657,41,26.982,41,23.923z"/><path fill="#607d8b" d="M31,11c0-2.209-4.029-4-9-4s-9,3.791-9,6s4.029,3.192,9,3.192S31,13.209,31,11z"/></svg>

After

Width:  |  Height:  |  Size: 463 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="96" version="1.1" viewBox="0 0 48 48"><g id="surface1"><path fill="#CFD8DC" d="M 5 38 L 5 14 L 43 14 L 43 38 C 43 40.199219 41.199219 42 39 42 L 9 42 C 6.800781 42 5 40.199219 5 38 Z"/><path fill="#F44336" d="M 43 10 L 43 16 L 5 16 L 5 10 C 5 7.800781 6.800781 6 9 6 L 39 6 C 41.199219 6 43 7.800781 43 10 Z"/><path fill="#B71C1C" d="M 36 10 C 36 11.65625 34.65625 13 33 13 C 31.34375 13 30 11.65625 30 10 C 30 8.34375 31.34375 7 33 7 C 34.65625 7 36 8.34375 36 10 Z"/><path fill="#B71C1C" d="M 18 10 C 18 11.65625 16.65625 13 15 13 C 13.34375 13 12 11.65625 12 10 C 12 8.34375 13.34375 7 15 7 C 16.65625 7 18 8.34375 18 10 Z"/><path fill="#B0BEC5" d="M 33 3 C 31.898438 3 31 3.898438 31 5 L 31 10 C 31 11.101563 31.898438 12 33 12 C 34.101563 12 35 11.101563 35 10 L 35 5 C 35 3.898438 34.101563 3 33 3 Z"/><path fill="#B0BEC5" d="M 15 3 C 13.898438 3 13 3.898438 13 5 L 13 10 C 13 11.101563 13.898438 12 15 12 C 16.101563 12 17 11.101563 17 10 L 17 5 C 17 3.898438 16.101563 3 15 3 Z"/><path fill="#90A4AE" d="M 13 20 L 17 20 L 17 24 L 13 24 Z"/><path fill="#90A4AE" d="M 19 20 L 23 20 L 23 24 L 19 24 Z"/><path fill="#90A4AE" d="M 25 20 L 29 20 L 29 24 L 25 24 Z"/><path fill="#90A4AE" d="M 31 20 L 35 20 L 35 24 L 31 24 Z"/><path fill="#90A4AE" d="M 13 26 L 17 26 L 17 30 L 13 30 Z"/><path fill="#90A4AE" d="M 19 26 L 23 26 L 23 30 L 19 30 Z"/><path fill="#90A4AE" d="M 25 26 L 29 26 L 29 30 L 25 30 Z"/><path fill="#90A4AE" d="M 31 26 L 35 26 L 35 30 L 31 30 Z"/><path fill="#90A4AE" d="M 13 32 L 17 32 L 17 36 L 13 36 Z"/><path fill="#90A4AE" d="M 19 32 L 23 32 L 23 36 L 19 36 Z"/><path fill="#90A4AE" d="M 25 32 L 29 32 L 29 36 L 25 36 Z"/><path fill="#90A4AE" d="M 31 32 L 35 32 L 35 36 L 31 36 Z"/></g></svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100" fill="0" version="1.1" viewBox="0 0 32 32"><g id="surface1"><path d="M 16 4 C 9.382813 4 4 9.382813 4 16 C 4 19.070313 5.15625 21.875 7.0625 24 L 5 24 L 5 26 L 11 26 L 11 20 L 9 20 L 9 23.125 C 7.15625 21.3125 6 18.792969 6 16 C 6 10.464844 10.464844 6 16 6 Z M 18.25 4.21875 L 17.6875 6.15625 C 18.347656 6.269531 19.003906 6.445313 19.625 6.6875 L 20.15625 4.75 C 19.53125 4.519531 18.90625 4.34375 18.25 4.21875 Z M 21 6 L 21 12 L 23 12 L 23 8.875 C 24.847656 10.683594 26 13.199219 26 16 C 26 21.535156 21.535156 26 16 26 L 16 28 C 22.617188 28 28 22.617188 28 16 C 28 12.921875 26.820313 10.121094 24.90625 8 L 27 8 L 27 6 Z M 12.375 25.3125 L 11.84375 27.25 C 12.46875 27.480469 13.09375 27.65625 13.75 27.78125 L 14.3125 25.84375 C 13.652344 25.730469 12.996094 25.554688 12.375 25.3125 Z"/></g></svg>

After

Width:  |  Height:  |  Size: 916 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="48" height="48"><path fill="#4caf50" d="M13.4 19.2H17.4V39.9H13.4z" transform="rotate(-40.412 15.36 29.55)"/><path fill="#4caf50" d="M20.2 20.2v17.3c0 1.1.9 1.9 1.9 1.9h14.4c1.1 0 1.9-.9 1.9-1.9V22.1h-8.6v-3.8C24 18.2 20.2 20.2 20.2 20.2zM4.9 23.3l5.8-5.1c1.4 1.6 1.2 4-.4 5.4C8.7 25.1 6.3 24.9 4.9 23.3z"/><path fill="#2e7d32" d="M32.2,8.6c-6.5,0-11.7,5.1-12,11.5c0.1-0.1,0.8-0.4,2-0.8c0.6-5,4.9-8.8,10-8.8 c5.6,0,10.1,4.5,10.1,10.1c0,3.2-1.5,6.1-3.8,7.9v2.3c3.4-2.1,5.8-5.9,5.8-10.2C44.2,14,38.8,8.6,32.2,8.6z"/><path fill="#2e7d32" d="M20.2 22.1h18.2V24H20.2V22.1zM11.4 22c-.2.6-.6 1.2-1.1 1.7-.5.5-1.1.7-1.7.9l1.4 1.6c.6-.2 1.2-.6 1.7-1 .5-.4.9-1 1.2-1.5L11.4 22z"/></svg>

After

Width:  |  Height:  |  Size: 743 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 50 50"><path fill="#795548" d="M43,17c0-1.104-0.896-2-2-2c-0.438,0-0.839,0.145-1.168,0.383C39.936,15.107,40,14.812,40,14.5c0-1.381-1.119-2.5-2.5-2.5c-0.587,0-1.119,0.21-1.546,0.549C35.735,11.108,34.502,10,33,10c-0.921,0-1.734,0.424-2.285,1.078C30.001,10.415,29.052,10,28,10c-2.209,0-4,1.791-4,4c0,0.101,0.022,0.195,0.03,0.293C23.728,14.111,23.378,14,23,14c-1.104,0-2,0.896-2,2c0,0.366,0.105,0.705,0.277,1H43z"/><path fill="#FF5722" d="M19,18l2,9c0,0,7,3,13,3s11-12,11-12H19z"/><path fill="#FF5722" d="M46,19c0,0.553-0.447,1-1,1H19c-0.552,0-1-0.447-1-1v-1c0-0.553,0.448-1,1-1h26c0.553,0,1,0.447,1,1V19z"/><path fill="#37474F" d="M11 18H5c-.552 0-1 .447-1 1s.448 1 1 1h6V18zM39 30.001c-2.762 0-5 2.238-5 5s2.238 5 5 5 5-2.238 5-5S41.762 30.001 39 30.001zM39 38.001c-1.656 0-3-1.343-3-3s1.344-3 3-3 3 1.343 3 3S40.656 38.001 39 38.001z"/><path fill="#BF360C" d="M42.984,22c0.418-0.729,0.78-1.41,1.077-2H19.444l0.444,2H42.984z"/><path fill="#5D4037" d="M36.908,17C36.964,16.843,37,16.676,37,16.5c0-0.828-0.672-1.5-1.5-1.5c-0.18,0-0.35,0.037-0.51,0.095C34.992,15.063,35,15.032,35,15c0-1.104-0.896-2-2-2c-0.755,0-1.404,0.423-1.745,1.041C30.705,13.408,29.904,13,29,13c-1.657,0-3,1.343-3,3c0,0.353,0.072,0.686,0.184,1H36.908z"/><path fill="#9FA8DA" d="M39.703,34.289c-0.033-0.031-3.257-3.217-3.903-3.91c-0.861-0.939-2.28-1.08-3.458-0.35c-0.981,0.621-2.236,1.517-3.343,2.308c-0.705,0.504-1.356,0.969-1.846,1.297c-0.741,0.502-1.013,0.499-1.078,0.48c-0.298-0.063-0.856-0.968-1.126-1.404c-0.726-1.166-3.047-5.929-3.07-5.977c-0.061-0.125-0.147-0.236-0.253-0.326l-9.589-8.108c-0.091-0.077-0.194-0.128-0.3-0.166C11.594,18.056,11.439,18,11.266,18H11v0.153V20v0.042l9.173,7.757c0.452,0.924,2.376,4.841,3.076,5.965c0.722,1.169,1.358,2.081,2.406,2.307c0.156,0.033,0.311,0.049,0.464,0.049c0.811,0,1.563-0.429,2.151-0.826c0.499-0.335,1.167-0.812,1.891-1.329c1.086-0.774,2.315-1.653,3.243-2.239c0.233-0.146,0.674-0.265,0.927,0.012c0.68,0.729,3.832,3.844,3.966,3.977c0.394,0.388,1.025,0.383,1.415-0.009C40.1,35.311,40.096,34.678,39.703,34.289z"/></svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 409 B

BIN
app/assets/images/pear.png Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 221 KiB

View File

Binary file not shown.

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg">
<g id="surface7" transform="matrix(0.701232, -0.712932, 0.712932, 0.701232, -9.812447, 24.226824)">
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(32.941176%,43.137255%,47.843137%);fill-opacity:1;" d="M 25.554688 33.894531 C 25.554688 33.894531 22.074219 37.398438 20.546875 38.933594 C 19.027344 40.46875 12.011719 43.109375 6.960938 41.089844 C 4.402344 35.449219 7.585938 28.945312 9.109375 27.414062 C 10.632812 25.882812 14.113281 22.378906 14.113281 22.378906 Z M 38.425781 15.179688 L 32.703125 9.421875 L 35.5625 6.539062 L 41.285156 12.300781 Z M 38.425781 15.179688 "/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,75.686275%,2.745098%);fill-opacity:1;" d="M 29.84375 15.179688 L 18.402344 26.695312 C 17.84375 27.257812 12.792969 32.574219 14.21875 34 C 15.644531 35.425781 20.703125 30.136719 21.261719 29.574219 L 32.703125 18.058594 L 31.988281 17.335938 Z M 29.84375 15.179688 "/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,75.686275%,2.745098%);fill-opacity:1;" d="M 31.132812 18.488281 L 30.84375 16.476562 L 31.84375 16.332031 C 31.890625 16.324219 36.574219 15.601562 39.855469 12.300781 L 40.570312 11.578125 L 42 13.019531 L 41.285156 13.738281 C 37.511719 17.535156 32.347656 18.316406 32.132812 18.347656 Z M 31.132812 18.488281 "/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,75.686275%,2.745098%);fill-opacity:1;" d="M 31.414062 17.050781 L 29.414062 16.761719 L 29.558594 15.753906 C 29.589844 15.535156 30.363281 10.335938 34.132812 6.539062 L 34.847656 5.820312 L 36.277344 7.261719 L 35.5625 7.980469 C 32.28125 11.285156 31.566406 15.996094 31.558594 16.042969 Z M 31.414062 17.050781 "/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Some files were not shown because too many files have changed in this diff Show More