mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-04 06:12:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 63 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Miles Gould
1387f381d2 Run migrations and scripts on successful build. 2015-01-19 21:52:38 +00:00
pozorvlak
7257f2e557 Merge pull request #655 from cesy/issue640mincontainer 
Issue #640 mincontainer
 2015-01-19 21:29:46 +00:00
Miles Gould
025bfdb4b0 Test deployment with Travis. 2015-01-19 21:22:07 +00:00
Robert Landreaux
1a50566328 modify test, still needs work 2015-01-19 11:14:36 -05:00
Marlena Compton
6d8817d1fe fixing tests but some of them are green and render is working 2015-01-19 07:34:15 -08:00
Cesy Avon
ae914daa0c Whitespace and commenting 2015-01-19 13:56:06 +00:00
Cesy Avon
b984475335 Changing percentage so it doesn't get too tall 2015-01-19 13:54:13 +00:00
Cesy Avon
59f5101858 Issue 640 corrected code 2015-01-19 13:50:32 +00:00
Cesy Avon
e7d3e4d6dd Issue 640 container min-height setting up id 2015-01-19 13:25:16 +00:00
Shiho Takagi
79e1835216 use elasticsearch for auto-suggest 2015-01-19 15:45:59 +11:00
Robert Landreaux
e4072fb395 write 'crop_wrangling_button_spec.rb', fix previous issue 2015-01-18 23:25:38 -05:00
Shiho Takagi
666d6dac48 adding elasticsearch service to Travis 2015-01-19 15:24:11 +11:00
Skud
ea5b340933 Merge pull request #654 from Growstuff/dev 
Hotfix: fix CSS for homepage and browse crops
 2015-01-19 10:25:48 +11:00
Rocky Jaiswal
534c299383 Show friendly message to unregistered users who view posts. 
https://github.com/Growstuff/growstuff/issues/625
 2015-01-18 20:28:00 +01:00
Shiho Takagi
99eb33ccbb clearning up the code 2015-01-18 12:23:54 +11:00
Robert Landreaux
760e5ca74e remove failing line and add '- if can? :wrangle, Crop' 2015-01-17 12:21:01 -05:00
Shiho Takagi
cd57c9cd34 updated test so elasticsearch index is deleted before every test 2015-01-18 00:24:51 +11:00
Shiho Takagi
2a184bcb2e updated test spec for improved elasticsearch syncing method 2015-01-18 00:20:50 +11:00
Taylor Griffin
df63819602 Merge pull request #652 from Skud/cropcss 
Fixed CSS errors with text wrapping
 2015-01-17 23:15:31 +11:00
Skud
628d5b24c1 Fixed CSS errors with text wrapping 2015-01-17 21:27:08 +11:00
Shiho Takagi
8221d5b441 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-17 19:16:04 +11:00
Shiho Takagi
ad7cfdabd0 cleaning up the code 2015-01-17 19:11:07 +11:00
Shiho Takagi
4237dfb269 cleaning up the code 2015-01-17 18:28:45 +11:00
Robert Landreaux
c512b079fa add wrangle crop button to browse crops page 2015-01-17 00:20:11 -05:00
Shiho Takagi
b4cd151a03 merge from upstream 2015-01-17 14:09:45 +11:00