Brenda Wallace
5baa357bb3
Use bullet to find queries to optomise
2017-03-24 16:07:05 +13:00
Miles Gould
9030e5b978
Merge branch 'dev' into test_runners
2017-02-16 13:31:39 +00:00
Brenda Wallace
2b03381a24
Removed trailing commas
2017-02-15 23:33:06 +00:00
Miles Gould
f11bc42507
Turn on asset compilation in test
...
This is required for running jasmine tests via `rake spec:javascript`.
The comment above this setting warned that it would slow down testing
considerably; in my quick tests the slowdown is only about 2% (3mins 14
vs 3mins 11). We precompile assets in Travis, so this *shouldn't* cause
any more random CI failures...
2017-02-07 14:27:14 +00:00
Brenda Wallace
40a981c94d
Removed unnecesary braces on hash args
2017-01-22 15:10:11 +13: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
Brenda Wallace
723ebff923
Spacing fixes
2016-11-26 12:13:17 +13:00
Brenda Wallace
62e7c716dd
Removed extra empty blank lines
2016-11-26 12:06:02 +13:00
Brenda Wallace
2e46cccd21
Hash alignment
2016-11-26 11:52:10 +13:00
Brenda Wallace
6bd9bd98d9
Removed extra blank lines, & added a end of file
2016-11-16 12:52:48 +13:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Daniel O'Connor
1f005a3d42
Fixes #1042
2016-09-14 21:41:18 +09:30
Cesy
fe137a11bb
Merge pull request #1031 from CloCkWeRX/queue_mail
...
Queue mail in sidekiq
2016-08-24 10:38:13 +01:00
Daniel O'Connor
aeb8792165
Merge remote-tracking branch 'upstream/dev' into queue_mail
2016-08-24 06:35:51 +09:30
Daniel O'Connor
c60609d507
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-23 16:34:03 +09:30
Daniel O'Connor
6b470f180c
#951 Add sidekiq as our activejob backend
2016-08-16 11:01:19 +09:30
Daniel O'Connor
d8ad697d09
Swap tokens
2016-08-15 21:53:17 +09:30
Daniel O'Connor
e38321aa33
#981 Add mapbox access token (on my free 50k views account) and update to v4
2016-07-28 14:27:49 +09:30
Daniel O'Connor
43e7d6f7c2
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-07-05 03:09:36 +09:30
Daniel O'Connor
c3d9885525
Merge pull request #987 from CloCkWeRX/upgradazzle_rails
...
Upgrade to rails 4.2.0+ (round 2)
2016-06-29 14:47:05 +09:30
pozorvlak
a66a040207
Revert "Handled Issue #950 (Branded Error Pages)"
2016-06-16 12:58:22 +01:00
Prashanth
483143f2fe
Merge branch 'growstuff-dev' into dev
...
Conflicts:
CONTRIBUTORS.md
2016-06-14 17:09:06 +05:30
pozorvlak
1b3d106b6d
Merge pull request #989 from maco/sparkpost_#917
...
update to SparkPost's mailserver
2016-06-13 18:04:43 +01:00
Mackenzie Morgan
e7be006fa7
update to SparkPost's mailserver
2016-06-13 12:12:00 -04:00
Prashanth
b9f40151d8
Handled Issue #950 (Branded Error Pages)
...
Moved error related views from public to errors (asset pipeline can be used).
Header and footer were included along with the error message.
2016-06-10 18:35:48 +05:30
Daniel O'Connor
df9cf3f5c4
Fix various rails deprecations
2016-06-10 15:58:39 +09:30
pozorvlak
e419acea6e
Install BogusPayPalGateway gem
...
We were maintaining a vendor fork of active_merchant because they
refused to merge this feature in; it's now been released as a
separate gem.
2016-06-07 17:43:35 +00:00
Daniel O'Connor
083035c924
Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup
2016-05-23 16:58:22 +09:30
Daniel O'Connor
4b4e0cf69a
$ rubocop --only HashSyntax --auto-correct
...
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
Daniel O'Connor
00ca01dc33
Add coverage of the most basic scenarios around sign up and login
2015-09-15 11:20:33 +09:30
AELOGICA
429e54733d
Moved the geocoder stub to ./cofig/environments/test.rb
2015-07-01 10:57:28 +08:00
Taylor Griffin
102763f2ab
link to new crop request form
2015-02-10 22:12:22 +11:00
Taylor Griffin
2f05f1dbdb
raise exceptions on unpermitted params in staging
2015-01-23 13:22:52 +11:00
Taylor Griffin
0e0c309c15
Revert "Sci names permitted params"
2015-01-23 11:42:42 +11:00
Taylor Griffin
20b9996f14
raise exceptions on unpermitted parameters in staging
2015-01-23 10:15:06 +11:00
Taylor Griffin
66c4a19ad6
revert to previous smtp settings
2014-12-14 15:41:29 +11:00
Taylor Griffin
a65b78084f
change staging smtp settings
2014-12-14 15:36:56 +11:00
Taylor Griffin
a35a573b2b
update follow member code to be rails 4 compatible
2014-12-14 14:51:18 +11:00
Taylor Griffin
fb595de457
edited configuration and dependencies
2014-11-18 22:24:58 +11:00
Taylor Griffin
acbd3f9a9e
implement strong parameters instead of protected attributes
2014-11-18 20:08:54 +11:00
Taylor Griffin
98c1680138
handle misc deprications
2014-11-17 07:16:02 +11:00
Skud
52cfa9f676
Changed staging environment hostname to staging.growstuff.org
2014-11-16 10:16:34 +11:00
Taylor Griffin
40a88b5b09
tests run but fail like whoa
2014-11-15 21:44:55 +11:00
Miles Gould
6921119301
Make Capybara actually hit the server.
...
Background:
http://talk.growstuff.org/t/mysteriously-broken-feature-tests/120
@oshiho3's suggested fix didn't work, so I tried all the suggestions at
http://stackoverflow.com/questions/6536503/capybara-with-subdomains-default-host
until I found one that fixed the problem.
2014-11-02 22:21:32 +00:00
Taylor Griffin
2c50c3b703
merge in a bunch of (mostly bootstrap 3) changes
2014-08-29 07:14:44 +10:00
Taylor Griffin
5df0c9c71a
sketch feature test for planting a crop
2014-07-26 08:36:48 +10:00
Amy Hendrix
6503b2ec7c
Turn off caching in dev
2014-07-13 23:54:37 -04:00
Skud
0174202ef0
Remove travis environment
...
We had this special environment because we wanted travis to be different
to our test environment -- specifically, to use postgres, while we used
sqlite in dev/test. We now use postgres in dev/test so this is no
longer necessary.
2014-07-06 20:27:35 +10:00
Skud
d90268bd16
Added note as to why mapbox config isn't in application.yml
2014-06-02 19:00:50 -05:00
Skud
5d587af8b0
replaced cloudmade maps with mapbox
2014-06-02 18:57:03 -05:00
