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

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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