Shiny
9ff468aa50
Merge pull request #1228 from Growstuff/dev
...
Release 20
2017-02-22 09:21:01 +13:00
Shiny
4261f16cd0
Merge pull request #1133 from pozorvlak/test_runners
...
Refactor test-runners
2017-02-21 11:59:09 +13:00
Shiny
b8884beb2f
Merge branch 'dev' into test_runners
2017-02-21 11:31:02 +13:00
pozorvlak
bc88c4d8c7
Merge pull request #1231 from Br3nda/seeds-controller
...
DRY seeds controller
2017-02-20 13:49:29 +00:00
pozorvlak
3ac4fbcdb8
Merge branch 'dev' into seeds-controller
2017-02-20 13:36:50 +00:00
pozorvlak
549426e3e0
Merge pull request #1230 from Br3nda/gardens-controller
...
DRY the gardens controller
2017-02-20 13:36:40 +00:00
pozorvlak
25a1f0da9a
Merge branch 'dev' into gardens-controller
2017-02-20 13:11:18 +00:00
pozorvlak
3be2fc6241
Merge pull request #1229 from Br3nda/harvests-controller
...
DRY the Harvests controller
2017-02-20 13:11:04 +00:00
pozorvlak
837934167b
Merge branch 'dev' into harvests-controller
2017-02-20 13:02:58 +00:00
pozorvlak
d43d8ae0e7
Merge pull request #1217 from Br3nda/MultilineMethodCallBraceLayout
...
Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation
2017-02-20 12:46:17 +00:00
Brenda Wallace
035b2399ca
DRY seeds controller
2017-02-20 20:54:06 +13:00
Brenda Wallace
1a3e976ba5
DRY the gardens controller
2017-02-20 02:36:51 +00:00
Brenda Wallace
d31739f86a
Further code clarity on the harvest csv filename
2017-02-20 10:07:14 +13:00
Brenda Wallace
0f523381f0
DRY the harvest controller
2017-02-20 09:58:36 +13:00
Brenda Wallace
550848a513
ParenthesesAroundCondition fixup
2017-02-19 16:20:45 +13:00
Brenda Wallace
ae3752e021
DefWithParentheses fixup
2017-02-19 16:19:16 +13:00
Brenda Wallace
50624fb2cb
Style/MultilineBlockLayout fix
2017-02-19 16:17:03 +13:00
Brenda Wallace
818466a142
MethodCallWithoutArgsParentheses fixup
2017-02-19 16:17:03 +13:00
Brenda Wallace
e184503caa
Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation
2017-02-19 16:17:03 +13:00
Brenda Wallace
d00f743c47
rubocop fix up on spec
2017-02-17 16:00:11 +13:00
pozorvlak
b19a991106
Merge pull request #1226 from Br3nda/scinames-controller
...
DRY scientific names controller
2017-02-16 23:00:29 +00:00
pozorvlak
88e019a19f
Merge branch 'dev' into scinames-controller
2017-02-16 22:52:07 +00:00
pozorvlak
e954ba801b
Merge pull request #1225 from Br3nda/comments-controller
...
DRY comments controller
2017-02-16 22:51:42 +00:00
Brenda Wallace
be23bfc419
DRY scientific names controller
2017-02-17 10:18:34 +13:00
Shiny
5e984ce04a
Merge branch 'dev' into comments-controller
2017-02-17 09:57:29 +13:00
Brenda Wallace
d15eb32133
Added some utf8, kōrero mai (te reo māori)
2017-02-17 09:47:12 +13:00
Brenda Wallace
21f11a4d5d
highest MethodLength is now 34
2017-02-17 09:26:30 +13:00
Brenda Wallace
ae398f1a63
Spec checks you can't change post id in comments#update
2017-02-17 09:20:15 +13:00
Brenda Wallace
cd3cee5d5f
DRY comments controller and add more spec scenarios
2017-02-17 09:14:01 +13:00
Miles Gould
9030e5b978
Merge branch 'dev' into test_runners
2017-02-16 13:31:39 +00:00
Miles Gould
9d6ac9fd8b
LINT ALL THE HAML!
...
.
.
.
lint *all* the HAML?
2017-02-16 13:30:20 +00:00
pozorvlak
403a8814e1
Merge pull request #1222 from Br3nda/forums-controller
...
Small clean ups on forums controller
2017-02-16 13:26:38 +00:00
Miles Gould
00c34ef30c
Document test-running process in CONTRIBUTING.md
2017-02-16 13:25:59 +00:00
Miles Gould
738c0d4e08
Store spec failures, for rspec --only-failures
...
The list of failing tests is stored in tmp/examples.txt, which is
already gitignored.
2017-02-16 13:24:50 +00:00
Miles Gould
82e27f8a71
Delete reference to Discussion Forums wiki page
...
The wiki is dead, that page hasn't been preserved, and most of the
forums it described are dead too. Sic transit gloria mundi.
2017-02-16 13:07:56 +00:00
Miles Gould
fbc203ca0d
Make Jasmine tests pass in CI
...
One test relied on reading the innerHTML attribute of an SVGElement
object; this worked in the browser, but not when run with
`rake jasmine:ci`. I've changed the test to use the `textContent`
attribute instead, which works in both places.
2017-02-16 13:01:40 +00:00
Miles Gould
c83bfc101e
Allow console.log in Jasmine tests, for debugging
2017-02-16 13:00:34 +00:00
pozorvlak
22905235c1
Merge branch 'dev' into forums-controller
2017-02-16 12:41:20 +00:00
pozorvlak
4d3b94b7f0
Merge pull request #1216 from Br3nda/more-rubocop
...
Rubocop fix for MultilineHashBraceLayout
2017-02-16 12:41:10 +00:00
pozorvlak
9e19aae0ca
Merge branch 'dev' into forums-controller
2017-02-16 12:33:55 +00:00
pozorvlak
d8c3f7ed34
Merge branch 'dev' into more-rubocop
2017-02-16 12:30:38 +00:00
pozorvlak
28a6cfe25c
Merge pull request #1223 from Br3nda/posts-controller
...
DRY the posts controller
2017-02-16 12:28:47 +00:00
pozorvlak
630d539f7d
Merge branch 'dev' into more-rubocop
2017-02-16 12:24:20 +00:00
Brenda Wallace
4704bd89f8
DRY the posts controller
2017-02-16 22:15:30 +13:00
Brenda Wallace
076695d349
Added name presence validation to forum
2017-02-16 21:52:28 +13:00
Brenda Wallace
3925a54340
DRY the forums controller
2017-02-16 21:52:07 +13:00
Brenda Wallace
6c566c56d8
removed unnecesary reloads of @forum
2017-02-16 20:16:13 +13:00
Daniel O'Connor
bcc89674d4
Upgrade to current Hashie
2017-02-16 17:18:44 +13:00
Shiny
e1dab634a2
Merge branch 'dev' into more-rubocop
2017-02-16 13:23:07 +13:00
Daniel O'Connor
e06e002282
Merge pull request #1218 from Br3nda/UnneededInterpolation
...
Fix up all UnneededInterpolation
2017-02-16 10:29:19 +10:30
Shiny