nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10622 commits 4 branches 0 tags 121 MiB
Commit graph

2268 commits

Author SHA1 Message Date
Maxwell Salzberg
3be247f8ca remove unicorn intializer as we now do it in config.ru 2012-01-27 13:16:34 -08:00
danielgrippi
95b7e30e00 preload_app in unicorn 2012-01-27 11:42:51 -08:00
danielgrippi
5a78796ec0 Merge branch 'input-placeholders' of https://github.com/Raven24/diaspora into Raven24-input-placeholders 2012-01-26 19:52:27 -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
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
Jonne Haß
4797e8f2f8 updated 35 locale files [ci skip] 2012-01-24 13:29:17 +01:00
David Morley
cec98ba454 Update config/assets.yml 2012-01-23 20:18:41 -08:00
Dan Hansen
51332931ee almost done 2012-01-23 19:31:01 -08:00
Dan Hansen
168d6cbdbe jquery.mentionsInput wip, almost done 2012-01-23 19:31:00 -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
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
danielgrippi
5d15c53f6b Revert "Revert "now using handlebars for client side templates" for now" 
This reverts commit 5f9c469b12.
 2012-01-22 22:01:57 -08:00
Sarah Mei
5bd929b697 Remove references to GetSatisfaction 2012-01-22 20:46:13 -08:00
Dennis Collinson
5f9c469b12 Revert "now using handlebars for client side templates" for now 
This reverts commit 4692055d8a.
 2012-01-22 17:16:22 -08:00
Dennis Collinson
4692055d8a now using handlebars for client side templates 2012-01-22 16:59:44 -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
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
Florian Staudacher
363ca8c07e Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders 2012-01-22 14:42:45 +01:00
Jonne Haß
c8e09bf325 localize back to top [ci skip] 2012-01-22 13:54:31 +01:00
David Morley
1221218e70 Update config/assets.yml 2012-01-21 07:50:06 -08:00
danielgrippi
25d0f0d87f updated jquery autoResize; comment boxes now expand 2012-01-20 21:45:55 -08:00
Maxwell Salzberg
912211dc0b make omniauth look at where our ca_file is 2012-01-20 17:21:18 -08:00
Maxwell Salzberg
e461956a97 allow custom app_name prefixes for newrelic 2012-01-20 12:25:05 -08:00
Jonne Haß
abd8fb104c updated 6 locale files [ci skip] 2012-01-20 13:43:43 +01:00
Maxwell Salzberg
493553f979 working on making heroku_san magical 2012-01-19 19:21:10 -08:00
Jonne Haß
ce0507f9eb move config/ci to script/ci, update rubygems before bundle install 2012-01-19 13:57:47 +01:00
Jonne Haß
a4b9ae4f8a ensure known rubygems on travis 2012-01-19 13:36:51 +01:00
Florian Staudacher
ad5a17776f Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders 2012-01-19 13:29:35 +01: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
David Morley
d6fffa1309 Update config/application.yml.example 2012-01-18 18:42:35 -08:00
Maxwell Salzberg
7cafac8c05 I should really start using autosave-on-lose-focus in vimi [ci skip] 2012-01-18 18:03:15 -08:00
Maxwell Salzberg
fe03d7875d update some docs on how circumvent_ssl_requirement works [ci skip]" 2012-01-18 18:01:38 -08: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
Maxwell Salzberg
08adcf3e3e blarg. ActionDispatch::Static isnt always there. took out the option so people can run their ssl pods correctly for now 2012-01-18 17:27:23 -08:00
Maxwell Salzberg
1b3cdbb78a Revert "add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info" 
This reverts commit ed45789403.
 2012-01-18 16:52:13 -08:00
Maxwell Salzberg
ed45789403 add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info 2012-01-18 15:50:22 -08:00
Maxwell Salzberg
18e895c247 include Rack::SSL to upgrade all requests to ssl 2012-01-18 15:09:08 -08:00
Frederico Araujo
f4801651eb Issue #2688 Remove hoptoad_notifier and use airbreak 2012-01-18 23:07:00 +07:00