Commit Graph

6992 Commits

Author SHA1 Message Date
Brenda Wallace
3f59fe6bc7 style login buttons as buttons 2019-06-26 09:35:50 +12:00
Brenda Wallace
5efdf80bc2 lint 2019-06-26 09:35:35 +12:00
Brenda Wallace
b2c6a85aa9 use variable for colour 2019-06-26 09:35:21 +12:00
Brenda Wallace
b21b95bbc2 scss lint fixes 2019-06-26 09:31:19 +12:00
Brenda Wallace
5e15912371 Adding owner to planting in spec, so it passes 2019-06-26 09:23:22 +12:00
Brenda Wallace
d50ae70824 in the spec, visit the path, not the full url 2019-06-26 09:14:01 +12:00
Brenda Wallace
e020db7eef travici needs to call search:reindex 2019-06-26 09:13:12 +12:00
Brenda Wallace
1df19ead92 removed phantom 2019-06-26 09:12:57 +12:00
Brenda Wallace
06ae5ecd6f DRY buttons 2019-06-26 09:12:39 +12:00
Brenda Wallace
73f2fd2323 fix another deprecation warning about rails 6 2019-06-26 09:07:03 +12:00
Brenda Wallace
474732f909 Fix sql warning in logs 2019-06-26 09:05:14 +12:00
Brenda Wallace
5b977964e8 Fixing deprecation warning by devise 2019-06-26 09:04:38 +12:00
Brenda Wallace
a69e4020d7 back to reading gardens from the plantings 2019-06-26 08:09:49 +12:00
Brenda Wallace
a598214a60 renamed scss files 2019-06-25 21:34:52 +12:00
Brenda Wallace
73f7e695b4 Ignore leaflet 2019-06-25 21:32:13 +12:00
Brenda Wallace
30728d8146 Rule declaration should be followed by an empty line 2019-06-25 21:31:38 +12:00
Brenda Wallace
ee2d169c1d Unknown property align 2019-06-25 21:31:24 +12:00
Brenda Wallace
92f0453d25 Alpha ordered css 2019-06-25 21:30:55 +12:00
Brenda Wallace
c6bb21cdfa 0.5 should be written without a leading zero as .5 2019-06-25 21:30:25 +12:00
Brenda Wallace
56bae53295 0.1 should be written without a leading zero as .1 2019-06-25 21:29:50 +12:00
Brenda Wallace
c6b7696558 Files should end with a trailing newline 2019-06-25 21:29:30 +12:00
Brenda Wallace
b77693c82f Imported partial bootstrap/variables.scss should be written as bootstrap/variables 2019-06-25 21:29:13 +12:00
Brenda Wallace
ea4d48184b Delete trailing spaces 2019-06-25 21:13:09 +12:00
Brenda Wallace
5f3a180f9c restore <title> on harvests#index 2019-06-25 21:12:09 +12:00
Brenda Wallace
7f00a5063b view spec updates 2019-06-25 21:06:32 +12:00
Brenda Wallace
ec1824fd4f Remove comment specs, they're on another view now 2019-06-25 20:56:57 +12:00
Brenda Wallace
702a66dea9 Update spec for editing gardens 2019-06-25 20:45:54 +12:00
Brenda Wallace
103d1ce2eb rubocop lint 2019-06-25 20:39:50 +12:00
Brenda Wallace
58d08ceb5a fix look up of translation for homepage 2019-06-25 20:35:40 +12:00
Brenda Wallace
4a09394485 Remove crop name test from homepage members list 2019-06-25 20:33:18 +12:00
Brenda Wallace
20e236fb4b more spec updates 2019-06-25 20:31:15 +12:00
Brenda Wallace
72a0c07a93 Added member location back to match specs 2019-06-25 16:29:52 +12:00
Brenda Wallace
4f04d843a3 Move the subquerys in members#show to private 2019-06-25 16:18:15 +12:00
Brenda Wallace
1dd9a1028e Updating the way we look for the plantparts radio buttons in specs 2019-06-25 16:17:43 +12:00
Brenda Wallace
b1b6de0aae set @gardens for plantings controller and spec 2019-06-25 15:55:06 +12:00
Brenda Wallace
3d065c72ba update new planting view spec 2019-06-25 15:54:50 +12:00
Brenda Wallace
3dab7b89f9 update planting specs 2019-06-25 15:36:08 +12:00
Brenda Wallace
dce1ab6239 Format the output from rspec 2019-06-25 15:24:53 +12:00
Brenda Wallace
e2a764e8bc call search:reindex on ci runs 2019-06-25 15:18:31 +12:00
Brenda Wallace
aab2f75caa use console.log instead of alert
so our headless chrome doesn't get stuck on the alert
2019-06-25 15:15:16 +12:00
Brenda Wallace
5150e8e2a7 Plant part is a radio button now. updating spec 2019-06-25 13:43:30 +12:00
Brenda Wallace
4fc7e0d0b2 fix up home spec 2019-06-25 13:28:08 +12:00
Brenda Wallace
8af856f990 Updating specs 2019-06-25 11:36:23 +12:00
Brenda Wallace
d7e4863f02 bundle install results 2019-06-25 10:12:34 +12:00
Brenda Wallace
5de269c097 Move header into partial, to match what specs expect 2019-06-25 10:12:12 +12:00
Brenda Wallace
64864bfcd5 Remove phantom directory mention from travis config 2019-06-25 09:09:28 +12:00
Brenda Wallace
0171e67b7e Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap
Conflicts:
	Gemfile.lock
2019-06-25 09:08:42 +12:00
dependabot-preview[bot]
f7406de7dc Bump scout_apm from 2.4.24 to 2.5.0
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.4.24 to 2.5.0.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.4.24...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-24 21:07:32 +00:00
Brenda Wallace
3e0f6c476f set body on post in spec, so we know what to look for
and we don't trip on whitespace changes
2019-06-25 09:01:37 +12:00
Brenda Wallace
191a3940d7 update unlock spec 2019-06-25 08:57:37 +12:00