Commit Graph
13034 Commits
Author SHA1 Message Date
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