mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-03 19:54:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 101 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud c6f5abc036 Made info alerts be green like Growstuff is green 2015-01-24 21:07:41 +11:00
Skud ad76a04e8f Fixed misnamed feature test 2015-01-24 21:07:27 +11:00
Skud 0b70be4939 Merge branch 'issues/625_add_context_for_logged_out_users' of https://github.com/rocky-jaiswal/growstuff into rocky-jaiswal-issues/625_add_context_for_logged_out_users 2015-01-24 20:45:14 +11:00
pozorvlak da2590791e Merge pull request #665 from pozorvlak/500_on_follow 
Fix the 500 server error when you try to follow another user
 2015-01-23 23:45:03 +00:00
Marlena Compton a749a9ca63 all tests working but 2 about to monkey with data again 2015-01-23 06:33:03 -08:00
Miles Gould 79a7958519 Don't try to load a Follow before it's been created. 2015-01-23 11:39:20 +00:00
Miles Gould f4d452f3bc Turn on PhantomJS for Follows features. 2015-01-23 11:39:20 +00:00
Miles Gould d08e2f09db Add feature test for 500-on-follow error 
This doesn't actually catch the problem; I'm committing it so other
people can see it and suggest ways of making it stronger.
 2015-01-23 11:39:20 +00:00
pozorvlak d5cc3f300a Merge pull request #664 from pozorvlak/travis_containers 
Deployment from Travis containers
 2015-01-23 11:00:11 +00:00
Skud 1982cecc31 Merge pull request #673 from tygriffin/sci-names-permitted-params 
Sci names permitted params
 2015-01-23 13:40:47 +11:00
Taylor Griffin 2f05f1dbdb raise exceptions on unpermitted params in staging 2015-01-23 13:22:52 +11:00
Taylor Griffin a67a55c599 add scientific name to crops create feature spec 2015-01-23 13:21:47 +11:00
Taylor Griffin 253b5a3f85 define permitted param for nested attribute 2015-01-23 13:20:37 +11:00
Taylor Griffin 45aaf31722 Merge branch 'dev' of https://github.com/Growstuff/growstuff into sci-names-permitted-params 2015-01-23 13:19:33 +11:00
Taylor Griffin d0b9917e84 Merge pull request #671 from Growstuff/revert-669-sci-names-permitted-params 
Revert "Sci names permitted params"
 2015-01-23 13:14:42 +11:00
Taylor Griffin 32dcacf9ba copy schema from last known correct version 2015-01-23 13:14:13 +11:00
Taylor Griffin 0e0c309c15 Revert "Sci names permitted params" 2015-01-23 11:42:42 +11:00
Miles Gould 6d1385f00c Turn on PhantomJS for all feature tests. 2015-01-22 23:55:20 +00:00
pozorvlak dabfeeea3c Merge pull request #669 from tygriffin/sci-names-permitted-params 
Sci names permitted params
 2015-01-22 23:46:27 +00:00
Taylor Griffin 20b9996f14 raise exceptions on unpermitted parameters in staging 2015-01-23 10:15:06 +11:00
Taylor Griffin 1ea5257da4 include sci names in create crop feature spec 2015-01-23 09:56:23 +11:00
Taylor Griffin 3c360ab1b8 specify permitted params for nested attributes 2015-01-23 09:22:13 +11:00
pozorvlak b1c60572ef Merge pull request #668 from cesy/moretests 
More tests
 2015-01-22 22:01:23 +00:00
Cesy Avon 14ad572f18 Adding test for products 2015-01-22 16:21:10 +00:00
pozorvlak 1481d01cf8 Merge pull request #667 from cesy/moretests 
More tests
 2015-01-22 15:42:11 +00:00
Cesy Avon 492781ea3d The test that's currently failing on some branches 2015-01-22 14:40:11 +00:00
Cesy Avon 542d978d9c Adding extra tests for crop wrangling 2015-01-22 14:24:03 +00:00
Cesy Avon c893dcd271 Moving file to sensible location for crop wrangling test 2015-01-22 14:19:47 +00:00
Miles Gould 57552455e3 Get Heroku app from .travis.yml 2015-01-21 09:13:07 +00:00
Skud fe69e2f11d Merge pull request #663 from rocky-jaiswal/minor/less_verbose_dev_logging 
Add quiet_assets to reduce noise in dev environment.
 2015-01-21 18:36:33 +11:00
Shiho Takagi 684a3d2229 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-21 16:50:45 +11:00
Shiho Takagi 3d738e1b7c Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-21 16:50:21 +11:00
Shiho Takagi a5daa156ab Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-21 16:48:59 +11:00
Shiho Takagi 018b2b4711 elasticsearch to be turned off as a default in dev and test 2015-01-21 16:47:22 +11:00
Shiho Takagi d12ec968c4 elasticsearch to be turned off as a default in dev and test 2015-01-21 16:44:59 +11:00
Miles Gould 531a0bd9ea Roll our own heroku maintenance:(on|off) script 
This allows us to use maintenance mode without installing the full
Heroku toolbelt, which we can't do on the (much faster!) container-based
infrastructure.

We add a (temporary) deployment to my sandbox from the travis_containers
branch: muckingabout with one branch for both container-based and
VM-based approaches was starting to get confusing.
 2015-01-21 00:36:47 +00:00
Rocky Jaiswal 7950c577e9 Add quiet_assets to reduce noise in dev environment. 2015-01-20 19:45:29 +01:00
Rocky Jaiswal 3bc77f9b09 Merge branch 'dev' of github.com:Growstuff/growstuff into issues/625_add_context_for_logged_out_users 2015-01-20 19:15:23 +01:00
Rocky Jaiswal 05260c05c2 incorporating feedback comments for showing message for logged out users. 2015-01-20 19:14:50 +01:00
Rocky Jaiswal d0ea54237e increase font-weight for urls in alerts. 2015-01-20 19:14:04 +01:00
Robert Landreaux f404d54d02 update crop_wrangling_button_spec.rb 2015-01-20 12:08:58 -05:00
Miles Gould 5a2d9eabf4 Turn on Bundler caching on Travis 2015-01-20 09:16:00 +00:00
Miles Gould 1b936100e7 Trying out container-based Travis. 2015-01-20 08:47:06 +00:00
Miles Gould 34ea6eb37f Turning on maintenance mode for deploys, attempt 3 2015-01-20 08:20:44 +00:00
Miles Gould 2c006ec430 Remove stray "app: tranquil-basin" 2015-01-20 08:17:41 +00:00
Shiho Takagi f541261e43 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-20 13:20:56 +11:00
Shiho Takagi f910fdfa73 use elasticsearch for auto-suggest 2015-01-20 13:20:13 +11:00
Miles Gould 72f86c4ad0 Don't auto-deploy to production. 
We need this to be stable and tested on staging (including environment
variables and maintenance mode) before we turn it on for production.
 2015-01-19 23:59:27 +00:00
pozorvlak 0cb192ce36 Merge pull request #647 from Skud/followability 
Tidied up authorization around follows
 2015-01-19 23:46:55 +00:00
Miles Gould 3aadc5d68f Deploy to different apps based on branch 2015-01-19 23:05:15 +00:00