Jim Stallings
160c6efd04
Remove example file, add documentation
2016-12-02 15:34:38 +10:30
Jim Stallings
fe6e269c64
GS-658 - i18n automation POC
2016-12-02 15:34:38 +10:30
Jim Stallings
81f2fa5fa4
GS-658: sort locale keys, add rake task for it
2016-12-02 15:31:07 +10:30
Shiny
bb0eb25dd3
Merge branch 'dev' into bw/useless-assignments
2016-12-02 14:04:30 +13:00
Shiny
077c807958
Merge branch 'dev' into seed_photos
2016-12-02 14:04:12 +13:00
Daniel O'Connor
07ba39c117
Merge branch 'dev' into codeclimate_ignores
2016-12-02 11:33:04 +10:30
Daniel O'Connor
266455eda6
Merge pull request #1105 from maco/wikipedia_regex
...
expand wikipedia regex to include -, (, and )
2016-12-02 11:32:26 +10:30
Brenda Wallace
03cb4a8dee
use find_or_initialize_by
2016-12-02 00:23:46 +00:00
Brenda Wallace
d87de13215
Merge remote-tracking branch 'origin/bw/find-by' into bw/useless-assignments
2016-12-01 23:46:50 +00:00
Mackenzie Morgan
ceac906a3f
ignore the minified bootstrap accessibility file for code climate checks
2016-12-01 14:00:18 -05:00
Mackenzie Morgan
2fb34bea18
narrow the regex back down
...
hyphen must be the LAST thing in the character class
2016-12-01 13:39:43 -05:00
Mackenzie Morgan
a3c8bc0586
include the migration
2016-12-01 13:23:52 -05:00
Mackenzie Morgan
637b46ef10
add photos to seeds
...
Fixes #495
2016-12-01 12:54:55 -05:00
Mackenzie Morgan
b38945d62f
add require_relative to photo_capable concern for constants
...
starts #1107
2016-12-01 12:53:45 -05:00
Mackenzie Morgan
54628e6d8c
expand wikipedia regex to include punctuation, because some have - or () in name
...
(Fixes : #1104 )
2016-12-01 12:25:48 -05:00
pozorvlak
5cb1e14d7b
Merge pull request #1095 from maco/photo_concern
...
DRY up photo & model interaction
2016-12-01 15:16:21 +00:00
Daniel O'Connor
7032436f7b
Merge branch 'dev' into bw/useless-assignments
2016-12-01 22:15:50 +10:30
Daniel O'Connor
83a3c3e72f
Merge pull request #1102 from cesy/railsupdate
...
Update rails
2016-12-01 22:04:32 +10:30
Cesy Avon
3d845f47b9
Update rails
2016-12-01 09:42:55 +00:00
Brenda Wallace
d2fb96b3d7
change where.first -> find_by
2016-12-01 22:14:50 +13:00
Brenda Wallace
aba06c1faf
Case insensitive crop look up
2016-12-01 21:29:28 +13:00
Brenda Wallace
dc504fe363
use Member.case_insensitive_login_name
2016-12-01 21:29:00 +13:00
Brenda Wallace
cba02ae05c
Convert where.first to find_by
2016-12-01 20:25:28 +13:00
Brenda Wallace
37adbe5f48
Moved case-insensitve login look up to method
2016-12-01 20:25:19 +13:00
Brenda Wallace
ae26e3f936
Moved login_name_or_email query to own method
2016-12-01 20:25:10 +13:00
Mackenzie Morgan
7b2be73c88
code climate
2016-12-01 00:22:52 -05:00
Mackenzie Morgan
cd0fbc80d8
Merge remote-tracking branch 'origin/photo_concern' into photo_concern
2016-12-01 00:19:42 -05:00
Mackenzie Morgan
31bbf42ad0
define valid models for photos in a constants file
...
remove all hardcoded model names from photo.rb and photos_controller.rb
2016-12-01 00:19:33 -05:00
Brenda Wallace
e06d110861
Turn on rails:true in rubocop
...
so we don't need to pass --rails
2016-12-01 13:30:00 +13:00
Shiny
b454132cae
Merge branch 'dev' into bw/useless-assignments
2016-12-01 12:51:13 +13:00
Brenda Wallace
cd0e287dba
removed member look up that wasn't used in spec
2016-12-01 12:50:16 +13:00
Shiny
771e6b649c
Merge branch 'dev' into photo_concern
2016-12-01 12:37:23 +13:00
Daniel O'Connor
547e6400f8
Merge pull request #1049 from maco/scopify
...
moving where clauses into scopes to keep that contained in models
2016-12-01 09:48:26 +10:30
Brenda Wallace
ce7cd5d96b
Merge branch 'dev' into bw/useless-assignments
2016-12-01 11:17:56 +13:00
Mackenzie
ba4d85538c
Merge branch 'dev' into scopify
2016-11-30 16:47:22 -05:00
Mackenzie
af3ca215a6
Merge branch 'dev' into photo_concern
2016-11-30 16:37:36 -05:00
Mackenzie Morgan
cef1bb1056
ignore has_and_belongs_to_many
2016-11-30 16:29:02 -05:00
Brenda Wallace
6321d1ac41
current order, use rails' findby
2016-12-01 10:17:22 +13:00
Mackenzie
57461f6e34
Merge pull request #1091 from pozorvlak/fix_display_days_before_maturity
...
Fix PlantingHelper.display_days_before_maturity
2016-11-30 10:09:36 -05:00
Cesy
cf8fab8ed9
Merge pull request #1080 from Growstuff/dev
...
Release 16
2016-11-30 15:07:42 +00:00
Mackenzie Morgan
aa7ca71e5d
rubocop
2016-11-30 09:47:48 -05:00
Mackenzie Morgan
a5fcfb6277
Merge branch 'dev' of gitmaco:Growstuff/growstuff into photo_concern
2016-11-30 09:44:36 -05:00
Mackenzie
376e6c08d3
Merge pull request #1097 from pozorvlak/precompile_assets_in_test
...
Precompile assets in test
2016-11-30 09:44:15 -05:00
Mackenzie
0cbaac3c75
Merge pull request #1098 from pozorvlak/allow_unadorned_rake_without_db
...
Run tests with `rake` when DB does not yet exist
2016-11-30 09:43:40 -05:00
Miles Gould
6be9640625
Run tests with rake when DB does not yet exist
...
Previously, `rake spec` ran the tests whether or not the `growstuff_test`
database existed or not, but `rake` crashed unless it had already been
created. The problem was that `rake` was trying to load the environment,
which required the presence of a DB; `rake spec` was running this with
the `dev` environment, so succeeded if `growstuff_dev` existed, but
`rake` was running everything with the `test` environment, so would fail
if `growstuff_test` did not exist.
This patch adds `db:create` to the dependencies of the `spec` task,
forcing an unadorned `rake` to create all necessary databases first.
2016-11-30 11:35:35 +00: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
Miles Gould
9400225f65
Return a string from display_days_before_maturity
...
Sometimes we were returning a string, and sometimes we were returning an
integer. We're only ever displaying the result, and this seems a little
more consistent.
2016-11-30 10:16:02 +00:00
Miles Gould
b0b864a5d4
Fix off-by-one bug in display_days_before_maturity
...
We were counting from DateTime.now rather than Date.current, causing us to
under-count by a day.
2016-11-30 10:16:02 +00:00
Miles Gould
77c64d5925
Test PlantingHelper.display_days_before_maturity
...
This ensures that #1079 is fixed.
2016-11-30 10:15:52 +00:00
pozorvlak
d3b927b44b
Merge pull request #1096 from Growstuff/master
...
Master to dev for 1092
2016-11-30 09:44:12 +00:00
Jim Stallings