Maxwell Salzberg
|
5a0f948a85
|
better file requires in production.rb
|
2012-01-05 00:02:59 -08:00 |
|
Maxwell Salzberg
|
d9c2b0d4b5
|
make cdn jquery http/s agnostic
|
2012-01-04 23:57:28 -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 |
|
Maxwell Salzberg
|
7cc6e3ed68
|
uncomment cdn line.. whoops
|
2012-01-04 22:19:37 -08:00 |
|
Maxwell Salzberg
|
2f6d41ce47
|
use mongrel webserver for now in procfile for los
|
2012-01-04 22:09:09 -08:00 |
|
Maxwell Salzberg
|
790c2e84ea
|
MS DC; put pg explictly in heroku group for now
|
2012-01-04 16:14:52 -08:00 |
|
Daniel Grippi
|
643209112b
|
Merge pull request #2526 from Pistos/postgresql-drop-table
Fix from-scratch migration on PostgreSQL with a non-root DB user
|
2012-01-04 16:14:34 -08:00 |
|
Maxwell Salzberg
|
3830808651
|
move heroku to development group
|
2012-01-04 15:58:31 -08:00 |
|
Maxwell Salzberg
|
840058298d
|
DC MS; make heroku gem its own group. if your user does not have a home directory, you will need to bundle --without heroku in production
|
2012-01-04 15:05:49 -08:00 |
|
Maxwell Salzberg
|
cf2c12d98b
|
converting to string makes this not an htmlsafe buffer
|
2012-01-04 12:03:15 -08:00 |
|
Jonne Haß
|
6859f97145
|
comment out websocket in script/server
|
2012-01-04 16:58:01 +01:00 |
|
Jonne Haß
|
4a260056c0
|
lets see if this fixes #1337
|
2012-01-04 15:33:41 +01:00 |
|
Jonne Haß
|
52c75a7ad4
|
Revert "Revert "auto follow back feature""
This reverts commit 6408105917.
Conflicts:
db/schema.rb
|
2012-01-04 13:49:56 +01:00 |
|
Jonne Haß
|
296730de04
|
updated 12 locale files [ci skip]
|
2012-01-04 13:17:36 +01:00 |
|
Maxwell Salzberg
|
d0184ff6f3
|
gimme backtraces, travis
|
2012-01-04 00:25:42 -08:00 |
|
Maxwell Salzberg
|
71b58fa6fc
|
only queue process_photo jobs if the owner is local. this should cut down on some resque errors
|
2012-01-04 00:08:29 -08:00 |
|
Maxwell Salzberg
|
8b4cb744e6
|
fix for the messagebusmailer to be happy
|
2012-01-03 23:31:24 -08:00 |
|
Maxwell Salzberg
|
e9465e7001
|
move websocket to make rails happy
|
2012-01-03 22:47:44 -08:00 |
|
Maxwell Salzberg
|
34e4c027d0
|
small typo
|
2012-01-03 22:47:10 -08:00 |
|
Maxwell Salzberg
|
9de84cbba2
|
only notify hoptoad if it is configured
|
2012-01-03 20:03:51 -08:00 |
|
Maxwell Salzberg
|
8a48c5c720
|
remove extra logging we dont use
|
2012-01-03 20:03:29 -08:00 |
|
Maxwell Salzberg
|
4e574c3fef
|
fixed loading jquery from the CDN, and the fallback to the local copy still works
|
2012-01-03 20:02:52 -08:00 |
|
Maxwell Salzberg
|
d661bfb629
|
Merge branch 'remove_websocket'
|
2012-01-03 18:45:27 -08:00 |
|
Maxwell Salzberg
|
63cdd93afc
|
the websocket has been completely removed, and replaced for a stub until
we find a better way to reimpliment it in a more sane way
|
2012-01-03 18:39:54 -08:00 |
|
Maxwell Salzberg
|
9b05e80e3f
|
fix oembed caches so data must be present
|
2012-01-03 18:00:16 -08:00 |
|
Maxwell Salzberg
|
30b180949d
|
Merge branch 'clean_heroku'
|
2012-01-03 16:19:03 -08:00 |
|
Maxwell Salzberg
|
43090d38eb
|
AppConfig in heroku can now read array variables
|
2012-01-03 16:18:51 -08:00 |
|
Maxwell Salzberg
|
a7d59ce115
|
add EnviromentConfiguration to keep track of heroku specfic enviroment hacks
|
2012-01-03 16:01:21 -08:00 |
|
Jonne Hass
|
7841d02edd
|
Merge pull request #2580 from robhogg/2565_nsfw_regex
"#nsfw tag filter appears to be case-sensitive"
|
2012-01-02 14:26:16 -08:00 |
|
robhogg
|
6571ec2fa9
|
Added test for nsfw?
|
2012-01-02 21:24:44 +00:00 |
|
robhogg
|
b792a6d3e0
|
Fixed typo
|
2012-01-02 21:24:44 +00:00 |
|
robhogg
|
8fbe180446
|
Modified nsfw? to use case-insensitive regex match.
|
2012-01-02 21:24:44 +00:00 |
|
Jonne Haß
|
1e8e0b55fd
|
paranthesis ftw, sorry for the noise
|
2012-01-02 21:17:11 +01: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ß
|
67b2af0da6
|
check if ca_file is commented out completly
|
2012-01-02 21:07:46 +01:00 |
|
Jonne Haß
|
934175c49c
|
updated 15 locale files [ci skip]
|
2012-01-01 12:55:03 +01:00 |
|
danielgrippi
|
176a33880f
|
fix all specs minus one from o_embed_data_spec
|
2011-12-31 14:19:54 -05:00 |
|
Daniel Grippi
|
ab8fb88e74
|
Merge pull request #2524 from memarko/patch-2
Update lib/stream/followed_tag.rb
|
2011-12-31 10:51:51 -08:00 |
|
danielgrippi
|
018d516b48
|
rescue pubsubhubbub error if your pod is offline (resolves issue when posting public posts in dev mode with no internet connectivity)
|
2011-12-31 13:47:53 -05:00 |
|
Maxwell Salzberg
|
5bbfebdba9
|
the invite emailer is not multipart...sigh
|
2011-12-30 20:54:00 -08:00 |
|
danielgrippi
|
6ab03d33b4
|
hotfix for an error that would cause a 500. (this is a temp fix for fixing the photo cache counter on deletions)
|
2011-12-30 23:51:13 -05:00 |
|
Daniel Grippi
|
27f580f241
|
Merge pull request #2560 from memarko/patch-3
Update spec/controllers/tag_followings_controller_spec.rb
|
2011-12-30 18:21:51 -08:00 |
|
Jonne Haß
|
2268a992f7
|
make serve_static_assets setting configurable
|
2011-12-29 16:39:17 +01:00 |
|
Jonne Haß
|
4bfd03d6eb
|
remove completly unused redis.yml
|
2011-12-29 15:53:27 +01:00 |
|
Jonne Haß
|
f774ceae1b
|
do not handle redis stuff in script/server, let the user do it
|
2011-12-29 15:45:28 +01:00 |
|
Sarah Mei
|
6236fd22a0
|
Found 3 spec files that were never getting run because they didn't have the _spec at the end of the filename. This commit renames them, so that they are now included in rake spec. Unsurprisingly, they all fail. Since they represent actual changing code that isn't tested, I'm checking them in anyway. Thx Pistos for pointer to the first file, which prompted me to look for others.
|
2011-12-27 14:48:39 -08:00 |
|
Jonne Haß
|
109c5b7a17
|
this should fix #2552
|
2011-12-26 23:21:04 +01:00 |
|
memarko
|
399bdb885e
|
Update spec/controllers/tag_followings_controller_spec.rb
|
2011-12-26 21:51:02 +01:00 |
|