Commit graph

307 commits

Author SHA1 Message Date
danielgrippi
e19c84b5a3 remove the monkey patch that didn't work. 2012-03-21 13:58:20 -07:00
danielgrippi
03409495f9 better patch for ActiveSupport 2012-03-21 13:50:24 -07:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported
monkeypatch
2012-03-21 13:50:24 -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
Jonne Haß
3c23364fbc refactor locale initialization and selection a bit 2012-03-21 19:25:47 +01:00
Diaspora Europe
d626148a83 fix will paginate renderer 2012-03-16 18:58:01 +01:00
Daniel Grippi
39ee27acf0 Merge pull request #3003 from diasp/will-paginate-bootstrap
mobile: added will paginate for bootstrap
2012-03-15 12:09:29 -07:00
Florian Staudacher
7b4c377df1 make tests happy 2012-03-15 19:44:18 +01:00
Florian Staudacher
e6b403434f some restructuring around oembed providers 2012-03-15 18:34:47 +01:00
Diaspora Europe
fe65058624 use will paginate, added renderer for bootstrap 2012-03-15 16:44:25 +01:00
Diaspora Europe
3f26c0e3d7 mobile: added will paginate for bootstrap 2012-03-15 16:44:25 +01: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
54e8040bfd basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
Jonne Haß
e5fe6a2280 fix typo, sorry [ci skip] 2012-02-01 20:06:44 +01:00
Jonne Haß
de4c9a1289 add warning about common setup error manifesting in uninitialized constant Oink 2012-01-31 21:56:01 +01:00
danielgrippi
60ff88c1e7 Use Resque.inline instead of custom code [ci skip] 2012-01-28 19:23:03 -08:00
Maxwell Salzberg
3be247f8ca remove unicorn intializer as we now do it in config.ru 2012-01-27 13:16:34 -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
939383ef32 You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash 2012-01-25 11:22:45 -08:00
Maxwell Salzberg
53304df740 I can't test this at this momement. I will put it back in once i have a
chance to test it first Revert "finally found a way to disable airbrake [ci skip]"

This reverts commit 8aafd56482.
2012-01-24 15:42:39 -08:00
Maxwell Salzberg
335172c411 move unicorn killer to initializer so thin still works, also a fix for newrelic not sending data 2012-01-24 15:42:25 -08:00
Jonne Haß
8aafd56482 finally found a way to disable airbrake [ci skip] 2012-01-25 00:28:28 +01:00
Maxwell Salzberg
a1aae2c3dc add airbrake back to resque 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
Maxwell Salzberg
5b947db0d7 remove a couple of stray things I mistakenly -am -ed in. also, I am a jerk 2012-01-22 23:07:26 -08:00
Maxwell Salzberg
25a15259bc explicitly require airbrake middleware if it is configured.... i should not have to do this however 2012-01-22 11:06:18 -08:00
Jonne Haß
1d8dbdd8d8 the middleware stack is just an array and insert_before just an alias to insert, basically, guess what inset(0, something) does. AKA finally fix Rack:SSL 2012-01-22 19:20:35 +01:00
Jonne Haß
98bdf68003 do not rely on hoptoad to insert rack ssl 2012-01-22 18:42:06 +01: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
Maxwell Salzberg
912211dc0b make omniauth look at where our ca_file is 2012-01-20 17:21:18 -08:00
Maxwell Salzberg
1fe7793ec5 Place Rack:SSL before hoptoad 2012-01-19 00:56:06 -08:00
Frederico Araujo
5ce4f60736 Added Fallback to use old hoptoad_api_key if not application.yml is not update 2012-01-19 13:20:59 +07:00
Maxwell Salzberg
69e81a0dc3 move loading rack ssl to an initializer, so we have EnviromentConfiguration and AppConfig. also, circumvent ssl requirement option is now back" 2012-01-18 17:57:26 -08:00
Frederico Araujo
f4801651eb Issue #2688 Remove hoptoad_notifier and use airbreak 2012-01-18 23:07:00 +07:00
Jonne Haß
bec3e2c92b set faradays timeout 25 2012-01-15 02:49:14 +01:00
Maxwell Salzberg
cedc49bf09 MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
0199949f3c move analytics to initializer, thx MrZYX 2012-01-05 10:55:29 -08:00
Jonne Haß
4a260056c0 lets see if this fixes #1337 2012-01-04 15:33:41 +01:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Jonne Haß
a8136ed86b d'oh aka --amend 2012-01-02 21:11:47 +01:00
Jonne Haß
cc961d66e2 symbolize smtp_authentication setting to conform to rails docs 2012-01-02 21:08:57 +01:00
Jonne Haß
2268a992f7 make serve_static_assets setting configurable 2011-12-29 16:39:17 +01:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
Jonne Hass
0866ebb962 remove unused GIT_INFO [ci skip] 2011-12-21 23:19:22 +01:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
Jonne Hass
94aaa46a12 slight speed improvement by tweaking devise in the test env 2011-12-11 13:12:40 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00