mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-12 01:59:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,967 Commits 61 Branches 82 Tags
RSpec/IncludeExamples
Commit Graph

11967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pozorvlak
d0f6d63d36 Merge branch 'dev' into fix/dependents 2018-04-02 15:26:07 +01:00
pozorvlak
879ce26de7 Merge branch 'dev' into fix/coverage 2018-04-02 15:21:51 +01:00
pozorvlak
98e27b5af4 Merge pull request #1602 from Br3nda/fix/ordering 
Fix ordering of recent plantings on crops#show
 2018-04-02 15:21:29 +01:00
pozorvlak
a7cfecf82c Merge branch 'dev' into feature/ownable 2018-04-02 14:47:48 +01:00
pozorvlak
d0f28d4bef Merge branch 'dev' into fix/ordering 2018-04-02 14:43:40 +01:00
pozorvlak
2c090757cc Merge pull request #1601 from Br3nda/feature/fluid-layout 
Feature/fluid layout
 2018-04-02 14:40:44 +01:00
Brenda Wallace
af0c9a490b Redirect :back deprecated. updating follows controller 2018-04-02 16:28:34 +12:00
Brenda Wallace
59cca1b8cb Upgraded controller specs for rails 5 2018-04-02 16:18:46 +12:00
Brenda Wallace
75e401162e More dependent declared on relationships 2018-04-02 16:12:40 +12:00
Brenda Wallace
7f8bdfe48f Updated rubocop todo 2018-04-02 16:09:41 +12:00
Brenda Wallace
c967f7432e Seed's parent planting is optional 2018-04-02 16:04:52 +12:00
Brenda Wallace
5dbb3a1487 Mark cms specs as pending 2018-04-02 15:59:38 +12:00
Brenda Wallace
0235690f82 More dependent declared on relationships 2018-04-02 15:58:36 +12:00
Brenda Wallace
a00237dfcb Style fixes after rubocop upgrade 2018-04-02 15:48:16 +12:00
Brenda Wallace
11fd95e2b8 Upgrading rubocop and haml_lint to match hound 2018-04-02 15:45:06 +12:00
Brenda Wallace
91ee0150f1 Adding dependent clauses to models 2018-04-02 15:37:51 +12:00
Brenda Wallace
d19c9ab669 Remove duplicate scripts yield in layout 2018-04-02 15:31:20 +12:00
Brenda Wallace
5683f1939d Fixed up planting model, parent is not required 2018-04-02 15:17:28 +12:00
Brenda Wallace
6149d20390 Ignore highcharts.js 2018-04-02 15:09:02 +12:00
Brenda Wallace
e43740bd3d Two more application name renames 2018-04-02 15:05:46 +12:00
Brenda Wallace
84e47b721b removed duplicate crop chart methods 2018-04-02 11:36:16 +12:00
Brenda Wallace
f061a1d9c7 Allow planting to have null parent_seed 2018-04-02 11:33:43 +12:00
Brenda Wallace
41ea871c80 Comment out comfy admin for now 2018-04-02 11:20:28 +12:00
Brenda Wallace
49d3f24ac8 [Corrected] Use the -> { ... } lambda literal syntax for single line lambdas. 2018-04-02 11:19:40 +12:00
Brenda Wallace
4d21e132b9 Timeline is in a different controller now 2018-04-02 11:18:56 +12:00
Brenda Wallace
7cda0aacc5 Passing class_name as string in members.requested_crops 2018-04-02 11:16:50 +12:00
Brenda Wallace
2e339ce45d Adding rails version to new migrations 2018-04-02 11:04:31 +12:00
Brenda Wallace
700073e893 Removed duplicate gardens/timeline code 2018-04-02 11:02:22 +12: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
106d187e67 Add dependent clauses on crop model 2018-04-02 10:29:10 +12:00
Brenda Wallace
8521047803 Merge branch 'dev' into feature/ownable 2018-04-02 10:23:07 +12:00
Brenda Wallace
e173d0c130 Merge branch 'dev' into fix/ordering 2018-04-02 10:22:20 +12:00
Brenda Wallace
53197f27eb Merge branch 'dev' into feature/fluid-layout 2018-04-02 10:22:03 +12:00
Brenda Wallace
2460f73673 Merge branch 'dev' into fix/coverage 2018-04-02 10:21:22 +12:00
Brenda Wallace
324dcfc821 Merge pull request #1598 from Growstuff/bundle-update-2018-03-22-131347 
Bundle Update on 2018-03-22
 2018-04-02 10:21:04 +12:00
Brenda Wallace
e3bb43477b Adding counter caches and ownable concern 2018-04-02 10:13:19 +12:00
Brenda Wallace
2d309b7645 Removing jasmine, we have no jasmine specs 2018-04-02 09:58:02 +12:00
Brenda Wallace
a59f7dd137 Merge branch 'dev' into fix/coverage 2018-04-02 09:50:11 +12:00
Brenda Wallace
1fb3c4e0f9 Regnerated and secured code climate key 2018-04-02 09:47:04 +12:00
Brenda Wallace
b64a294245 Removed duplicate margins in css 2018-04-01 18:45:35 +12:00
Brenda Wallace
31d2aa052a More bundle updates 2018-04-01 14:16:50 +12:00
Brenda Wallace
b7f78d5dc9 Fix ordering of recent plantings on crops#show 2018-04-01 13:05:23 +12:00
Brenda Wallace
f1afe1ca79 Expanding layout to use full screen 2018-04-01 12:44:59 +12:00
Brenda Wallace
e029ef17ab Merge remote-tracking branch 'upstream/dev' into dev 2018-04-01 09:21:37 +12:00
Brenda Wallace
d5c8b9ae27 Merge branch 'dev' into bundle-update-2018-03-22-131347 2018-03-31 18:15:25 +13:00
Brenda Wallace
f907ba9e4b Merge pull request #1599 from Growstuff/dev 
Release 43
 2018-03-30 16:14:06 +13:00
Brenda Wallace
25070f73d7 Merge pull request #1591 from Br3nda/feature/photos-helper 
Use photos helpers to find photos
release43 		2018-03-26 18:14:32 +13:00
Brenda Wallace
2fe6012342 Merge branch 'dev' into feature/photos-helper 2018-03-23 15:03:01 +13:00
deppbot
61468b3587 Bundle Update on 2018-03-22 2018-03-22 13:13:48 +08:00
Brenda Wallace
58c4d82087 Merge pull request #1590 from Growstuff/dev 
Release 42
 2018-03-22 15:01:52 +13:00