Commit Graph

  • a48acc0253 Bump rubocop from 0.66.0 to 0.67.2 dependabot[bot] 2019-04-05 20:19:38 +00:00
  • 7ca263aa64 Bump capybara from 3.16.0 to 3.16.1 dependabot[bot] 2019-04-05 09:42:52 +00:00
  • d8b70a927a Bump js-routes from 1.4.5 to 1.4.6 dependabot[bot] 2019-04-05 07:19:56 +00:00
  • 7c6a76b41c Bump cancancan from 2.3.0 to 3.0.0 dependabot[bot] 2019-04-04 07:17:14 +00:00
  • b43b8f5868 Bump js-routes from 1.4.4 to 1.4.5 dependabot[bot] 2019-04-02 07:19:42 +00:00
  • c89682792c Merge branch 'dev' into feature/memcachier Brenda Wallace 2019-04-02 22:22:00 +13:00
  • a2fd0f0ae2 Auto corrected by following Lint Ruby RSpecEmptyLine Awesome Code 2019-04-01 10:15:18 +00:00
  • 6ef3b02764 Remove commented out code Brenda Wallace 2019-04-01 22:33:41 +13:00
  • 495002d8b9 Change "background" to "before" Brenda Wallace 2019-04-01 22:33:33 +13:00
  • 4ba5319ba8 Auto corrected by following Lint Ruby Capybara/FeatureMethods Awesome Code 2019-03-30 20:25:15 +00:00
  • 71ab33d20c Bump i18n-tasks from 0.9.28 to 0.9.29 dependabot[bot] 2019-04-01 07:55:43 +00:00
  • ff22adfd76 Merge branch 'dev' into feature/memcachier Brenda Wallace 2019-03-31 10:21:27 +13:00
  • a62c268dda Merge branch 'dev' into plantings-show Brenda Wallace 2019-03-31 10:20:57 +13:00
  • 6e10dc2a2b Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace Awesome Code 2019-03-30 20:26:15 +00:00
  • 4dcb420534 Auto corrected by following Lint Ruby RSpec/HookArgument Awesome Code 2019-03-30 20:26:34 +00:00
  • fb243c1f8d Auto corrected by following Lint Ruby RSpec/ExpectChange Awesome Code 2019-03-30 05:10:13 +00:00
  • 837ae8cb8e Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace Awesome Code 2019-03-30 05:08:00 +00:00
  • f48e131e14 Auto corrected by following Lint Ruby RSpecEmptyLine Awesome Code 2019-03-30 05:06:59 +00:00
  • 5e51c4ab9b Merge branch 'dev' into plantings-show Brenda Wallace 2019-03-30 18:03:31 +13:00
  • a58ce0f6a2 Tidy up mobile Brenda Wallace 2019-03-30 18:01:55 +13:00
  • 2e91a3f381 Merge branch 'dev' into feature/memcachier Brenda Wallace 2019-03-30 16:52:50 +13:00
  • 30b5c0ce9d Bump capybara from 3.15.0 to 3.16.0 dependabot[bot] 2019-03-29 07:27:41 +00:00
  • 6cf60afec4 Don't check for markasinished on plantings#index Brenda Wallace 2019-03-29 15:49:11 +13:00
  • 4d95130216 Move phtos to a gallery Brenda Wallace 2019-03-29 15:48:57 +13:00
  • 43bb606a2b Cleaning up small screen presentation Brenda Wallace 2019-03-29 15:48:47 +13:00
  • 830b554dc9 Test updates Brenda Wallace 2019-03-29 11:28:17 +13:00
  • e4d4cdc3fa Fix up seed description helper Brenda Wallace 2019-03-29 10:45:51 +13:00
  • cb91b43d25 Fix deprecation warning Brenda Wallace 2019-03-29 10:29:05 +13:00
  • bab9c01bf5 Updating tests Brenda Wallace 2019-03-29 10:25:30 +13:00
  • 9be4c4179f Updating specs Brenda Wallace 2019-03-28 15:49:39 +13:00
  • 5722859a24 Move notes higher Brenda Wallace 2019-03-28 10:01:05 +13:00
  • 2bc12570c4 Consistent display of seeds/harvests Brenda Wallace 2019-03-27 22:38:28 +13:00
  • 0c9702e1a4 Move photo query, so we use eager loading Brenda Wallace 2019-03-27 22:28:06 +13:00
  • 562a7b1a10 Merge remote-tracking branch 'origin/plantings-show' into plantings-show Brenda Wallace 2019-03-27 21:19:43 +13:00
  • 626d5f8d7c Move harvest and seeds to the right on plantings#show Brenda Wallace 2019-03-27 21:19:35 +13:00
  • d35dfeea21 Show date taken, not data the database record was created Brenda Wallace 2019-03-27 21:19:22 +13:00
  • 984da54534 Merge branch 'dev' into plantings-show Brenda Wallace 2019-03-27 21:13:28 +13:00
  • 3ced3da682 Merge branch 'dev' into feature/memcachier Brenda Wallace 2019-03-27 21:06:23 +13:00
  • 9c231703ab Merge pull request #1888 from Growstuff/dependabot/bundler/devise-4.6.2 Brenda Wallace 2019-03-27 21:06:00 +13:00
  • e7b0b6f18e Remove table display on plantings#show, replace with boxes Brenda Wallace 2019-03-27 21:04:56 +13:00
  • 2126863632 Bump devise from 4.6.1 to 4.6.2 dependabot[bot] 2019-03-27 07:46:45 +00:00
  • 566308a49d Merge pull request #1887 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.6 dependabot[bot] 2019-03-26 10:00:26 +00:00
  • 1e0f308db2 Merge branch 'dev' into UTFGardenNames Brenda Wallace 2019-03-26 22:43:56 +13:00
  • 0717e0a00d Merge branch 'dev' into feature/memcachier Brenda Wallace 2019-03-26 22:42:45 +13:00
  • 9222782808 Bump jsonapi-resources from 0.9.5 to 0.9.6 dependabot[bot] 2019-03-26 09:39:24 +00:00
  • dcbc0ecdff Merge branch 'master' into dev Brenda Wallace 2019-03-26 22:36:54 +13:00
  • c059c46833 Merge pull request #1747 from brandonbaker40/bb-track-types-of-gardens Brenda Wallace 2019-03-26 22:34:48 +13:00
  • 8d579a4616 Gardens have descriptions Brenda Wallace 2019-03-26 22:27:10 +13:00
  • 1e240cf4b8 replace a rubocop ignore Brenda Wallace 2019-03-26 22:12:09 +13:00
  • 2d2304d8c0 Rubocop lint Brenda Wallace 2019-03-26 22:07:54 +13:00
  • 5d32bc8010 don't allow spaces in slug Brenda Wallace 2019-03-26 22:07:47 +13:00
  • e369b93384 Pass params to garden spec - for rails 5 Brenda Wallace 2019-03-26 22:07:35 +13:00
  • 09dc928250 Update model specs to not use should Brenda Wallace 2019-03-26 22:07:07 +13:00
  • 95d2aa221f Removed plot spec Brenda Wallace 2019-03-26 22:06:53 +13:00
  • 55f6636da5 change "required" to "optional" Brenda Wallace 2019-03-26 22:06:41 +13:00
  • 8a900b2e87 Update garden_Types controller spec for rails 5 Brenda Wallace 2019-03-26 21:48:38 +13:00
  • e5ee89c865 garden_types.description becomes garden_type.name Brenda Wallace 2019-03-26 21:43:34 +13:00
  • 48022fb541 nullify gardens.garden_type when garden_type is destroyed Brenda Wallace 2019-03-26 21:18:14 +13:00
  • 1fe5f67aa1 Update garden_type model spec Brenda Wallace 2019-03-26 21:14:31 +13:00
  • 63edfa36df Gardens have garden_Types in specs Brenda Wallace 2019-03-26 21:13:12 +13:00
  • c71da41d43 Update controller spec Brenda Wallace 2019-03-26 21:12:20 +13:00
  • cc88f5c6c7 Update subtitler Brenda Wallace 2019-03-26 21:11:25 +13:00
  • 629ffa1982 Update translations Brenda Wallace 2019-03-26 21:10:40 +13:00
  • 721a8694a0 Removing plots Brenda Wallace 2019-03-26 21:09:26 +13:00
  • b51072fd00 Update test from containers to garden_types Brenda Wallace 2019-03-26 21:05:13 +13:00
  • b446e44ac0 Moved garden types to admin menu Brenda Wallace 2019-03-26 21:00:34 +13:00
  • 5395aefa66 Rename containers to garden types Brenda Wallace 2019-03-26 20:48:51 +13:00
  • 02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens Brenda Wallace 2019-03-26 19:35:16 +13:00
  • de2fa81aae Remove staging env from bundle Brenda Wallace 2019-03-20 10:04:09 +13:00
  • 8e8c9d179b Added growstuff prefix to env variables Brenda Wallace 2019-03-20 09:48:36 +13:00
  • 607f0e3887 Rename to mapbox map id Brenda Wallace 2019-03-20 09:47:33 +13:00
  • 875fa49d44 Remove distinct staging env file Brenda Wallace 2019-03-11 17:07:11 +13:00
  • ba27e14226 Move mapbox config to env Brenda Wallace 2019-03-11 17:05:50 +13:00
  • 59b3a68fc3 Configure memcachier for production Brenda Wallace 2019-03-11 17:05:25 +13:00
  • 21209ca796 Bump font-awesome-sass from 5.8.0 to 5.8.1 dependabot[bot] 2019-03-25 08:00:54 +00:00
  • 0f548f773a Bump font-awesome-sass from 5.6.1 to 5.8.0 dependabot[bot] 2019-03-22 12:41:43 +00:00
  • aae1b57136 Merge pull request #1878 from Br3nda/setup/scout pozorvlak 2019-03-22 12:38:43 +00:00
  • 9a24f29cbb Merge branch 'dev' into setup/scout pozorvlak 2019-03-22 12:24:29 +00:00
  • 03e2fc6350 Merge pull request #1874 from Growstuff/dependabot/bundler/will_paginate-3.1.7 dependabot[bot] 2019-03-22 08:55:01 +00:00
  • 2483d30f98 Bump will_paginate from 3.1.6 to 3.1.7 dependabot[bot] 2019-03-22 08:38:41 +00:00
  • a990b17dbb Merge pull request #1881 from Growstuff/dependabot/bundler/puma-3.12.1 dependabot[bot] 2019-03-22 08:36:47 +00:00
  • 5d019cde37 Bump puma from 3.12.0 to 3.12.1 dependabot[bot] 2019-03-22 07:56:04 +00:00
  • e10c641702 Auto corrected by following Lint Ruby Layout/AlignHash Awesome Code 2019-03-22 07:55:03 +00:00
  • c04fba2cd6 Merge pull request #1880 from Growstuff/dependabot/bundler/capybara-3.15.0 dependabot[bot] 2019-03-22 07:53:23 +00:00
  • 1389baec98 Merge branch 'dev' into setup/scout Brenda Wallace 2019-03-22 20:45:15 +13:00
  • 5607ffa638 Bump capybara from 3.14.0 to 3.15.0 dependabot[bot] 2019-03-22 07:44:56 +00:00
  • d5baaa2185 Merge pull request #1873 from Growstuff/dependabot/bundler/newrelic_rpm-6.2.0.354 dependabot[bot] 2019-03-22 07:09:24 +00:00
  • afc769aa5f Bump rubocop from 0.65.0 to 0.66.0 dependabot[bot] 2019-03-19 21:51:56 +00:00
  • 45f22c1b45 Bump responders from 2.4.0 to 2.4.1 dependabot[bot] 2019-03-19 21:39:40 +00:00
  • 62f2fa134d Set planting.finished as a boolean Brenda Wallace 2019-03-18 13:25:11 +13:00
  • 6559645265 update spec Brenda Wallace 2019-03-18 13:24:47 +13:00
  • d07c97b6a6 Add filters for the members api Brenda Wallace 2019-03-17 15:19:04 +13:00
  • 0f1c6ae3b6 Bump byebug from 11.0.0 to 11.0.1 dependabot[bot] 2019-03-19 20:28:24 +00:00
  • fe6f6046e4 Auto corrected by following Lint Ruby RSpecEmptyLine Awesome Code 2019-03-19 07:22:50 +00:00
  • 4d062964b6 Bump comfortable_mexican_sofa from 2.0.17 to 2.0.18 dependabot[bot] 2019-03-18 11:17:15 +00:00
  • f52daa12c5 Bump dalli from 2.7.9 to 2.7.10 dependabot[bot] 2019-03-18 07:55:49 +00:00
  • f41ecbc68b Auto corrected by following Lint Ruby EmptyLine Awesome Code 2019-03-14 10:11:03 +00:00
  • 50ade63429 Auto corrected by following Lint Ruby RSpec/LeadingSubject Awesome Code 2019-03-14 10:08:49 +00:00
  • d8be8d0c48 Bump unicorn from 5.4.1 to 5.5.0 dependabot[bot] 2019-03-14 08:39:17 +00:00
  • 89e75ffbee Bump flickraw from 0.9.9 to 0.9.10 dependabot[bot] 2019-03-14 07:24:01 +00:00