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

129 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
26189855cc Reduce visual impact of hover, and make snappier (#3712) 
* Reduce visual impact of hover, and make snappier

* Better seed

* Improve seeding

* Fix codespaces login
 2024-04-07 22:17:16 +09:30
Daniel O'Connor
008667515e Swap from ugifier to terser 2024-01-27 01:28:55 +00:00
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
Cesy
3820b01769 Adding codespace host so you can view things in the browser 2023-04-13 16:50:23 +01:00
Daniel O'Connor
e1fb08707a Issue/2419: Limit map to the most recent plantings only (#3191) 
* For now, drop mapbox for OSM tiles

* For now, drop mapbox for OSM tiles

* Use OSM tiles

* Remove mapbox secrets for now. If we bring back mapbox; we should re-enstate

* Only show up to 200 plantings

* Update app/assets/javascripts/members.js.erb

* [CodeFactor] Apply fixes

* Update production.rb

---------

Co-authored-by: codefactor-io <support@codefactor.io>
 2023-03-13 15:13:28 +10:30
Daniel O'Connor
449c6c4487 Issue/3189: Fix map displays by dropping mapbox (#3190) 
* For now, drop mapbox for OSM tiles

* For now, drop mapbox for OSM tiles

* Use OSM tiles

* Remove mapbox secrets for now. If we bring back mapbox; we should re-enstate

* Update members.js.erb

* Change placeholder
 2023-03-13 13:04:16 +10:30
Cesy
60608411ed Merge branch 'dev' into issue/1642 2022-12-17 10:41:35 +00:00
Cesy
59c212ecf5 Switching from SendGrid to Mailgun for sending emails 2022-12-15 10:35:52 +00:00
Daniel O'Connor
07feb1cd85 Drop tests 2022-12-10 15:54:58 +10:30
Brenda Wallace
9dbf8b7c8f New robocops 2020-08-26 12:36:58 +12:00
Brenda
a4afeea025 Updated test stubs to support geocoder 1.6 
https://github.com/alexreisner/geocoder/issues/1258
 2020-06-20 10:57:03 +12:00
codefactor-io
4ff95fbac9 [CodeFactor] Apply fixes 2020-01-21 22:26:08 +13:00
Brenda
7257b2ada1 Update with frozen literals 2020-01-10 16:50:52 +13:00
Brenda Wallace
04fd1a343a Rubocop update (#2334) 
* Update rubocop config

* Rubocop update - for rubocop 0.77

* [CodeFactor] Apply fixes

* rubocop fixes

* [CodeFactor] Apply fixes to commit 2826c2e
 2019-12-16 22:35:33 +13:00
Brenda
9159df81c9 Turn on bullet in dev 2019-12-04 21:02:33 +13:00
Brenda Wallace
7b6dc1943a Fixes staging linking to production 2019-07-11 15:12:16 +00:00
Brenda Wallace
f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb
 2019-04-21 11:27:27 +12:00
Brenda Wallace
10a7689b05 Lint 2019-04-20 19:30:09 +12:00
Brenda Wallace
f60174a8b9 Merge remote-tracking branch 'upstream/dev' into feature/memcachier 2019-04-19 09:30:48 +12:00
Brenda Wallace
ad90dd6dfa Fixes wrong host name in emails 2019-04-08 14:23:34 +12:00
Brenda Wallace
8e8c9d179b Added growstuff prefix to env variables 2019-03-26 15:57:29 +13:00
Brenda Wallace
607f0e3887 Rename to mapbox map id 2019-03-26 15:57:29 +13:00
Brenda Wallace
875fa49d44 Remove distinct staging env file 2019-03-26 15:57:29 +13:00
Brenda Wallace
ba27e14226 Move mapbox config to env 2019-03-26 15:57:29 +13:00
Brenda Wallace
59b3a68fc3 Configure memcachier for production 2019-03-26 15:57:29 +13:00
Brenda Wallace
3ed173ebcd Material design changes 2019-02-17 21:33:36 +13:00
Brenda Wallace
5b732fedae Remove references to MANDRILL 2019-01-19 12:36:27 +13:00
Brenda Wallace
f453682696 Fixing sendgrid 2019-01-19 12:33:58 +13:00
Brenda Wallace
6f23a203a2 Switch to SendGrid (remove sparkhost) 2019-01-19 11:57:50 +13:00
Brenda Wallace
b6a7fa0efd Force to redirect to ssl 2019-01-19 08:51:55 +13:00
Brenda Wallace
656510855d Switch to new syntax for initing uglifier 2019-01-18 14:21:11 +13:00
Brenda Wallace
164e43f054 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5-2 2019-01-01 13:32:57 +13:00
Brenda Wallace
a43c235423 Upgrade to Rails 5.2 2019-01-01 10:31:53 +13:00
Brenda Wallace
a6a75050bb Make mail sender host configurable 2019-01-01 09:55:29 +13:00
Brenda Wallace
3fec343f2c Rubocop for hash alignment 2018-12-30 15:13:59 +13:00
Brenda Wallace
8348530e22 Tell capybara to normalise whitespace 2018-12-30 12:58:22 +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
aab91e2fa9 Removed active merchant 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
96b4742e78 Dev is almost always on port 3000 2017-10-28 10:38:51 +13:00
Brenda Wallace
5baa357bb3 Use bullet to find queries to optomise 2017-03-24 16:07:05 +13:00
Miles Gould
9030e5b978 Merge branch 'dev' into test_runners 2017-02-16 13:31:39 +00:00
Brenda Wallace
2b03381a24 Removed trailing commas 2017-02-15 23:33:06 +00:00
Miles Gould
f11bc42507 Turn on asset compilation in test 
This is required for running jasmine tests via `rake spec:javascript`.
The comment above this setting warned that it would slow down testing
considerably; in my quick tests the slowdown is only about 2% (3mins 14
vs 3mins 11). We precompile assets in Travis, so this *shouldn't* cause
any more random CI failures...
 2017-02-07 14:27:14 +00:00
Brenda Wallace
40a981c94d Removed unnecesary braces on hash args 2017-01-22 15:10:11 +13:00
Miles Gould
1841548936 Precompile assets in test 
According to
https://github.com/teampoltergeist/poltergeist/issues/677#issuecomment-222919584,
a possible cause of the "Request failed to reach server" problem (#901)
is that assets are being compiled on-demand, causing enough of a
slowdown for PhantomJS to think the connection has failed. This turns
off lazy asset compilation in the test environment and precompiles
assets before testing on Travis. We should also turn off lazy asset
compilation in production - see
http://stackoverflow.com/questions/8821864/config-assets-compile-true-in-rails-production-why-not
Our Heroku deployments already run `rake assets:precompile`.
 2016-11-30 11:01:25 +00:00
Brenda Wallace
723ebff923 Spacing fixes 2016-11-26 12:13:17 +13:00