Justin Thomas
22ac1d96a6
Add Resque.after_fork to correct problem with database connections and remove resque-ensure-connected
2012-03-25 14:39:42 -07:00
Maxwell Salzberg
835f808e5a
more progress
2012-03-21 13:50:24 -07:00
Maxwell Salzberg
35a6f4f265
basic 3.1 upgrade... a few things are still broken. help me out and run the tests and fix them <3
2012-03-21 13:50:24 -07:00
Maxwell Salzberg
7bac633987
invite_link functionailty mostly works
2012-03-16 17:56:35 -07:00
Florian Staudacher
f1a0055a80
bump ruby-oembed version
2012-03-15 18:22:34 +01:00
Maxwell Salzberg
70cc9c5c96
travis does not seem to have bundler 1.1.1 yet
2012-03-14 18:02:45 -07:00
Maxwell Salzberg
ff03a0ca7f
update bundler; again
2012-03-14 18:00:18 -07:00
Maxwell Salzberg
52a79d71b4
update em-sync so travis is happy
2012-03-14 17:09:13 -07:00
Maxwell Salzberg
319812fdcb
downgrade bundler :(
2012-03-13 19:34:52 -07:00
Steven Hancock
f2922c943c
Cross-Origin Resource Sharing
...
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.
CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.
closes #2216
2012-03-10 23:49:56 -08:00
Maxwell Salzberg
5a34ef8592
update travis.yml for bundler 1.1
2012-03-09 18:33:47 -08:00
Maxwell Salzberg
ed62910286
this is dumb, but use RC bundler so travis does not barf
2012-03-09 18:19:16 -08:00
Maxwell Salzberg
332aede418
roll back heroku san
2012-03-09 18:03:40 -08:00
Maxwell Salzberg
123841147b
update some gems, including bundler :)
2012-03-09 17:43:09 -08:00
danielgrippi
39d31d5888
Merge branch 'master' of github.com:diaspora/diaspora into profiles
2012-02-24 14:36:18 -08:00
Jonne Haß
0430d940f1
git urls are still better than http ones :P, close #2915
2012-02-22 12:29:15 +01:00
danielgrippi
ff875a5b3c
DG MS; determine what template to use on the client from the server
2012-02-21 15:23:27 -08:00
Dennis Collinson
3991903b56
MS DG DC Participate stream that has things bubble to the top
2012-02-03 17:23:57 -08:00
danielgrippi
c301f80ca9
update unicorn [ci skip]
2012-02-03 15:12:44 -08:00
Maxwell Salzberg
48941fbae1
DG MS; add rack-rewrite to handle forwarding old urls [ci skip]
2012-01-26 16:32:46 -08:00
danielgrippi
da9e57b2c9
added oink in dev mode
2012-01-26 13:18:58 -08:00
Maxwell Salzberg
821c164809
update resque-ensure-connected
2012-01-24 16:48:28 -08:00
Maxwell Salzberg
e0186138f2
add rpm_contrib for instrumenting resque jobs
2012-01-24 14:58:36 -08:00
Maxwell Salzberg
ba010833c7
move newrelic and airbrake out of any group, as it is not loading at all
...
if it is in any bundler group #confused
2012-01-24 14:58:36 -08:00
danielgrippi
52438ffaf2
add unicorn back in. only use one worker process for now. also, move chrome_frame middleware into the correct load path in lib. [ci skip]
2012-01-24 14:56:55 -08:00
Maxwell Salzberg
41e6377ba5
move airbrake and newrelic to reporting bundler group
2012-01-24 11:55:59 -08:00
Maxwell Salzberg
c073cb078f
update messagebus gem
2012-01-23 16:29:19 -08:00
Jonne Haß
12575bd7f0
update http_accept_language and try to find the preferred locale first, should fix #2715
2012-01-23 14:59:09 +01:00
Daniel Grippi
2c50de0726
Merge pull request #2714 from stwf/im-sorry-bye-vanna
...
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
2012-01-22 22:15:14 -08:00
Steven Fuchs
e882dedd33
remove vanna controller from app, adjust scripts, specs, views and controllers to work.
2012-01-22 17:39:35 -05:00
Jonne Haß
ebfc3de878
do not require newrelic or airbrake unless they are configured
2012-01-22 15:38:55 +01:00
Jonne Haß
7fd606ba19
Merge branch '2688-airbreak' of https://github.com/fred/diaspora
...
Conflicts:
config/application.yml.example
2012-01-22 15:05:37 +01:00
danielgrippi
8ae9fdfd81
require => false for cucumber-rails in Gemfile to supress that cuke warning
2012-01-18 21:45:06 -08:00
Maxwell Salzberg
18e895c247
include Rack::SSL to upgrade all requests to ssl
2012-01-18 15:09:08 -08:00
danielgrippi
ff615848ca
added active_reload to development gem group. HOLY CRAP. [ci skip]
2012-01-18 13:35:17 -08:00
Frederico Araujo
f4801651eb
Issue #2688 Remove hoptoad_notifier and use airbreak
2012-01-18 23:07:00 +07:00
Maxwell Salzberg
467f3b0bda
MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks
2012-01-16 20:25:56 -08:00
Maxwell Salzberg
efb05be072
MS TT; update Procfile to be aware of jd.com queue ordering; upgrade foreman
2012-01-16 13:42:02 -08:00
danielgrippi
231b650086
update gems [ci skip]
2012-01-15 19:55:27 -08:00
danielgrippi
f2cc8b4e41
Revert "move unicorn into the heroku group till we decide if we switch completly to it or not"
...
This reverts commit 641cedf343#2663 from torrancew/with_unicorn"
This reverts commit 2a2efd097f78978f051e
2012-01-15 16:07:00 -08:00
Jonne Haß
641cedf343
move unicorn into the heroku group till we decide if we switch completly to it or not
2012-01-15 22:46:06 +01:00
Tray Torrance
cd4c880f95
Add unicorn to bundle, supply a basic unicorn config.
2012-01-14 12:25:51 -08:00
Maxwell Salzberg
9ecc3005c4
we do not need the mysql gem for heroku after all....
2012-01-14 11:20:18 -08:00
Maxwell Salzberg
1251f7433c
read settings logic from readonly git to make old centos git happier[ci skip]
2012-01-13 23:35:07 -08:00
Maxwell Salzberg
fedd864082
update heroku bundle to always include mysql
2012-01-13 15:16:59 -08:00
Maxwell Salzberg
c45057bd94
update settings logic, and heroku rake task
2012-01-13 13:59:34 -08:00
danielgrippi
ad78e79ddd
updated some gems
2012-01-11 02:40:51 -08:00
danielgrippi
953eb1db95
we can now use an up-to-date json gem now that chef is gone [ci skip]
2012-01-11 02:31:21 -08:00
Tray Torrance
4df6b65dad
Remove chef
2012-01-10 21:56:24 -08:00
danielgrippi
0e5bb81d66
remove all references to the websocket. bang bang.
2012-01-10 12:28:19 -08:00
