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 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Raphael
|
70a22ae839
|
Merge branch 'master' into HEAD
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
|
2010-09-24 09:15:10 -07:00 |
|
Michael Fellinger
|
ba058a39a8
|
Replace require_relative with compatible version
|
2010-09-16 14:50:30 +09:00 |
|
Michael Fellinger
|
c6f5b4ed16
|
Basic 1.9.2 port
|
2010-09-16 14:41:33 +09: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 |
|
maxwell
|
4f63f60b03
|
MS merging, and added a dumb check for the email validating twice
|
2010-08-24 14:03:57 -07:00 |
|
Raphael
|
ed99532a83
|
memory leak gone for real
|
2010-08-23 16:52:19 -07:00 |
|
Raphael
|
188f555c72
|
Actionmailer actually working
|
2010-08-17 15:47:41 -07:00 |
|
maxwell
|
a02a833625
|
updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too
|
2010-07-10 00:32:58 -07:00 |
|
maxwell
|
cf80aa4010
|
merging master in.... now I am going to go back to 187
|
2010-06-22 10:32:13 -07:00 |
|
maxwell
|
531ab3ab83
|
turned off mutex in dev
|
2010-06-22 10:19:36 -07:00 |
|
maxwell
|
51279cd519
|
turned on mutex in dev. totally my bad
|
2010-06-22 10:12:13 -07:00 |
|
maxwell
|
5637fa4e4c
|
update em-http-request, removed the mutex because we are thin. also removed some uneeded config for database cleaner in the test setup env
|
2010-06-19 15:48:50 -07:00 |
|
maxwell
|
1fcd758bd4
|
removed the mutex, added rack fiber pool. this thing screams
|
2010-06-19 15:07:12 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|