Commit graph

53 commits

Author SHA1 Message Date
Jonne Haß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +02:00
danielgrippi
06936bcdce stylesheets are basically now being served from sprockets 2012-03-27 18:07:20 -07:00
Jonne Haß
3c23364fbc refactor locale initialization and selection a bit 2012-03-21 19:25:47 +01: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
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
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
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
Jonne Haß
c0e4fa831a fix syntax error in production.rb 2012-01-05 20:17:30 +01:00
Maxwell Salzberg
0199949f3c move analytics to initializer, thx MrZYX 2012-01-05 10:55:29 -08:00
Maxwell Salzberg
5a0f948a85 better file requires in production.rb 2012-01-05 00:02:59 -08:00
Maxwell Salzberg
fdea2f94ff remove icky analytics code from layouts, move to middleware 2012-01-04 23:54:48 -08:00
Maxwell Salzberg
9cdfea02b0 add the GC profiling option for newrelic for 1.9.2; see: http://newrelic.com/docs/ruby/ruby-gc-instrumentation 2012-01-04 22:28:18 -08:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Raphael Sofaer
8c6afbb912 Oops. 2011-03-22 10:21:31 -07:00
Raphael Sofaer
2b997e70c2 Refactor image processing to use 2 uploaders. Federation and s3 need testing 2011-03-21 16:40:53 -07:00
Raphael Sofaer
bb58544a70 Add logging for GC (slight slowdown, but worth it for the data) 2011-02-10 15:52:00 -08:00
Jamie Wilkinson
0906f38f6d Use HAML ugly mode in production 2010-11-27 14:32:57 -08:00
danielvincent
4976503c0f let nginx serve static assets. 2010-11-12 11:47:19 -08:00
zhitomirskiyi
0b2e00b7d6 MS IZ the mailer will not be setup unless turned on in the APP_CONFIG 2010-10-26 17:46:19 -07:00
ilya
487637d5a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:42:49 -07:00
ilya
f022c2d8bd correct smtp server 2010-10-07 16:42:39 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
ilya
720d1daa9e moved the mailer settings back into env 2010-10-07 15:40:18 -07:00
ilya
7aa49b277c moved the smtp setting to intializers 2010-10-07 14:36:08 -07:00
ilya
2a104ea622 Revert "moved the SMTP setting into app_config.yml"
This reverts commit 2451ac4957.
2010-10-07 14:26:59 -07:00
ilya
2451ac4957 moved the SMTP setting into app_config.yml 2010-10-07 14:20:31 -07:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Raphael
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
2010-09-15 22:37:05 -07:00
Jesse Kriss
969779a60d adding deprecation setting 2010-09-16 09:46:09 +08:00
Raphael
de93fd2818 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
188f555c72 Actionmailer actually working 2010-08-17 15:47:41 -07:00
Raphael
a74ea7e80f Back to config actionmailer, the settings are getting set, try mail.joindiaspora.com 2010-08-17 15:31:14 -07:00
Raphael
46e7dbedac Trying to get actionmailer working 2010-08-17 15:19:41 -07:00
Raphael
f84d7962fc actionmailer config 2010-08-17 14:06:00 -07:00
Raphael
cbb1b550ff Default url 2010-08-17 14:03:30 -07:00
Raphael
2ede5f499f Commas 2010-08-17 13:53:15 -07:00
Raphael
424f576d95 Actionmailer config 2010-08-17 13:48:09 -07:00
Raphael
453cb06691 changing settings and deploy scripts, validating email 2010-08-17 11:01:30 -07:00
ilya
8f70fb89c0 RS IZ Switching to production 2010-07-23 10:41:57 -07:00
maxwell
1610e72de9 fixed merge 2010-06-20 11:13:21 -07:00