mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-02 14:37:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,795 Commits 56 Branches 76 Tags
Style/SoleNestedConditional
Commit Graph

52 Commits

Author SHA1 Message Date
Daniel O'Connor
d542326047 Ruby 3.2: Rubocop - Rails/FilePath (#3783) 
* Rails/FilePath
 2024-07-13 15:13:56 +09:30
Daniel O'Connor
f338274611 Rails 7.1 (#3590) 
* Rails 7.1

* Update application.rb

* Bump searchkick

* Bump to 7.0.0

* Fix

* Fix crop search

* Sync translation

* Drop required from form group

* Loosen specs further

* Fix Gemfile

* Update seeds_request_spec.rb

* Update test.rb

* Rename
 2024-01-27 10:06:47 +10:30
Daniel O'Connor
4435407b95 Suppress Time.to_s warning until next rails (#3548) 
* Fix warning

* Update config/application.rb
 2024-01-07 13:27:57 +10:30
Daniel O'Connor
b3179a8f2d Add missing migration for #3247 [Stacked PR] (#3275) 
* Add missing migration for #3247

* [CodeFactor] Apply fixes

* Update 20230313015323_create_active_storage_tables.active_storage.rb

* Rubocop

* Permit a number of safe classes to serialise as YAML

---------

Co-authored-by: codefactor-io <support@codefactor.io>
 2023-03-13 13:48:25 +10:30
Daniel O'Connor
55ccf8e1af Bump defaults 2022-11-06 16:44:06 +10:30
Daniel O'Connor
89bb30011c Fixes #3402 (#3043) 2022-05-01 17:10:05 +09:30
Brenda Wallace
8a5a19f0c6 Removing deprecated commented out parts of application.rb 2020-08-26 12:36:58 +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
7482095894 CORS headers for an open api 2020-06-01 14:02:34 +12:00
Brenda
7257b2ada1 Update with frozen literals 2020-01-10 16:50:52 +13:00
Brenda Wallace
a76f5d3a22 More locations with production email addresses 2019-01-01 13:56:08 +13: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
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
Awesome Code
ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Brenda Wallace
f1c8743623 Config for rails 5 2018-01-03 17:10:50 +13:00
Brenda Wallace
62e7c716dd Removed extra empty blank lines 2016-11-26 12:06:02 +13:00
Brenda Wallace
d268d2b09e Fixed indentation on comments 2016-11-26 11:45:25 +13:00
Brenda Wallace
6bd9bd98d9 Removed extra blank lines, & added a end of file 2016-11-16 12:52:48 +13:00
Daniel O'Connor
c3d9885525 Merge pull request #987 from CloCkWeRX/upgradazzle_rails 
Upgrade to rails 4.2.0+ (round 2)
 2016-06-29 14:47:05 +09:30
Mackenzie Morgan
8428e93b47 don't override our environment email settings with plain old sendmail 2016-06-15 13:27:51 -04:00
Daniel O'Connor
fd467acc29 Clean up whitespace 2016-06-10 20:51:02 +09:30
Daniel O'Connor
df9cf3f5c4 Fix various rails deprecations 2016-06-10 15:58:39 +09:30
Daniel O'Connor
4b4e0cf69a $ rubocop --only HashSyntax --auto-correct 
483 files inspected, 2018 offenses detected, 2018 offenses corrected
 2016-05-19 15:53:11 -04:00
Taylor Griffin
fb595de457 edited configuration and dependencies 2014-11-18 22:24:58 +11:00
Taylor Griffin
acbd3f9a9e implement strong parameters instead of protected attributes 2014-11-18 20:08:54 +11:00
Taylor Griffin
0ffe9adc86 tests are green 2014-11-16 21:40:43 +11:00
Taylor Griffin
c244da8b73 make English fallback language 2014-10-21 07:24:08 +11:00
Taylor Griffin
87b6780220 stop generating helpers, constroller specs, view specs, and javascripts 2014-09-28 21:57:05 +10:00
Taylor Griffin
8a1dd9d171 implement autocomplete for crop name on new planting form 2014-07-26 20:16:22 +10:00
Skud
5d587af8b0 replaced cloudmade maps with mapbox 2014-06-02 18:57:03 -05:00
Skud
b61bbc2170 moved mailchimp settings to figaro 2014-04-29 13:11:57 +10:00
Skud
b86014b04f attempting to fix libv8 problem occurring on heroku 2014-04-28 13:02:23 +10:00
Skud
8f15b30eb7 Merge branch 'master' of heroku.growstuff:growstuff-dev into dev 
Conflicts:
	app/assets/javascripts/places.js.erb
 2013-09-11 18:12:15 +10:00
Skud
e7436de1e1 Merge branch 'places3' of github.com:Skud/growstuff into places3 
Conflicts:
	app/assets/javascripts/places.js.erb
 2013-09-11 18:08:46 +10:00
Skud
a75ed5090a Hardcode Cloudmade API key. 
Ugh, I know. But it's not any less secure than having it out there in
our Javascript, and it turns out Heroku just downright *refuses* to read
it from an environment variable during asset compilation. I even tried
an experimental Heroku addon
(https://devcenter.heroku.com/articles/labs-user-env-compile) but it
didn't work, so for now let's just do this and get it out there. I'm
sick of messing with it.
 2013-09-11 18:03:19 +10:00
Skud
90f3f0e17c still trying to get cloudmade key working (should be reverted later) 2013-09-11 16:35:20 +10:00
Skud
c58a24f851 Made a config variable for cloudmade_key 
(because the assets pipeline doesn't seem to want to deal direct with
ENV variables.)
 2013-09-11 14:26:56 +10:00
Miles Gould
4701bd1b2e Merge branch 'dev' into places2 
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
 2013-08-31 15:49:30 +01:00
Skud
f747db7518 newsletter subscription/unsubscription via Mailchimp API 2013-08-27 22:45:18 +10:00
Miles Gould
251a45a441 Add a User-Agent to Nominatum requests 
- unified repeated config into config/application.rb
 - removed superfluous calls to Growstuff::Application.config
 2013-08-23 14:03:46 +01:00
Lucy
650f24099d Added default account type of "Free" in config/applications.rb 2013-07-03 11:04:42 +01:00
Skud
b4c6a74caa Display posts in summary on forum page 
Also had to tweak timezone config so that "X minutes ago" display
worked.  This *may* break tests or who knows what, for devs who are
elsewhere. Let's keep an eye out for that!
 2013-02-14 13:35:23 +11:00
Joseph Caudle
fd54fe8ffe Configure application to have UTC as default timezone 
This commit sets the default timezone for the app as UTC for both Time
methods and for ActiveRecord. It also removes an unecessary pair of
parentheses attached to a call to `Time.now` which did not match the
style throughout the rest of the project.

[#41633207]
 2013-01-14 22:17:36 -05:00
Skud
8916b91791 This sends mail correctly on the server, using sendmail. 2012-10-06 13:46:09 +01:00
Skud
c5cfef04d9 Keep postgres password out of database.yml, populate it via cap deploy instead. 2012-10-06 12:45:51 +01:00
Miles Gould
6454ad09ee Prevent generators from overriding our CSS. 2012-10-02 11:32:56 +01:00