Raphael Sofaer
04b0705733
Faraday follows redirects
2011-06-22 12:53:18 -07:00
Raphael Sofaer
728a547cb2
Undo some pg changes
2011-06-19 16:16:30 +02:00
Raphael Sofaer
7c454b7d15
Fix stream query for postgres, shouldn't break mysql
2011-06-19 16:16:30 +02:00
Raphael Sofaer
42d177eea4
Lock linecache to avoid require_relative thing
2011-06-14 09:51:19 -07:00
Raphael Sofaer
4815482354
Start some real docs
2011-06-13 16:12:32 -07:00
danielgrippi
918284a8f8
include newrelic if the newrelic config file is present. profiling ftw.
2011-06-02 12:10:03 -07:00
Maxwell Salzberg
5cbbdf2949
initial post to tumblr support
2011-06-01 22:30:22 -07:00
Sarah Mei
f732d20f0c
Remove vendored jasmine; use normal jasmine gem. thx @tubbo for the prompt.
2011-05-28 21:03:39 -07:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00
Sarah Mei
7a2ab42948
Locking to older version of rspec-core as new version has invalid specification
2011-05-22 17:51:53 -07:00
Maxwell Salzberg
15c4463c2a
gemfile wars
2011-05-20 14:54:04 -07:00
danielgrippi
16351227f7
use aspect dropdowns everywhere; updated rake to 0.9.0
2011-05-20 11:50:41 -07:00
danielgrippi
4875d6557d
update nokogiri, require false on sod
2011-05-16 22:30:25 -07:00
Raphael Sofaer
495dd89dd2
Fix password reset, add cucumber feature
2011-05-16 15:54:18 -07:00
danielgrippi
0e72a91d1b
update login page
2011-05-13 22:05:35 -07:00
Raphael Sofaer
70fd2e916a
Update rspec
2011-05-13 17:52:37 -07:00
Raphael Sofaer
a46ff394b1
update devise_invitable and devise
2011-05-13 16:32:07 -07:00
Raphael Sofaer
89ec768d06
Rev thin again, 1.2.10 segfaults
2011-05-03 14:44:33 -07:00
Raphael Sofaer
cb483beada
Rev Thin for a 'can't find Thin::HttpParser' bug
2011-05-02 15:58:57 -07:00
MrZYX
b1d0ef9695
push gherkin to 2.3.6 since 2.3.5 doesn't compile for me
2011-04-24 15:45:09 +02:00
MrZYX
46d2efd80a
update sod
2011-04-21 12:59:43 +02:00
zhitomirskiyi
c31b6f18fd
Merge branch 'master' of github.com:diaspora/diaspora
2011-04-20 14:03:58 -07:00
zhitomirskiyi
76c24c2848
added debian sod recipies
2011-04-20 14:02:52 -07:00
maxwell
2223c562c0
first fix of notification page
2011-04-18 15:10:47 -07:00
Raphael Sofaer
8ae90e71be
OHAI! Y U BREAK BUILD??
2011-04-15 15:13:19 -07:00
maxwell
86fe2db24e
update publish job to include .atom
2011-03-30 10:41:47 -07:00
maxwell
fa27fa2d29
make one translation absolute to attempt to fix 1.9 build
2011-03-30 10:39:40 -07:00
Raphael Sofaer
36a262a3ad
Revert "update selenium-webdriver to 0.1.4,fixes #829 "
...
This reverts commit eddd8d969f .
2011-03-27 16:32:40 -07:00
MrZYX
eddd8d969f
update selenium-webdriver to 0.1.4,fixes #829
2011-03-27 22:52:33 +02:00
Sarah Mei
a5f6b6512d
Upgrade cucumber version
2011-03-27 10:46:38 -07:00
Sarah Mei
bec34ec5e8
Perhaps the silent upgrade of selenium-webdriver freaked out CI. Let's see.
2011-03-22 16:53:06 -07:00
maxwell
155290fb51
updating Gemfile.lock
2011-03-11 15:41:28 -08:00
Raphael Sofaer
7ac3692a92
Fix specs, migrate to downcase tags, still testing migration
2011-03-11 14:23:03 -08:00
Raphael Sofaer
c1bcfef90c
TAGS ARE SO COOL
2011-03-10 18:37:45 -08:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
danielgrippi
ac738df8f5
added missing translation
2011-03-08 19:22:49 -08:00
Raphael Sofaer
e00a033e9e
Update rspec-instafail, test git headers
2011-03-06 10:18:37 -08:00
danielgrippi
5f55dfa1bc
private message inbox wip
2011-03-03 17:32:26 -08:00
MrZYX
ae0595bca8
fixed #903
2011-03-03 21:25:01 +01:00
Raphael Sofaer
1afc83f356
Revert "memprof"
...
This reverts commit 8ee81314d6 .
2011-03-02 13:34:29 -08:00
Raphael Sofaer
8ee81314d6
memprof
2011-03-02 11:47:13 -08:00
Sarah Mei
d183150fa9
Upgrade launchy.
2011-03-01 21:41:28 -08:00
Raphael Sofaer
68f0f7ec21
Add rcov task
2011-03-01 18:12:42 -08:00
Raphael Sofaer
d8956a7cd5
Add foreign key constraints
2011-02-28 15:18:35 -08:00
Sarah Mei
5e69f7d9a2
Upgrade arel, for some reason.
2011-02-26 16:02:10 -08:00
MrZYX
ee96dea398
update i18n-inflector to 2.5.1; correct Polski to polski; fixed locales; thanks siefca
2011-02-25 21:41:32 +01:00
maxwell
8f6922bcf9
multihttp job and spec
2011-02-23 16:06:54 -08:00
MrZYX
d32fe1ea08
updated Gemfile.lock
2011-02-24 00:34:18 +01:00
maxwell
eb9a943724
parinoid checks for admin page thx dangold
2011-02-22 15:43:10 -08:00
Sarah Mei
dcf7e57a1d
Use standard carrierwave gem instead of deleted git repo. This may break photo uploading, but better that than breaking bundle install.
2011-02-21 13:54:08 -08:00