diff --git a/.codeclimate.yml b/.codeclimate.yml index 599d2fdc3..ca784c7a0 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -20,8 +20,8 @@ engines: - ruby - javascript exclude_fingerprints: - - 16dbcb58d6caa7ccfe241417831ecfa6 - - 7d7dca4f27f50e3084f203280073cc74 + - 16dbcb58d6caa7ccfe241417831ecfa6 + - 7d7dca4f27f50e3084f203280073cc74 fixme: enabled: true exclude_fingerprints: # rubocop_todo filename diff --git a/.haml-lint.yml b/.haml-lint.yml index f4c9872ae..a68d3eed3 100644 --- a/.haml-lint.yml +++ b/.haml-lint.yml @@ -1,4 +1,3 @@ linters: LineLength: max: 120 - diff --git a/.overcommit.yml b/.overcommit.yml index 39a80d1fd..8b485b216 100644 --- a/.overcommit.yml +++ b/.overcommit.yml @@ -67,10 +67,7 @@ PreCommit: enabled: true MergeConflicts: enabled: true - RailsSchemaUpToDate: - enabled: true YamlLint: - on_fail: warn enabled: true PostCommit: diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e46550eae..091a034f5 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -63,7 +63,9 @@ Rails/OutputSafety: - 'app/helpers/gardens_helper.rb' # Configuration parameters: Blacklist. -# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters +# Blacklist: decrement!, decrement_counter, increment!, increment_counter +# toggle!, touch, update_all, update_attribute, update_column, update_columns, +# update_counters Rails/SkipsModelValidations: Exclude: - 'app/controllers/plantings_controller.rb' @@ -312,4 +314,3 @@ Style/UnlessElse: Style/WordArray: EnforcedStyle: percent MinSize: 5 - diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 669c8cd38..78030e471 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -33,19 +33,26 @@ en: send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.' updated: 'Your password was changed successfully. You are now signed in.' updated_not_active: 'Your password was changed successfully.' - send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." - no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_paranoid_instructions: > + If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. + no_token: > + You can't access this page without coming from a password reset email. If you do come from a password reset email, + please make sure you used the full URL provided. confirmations: send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.' - send_paranoid_instructions: 'If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes.' + send_paranoid_instructions: > + If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes. confirmed: 'Your account was successfully confirmed.' registrations: signed_up: 'Welcome! You have signed up successfully.' - signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.' + signed_up_but_unconfirmed: > + A message with a confirmation link has been sent to your email address. Please open the link to activate your account. signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.' signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.' updated: 'You updated your account successfully.' - update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address." + update_needs_confirmation: > + You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm + link to finalize confirming your new email address. destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.' unlocks: send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.' diff --git a/config/locales/en.yml b/config/locales/en.yml index de19ae646..140621aa5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -69,7 +69,10 @@ en: home: blurb: already_html: Or %{sign_in} if you already have an account - intro: "%{site_name} is a community of food gardeners. We're building an open source platform to help you learn about growing food, track what you plant and harvest, and swap seeds and produce with other gardeners near you." + intro: > + %{site_name} is a community of food gardeners. We're building an open source + platform to help you learn about growing food, track what you plant and harvest, + and swap seeds and produce with other gardeners near you. perks: Join now for your free garden journal, seed sharing, forums, and more. sign_in_linktext: sign in sign_up: Sign up @@ -97,12 +100,21 @@ en: api_docs_linktext: API documentation buy_account_linktext: buying a paid account creative_commons_linktext: Creative Commons license - get_involved_body_html: We believe in collaboration, and work closely with our members and the wider food-growing community. Our team includes volunteers from all walks of life and all skill levels. To get involved, visit %{talk_link} or find more information on the %{wiki_link}. + get_involved_body_html: > + We believe in collaboration, and work closely with our members and the wider food-growing community. + Our team includes volunteers from all walks of life and all skill levels. To get involved, + visit %{talk_link} or find more information on the %{wiki_link}. get_involved_title: Get Involved github_linktext: Github - open_data_body_html: We're building a database of crops, planting advice, seed sources, and other information that anyone can use for free, under a %{creative_commons_link}. You can use this data for research, to build apps, or for any purpose at all. Read more about our %{wiki_link} and %{api_docs_link}. + open_data_body_html: > + We're building a database of crops, planting advice, seed sources, and other information that anyone + can use for free, under a %{creative_commons_link}. You can use this data for research, to build apps, + or for any purpose at all. Read more about our %{wiki_link} and %{api_docs_link}. open_data_title: Open Data and APIs - open_source_body_html: "%{site_name} is open source software, which means that we share this website's code for free with our community and the world. We believe that openness, sustainability, and social good go hand in hand. You can read more about %{why} or check out our code on %{github}." + open_source_body_html: > + %{site_name} is open source software, which means that we share this website's code for free with our + community and the world. We believe that openness, sustainability, and social good go hand in hand. + You can read more about %{why} or check out our code on %{github}. open_source_title: Open Source support_body_html: Growstuff is independent, %{ad_free} and we have no outside investment. You can support our work by %{buy_account}. support_title: Support Growstuff @@ -174,7 +186,9 @@ en: title: "%{site_name} Community Map" plantings: form: - finish_helper: A planting is finished when you've harvested all of the crop, or it dies, or it's otherwise no longer growing in your garden. + finish_helper: > + A planting is finished when you've harvested all of the crop, or it dies, or it's otherwise + no longer growing in your garden. index: title: crop_plantings: Everyone's %{crop} plantings @@ -188,7 +202,10 @@ en: default: Everyone's posts seeds: form: - trade_help: Are you interested in trading or swapping seeds with other %{site_name} members? If you list your seeds as available for trade, other members can contact you to request seeds. You can list any conditions or other information in the description, above. + trade_help: > + Are you interested in trading or swapping seeds with other %{site_name} members? If you list + your seeds as available for trade, other members can contact you to request seeds. You can + list any conditions or other information in the description, above. index: title: crop_seeds: Everyone's %{crop} seeds diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index c76996a77..41a71db95 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -121,4 +121,3 @@ boot_files: # # rack_options: # server: 'thin' -