 Brenda Wallace
|
e3113fd53d
|
Re-work gardens#index to show planting progress
|
2017-10-21 22:48:37 +01:00 |
|
|
Brenda Wallace
|
68768c4d6a
|
Fixed redirection after planting is deleted
|
2017-10-21 22:48:37 +01:00 |
|
|
pozorvlak
|
da7fec5e0b
|
Merge pull request #1405 from Br3nda/fix-1379
Display messages even when member is deleted
|
2017-10-20 16:10:51 +01:00 |
|
|
Brenda Wallace
|
191c8e4e9d
|
Display messages even when member is deleted
|
2017-10-20 23:44:51 +13:00 |
|
|
deppbot
|
edc763cd8c
|
Bundle Update on 2017-10-19
|
2017-10-20 23:23:02 +13:00 |
|
|
Brenda Wallace
|
fdfb116d92
|
Ignore one Style/ClassAndModuleChildren
release29
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
888e0669a0
|
Added hound config
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
d55e2b5466
|
Update heroku maintenance script
maintenance is just an attribute now
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
c28ae4fe83
|
Use ! to indicate the method changes class variables
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
4b4669459e
|
Fixed duplicated code in growstuff member link markdown
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
77902ad300
|
Moved member look up to a method (less duplicate code)
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
f314fcd919
|
Fixed members link in growstuff markdown
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
8171c12a5b
|
Fixed links to crops in growstuff markdown
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
08b6b46bfa
|
Removed some rubocop todos
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
bf189092ea
|
More simplification of growstuff markup
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
a539a47044
|
Reduced complexity of growstuff_markdown
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
e29ac8827a
|
Another code style fixup
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
c5cee72ae5
|
Migrate to new heroku platform api - maintenance mode trigger
|
2017-10-19 08:22:40 +13:00 |
|
|
deppbot
|
5396550a8a
|
Bundle Update on 2017-10-16
|
2017-10-19 08:22:40 +13:00 |
|
|
deppbot
|
76d2fb37b4
|
Bundle Update on 2017-09-28
|
2017-10-19 08:22:40 +13:00 |
|
|
deppbot
|
a42676ef0a
|
Bundle Update on 2017-09-25
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
3f3fc6a4ca
|
Only install elastic search in travis on the matix that tests elasticsearch
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
c710a8b1ef
|
Outputs which version of elasticsearch we are running on travis
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
6ada0c4f84
|
Install elastic search 2.4.0 when running on travis
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
2e5a2455d6
|
Sleep before tests
as suggested here https://docs.travis-ci.com/user/database-setup/#ElasticSearch
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
d89d4cea39
|
Further gem updates
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
01a82ac993
|
Use floats, so the percentage calc works
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
68660b3c65
|
update from erubi to erubis gem broke stuff - rolling back
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
67b4f3558e
|
Set required executable to jshint linting
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
63b973833f
|
Don't need to create database if just running linters
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
4b19f73eb8
|
Remove git guilt
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
9b4d6044ef
|
Specify the executable in the npm installed linters
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
9c70ffe051
|
Specify the executable in the npm installed linters
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
e7a1d2345d
|
Bundle update and change to platform-api instead of heroku
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
c7585f1931
|
Use string.start_with? instead of a regexp
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
63b76d175d
|
Changed regex to matches? to appease rubocop
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
1d5d2cc704
|
Added xmlrpc gem to solve rake errors on travis
|
2017-10-19 08:22:40 +13:00 |
|
|
Brenda Wallace
|
9477b4f9c7
|
Bump ruby version to 2.4.1
|
2017-10-19 08:22:40 +13:00 |
|
|
deppbot
|
a42a61abdd
|
Bundle Update on 2017-08-03
|
2017-10-19 08:22:40 +13:00 |
|
|
pozorvlak
|
62eaa07862
|
Merge pull request #1401 from Br3nda/fix/codestyle
Another code style fixup
|
2017-10-18 10:52:38 +01:00 |
|
|
pozorvlak
|
f26420c380
|
Merge branch 'dev' into fix/codestyle
|
2017-10-18 10:41:03 +01:00 |
|
|
pozorvlak
|
6de13b7327
|
Merge pull request #1402 from Br3nda/fix/heroku-deploys
Update heroku maintenance script - maintenance is just an attribute now
|
2017-10-18 10:34:33 +01:00 |
|
|
Brenda Wallace
|
310f631f40
|
Ignore one Style/ClassAndModuleChildren
|
2017-10-18 20:45:27 +13:00 |
|
|
Brenda Wallace
|
bec59aba43
|
Merge remote-tracking branch 'origin/fix/codestyle' into fix/codestyle
|
2017-10-18 19:27:36 +13:00 |
|
|
Brenda Wallace
|
c86902967d
|
Merge remote-tracking branch 'upstream/dev' into fix/codestyle
|
2017-10-18 19:27:08 +13:00 |
|
|
Brenda Wallace
|
361e3df692
|
Added hound config
|
2017-10-18 19:26:36 +13:00 |
|
|
Shiny
|
ce18bef892
|
Merge branch 'dev' into fix/codestyle
|
2017-10-18 14:01:57 +13:00 |
|
|
Shiny
|
ac2b0d04ea
|
Merge branch 'dev' into fix/heroku-deploys
|
2017-10-18 13:40:52 +13:00 |
|
|
Brenda Wallace
|
9d0b48b84c
|
Update heroku maintenance script
maintenance is just an attribute now
|
2017-10-18 13:37:54 +13:00 |
|
|
Brenda Wallace
|
d8f41b5ca0
|
Use ! to indicate the method changes class variables
|
2017-10-18 12:20:28 +13:00 |
|