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

384 commits

Author SHA1 Message Date
danielgrippi
c301f80ca9 update unicorn [ci skip] 2012-02-03 15:12:44 -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
821c164809 update resque-ensure-connected 2012-01-24 16:48:28 -08:00
Maxwell Salzberg
e0186138f2 add rpm_contrib for instrumenting resque jobs 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
Maxwell Salzberg
c073cb078f update messagebus gem 2012-01-23 16:29:19 -08:00
Jonne Haß
12575bd7f0 update http_accept_language and try to find the preferred locale first, should fix #2715 2012-01-23 14:59:09 +01: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
Steven Fuchs
e882dedd33 remove vanna controller from app, adjust scripts, specs, views and controllers to work. 2012-01-22 17:39:35 -05: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
Maxwell Salzberg
49f18d435a upgrade factory girl there are 3 failing cukes. 2012-01-21 21:58:50 -08:00
Dennis Collinson
4b960a0061 update factory girl, hopefull fix ci issues 2012-01-19 01:25:01 -08:00
Maxwell Salzberg
18e895c247 include Rack::SSL to upgrade all requests to ssl 2012-01-18 15:09:08 -08:00
danielgrippi
ff615848ca added active_reload to development gem group. HOLY CRAP. [ci skip] 2012-01-18 13:35:17 -08:00
Frederico Araujo
f4801651eb Issue #2688 Remove hoptoad_notifier and use airbreak 2012-01-18 23:07:00 +07:00
Maxwell Salzberg
467f3b0bda MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks 2012-01-16 20:25:56 -08:00
Maxwell Salzberg
efb05be072 MS TT; update Procfile to be aware of jd.com queue ordering; upgrade foreman 2012-01-16 13:42:02 -08:00
danielgrippi
231b650086 update gems [ci skip] 2012-01-15 19:55:27 -08:00
danielgrippi
f2cc8b4e41 Revert "move unicorn into the heroku group till we decide if we switch completly to it or not" 
This reverts commit 641cedf343.

Revert "Merge pull request #2663 from torrancew/with_unicorn"

This reverts commit 2a2efd097f, reversing
changes made to 78978f051e.
 2012-01-15 16:07:00 -08:00
Tray Torrance
cd4c880f95 Add unicorn to bundle, supply a basic unicorn config. 2012-01-14 12:25:51 -08:00
Maxwell Salzberg
9ecc3005c4 we do not need the mysql gem for heroku after all.... 2012-01-14 11:20:18 -08:00
Maxwell Salzberg
1251f7433c read settings logic from readonly git to make old centos git happier[ci skip] 2012-01-13 23:35:07 -08:00
Maxwell Salzberg
fedd864082 update heroku bundle to always include mysql 2012-01-13 15:16:59 -08:00
Maxwell Salzberg
c45057bd94 update settings logic, and heroku rake task 2012-01-13 13:59:34 -08:00
danielgrippi
ad78e79ddd updated some gems 2012-01-11 02:40:51 -08:00
danielgrippi
953eb1db95 we can now use an up-to-date json gem now that chef is gone [ci skip] 2012-01-11 02:31:21 -08:00
Tray Torrance
4df6b65dad Remove chef 2012-01-10 21:56:24 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
danielgrippi
6ee257795f hella sod, yo [ci skip] 2012-01-10 10:57:13 -08:00
Maxwell Salzberg
d38e75c1f5 rollback foreman as it seemed to stop liking resque's ENV vars. [ci skip] 2012-01-07 22:55:43 -08:00
Dennis Collinson
9d24b518f5 DC DG; correctly populate the stream jasmine fixture 2012-01-07 14:23:28 -08:00
danielgrippi
91ba6447d0 add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip 2012-01-07 14:23:20 -08:00
danielgrippi
2dd0012d1e update some gems (selenium, rspec-core, heroku, cucumber, fog, fb, etc) 2012-01-06 22:33:55 -08:00
Maxwell Salzberg
db387b5ed4 MS DC; remove backup.rake as we now use backup' 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
fdea2f94ff remove icky analytics code from layouts, move to middleware 2012-01-04 23:54:48 -08:00
Maxwell Salzberg
790c2e84ea MS DC; put pg explictly in heroku group for now 2012-01-04 16:14:52 -08:00
Jonne Haß
296730de04 updated 12 locale files [ci skip] 2012-01-04 13:17:36 +01:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
danielgrippi
97b8045f20 added counter cache for photos on StatusMessage 2011-12-16 20:39:24 -08:00
danielgrippi
80a090c766 update twitter gem 2011-12-11 11:48:47 -08:00
Jonne Hass
afb5e5e7f0 fix json in aspects controller spec 2011-12-11 03:35:19 +01:00
Dan Hansen
4dcdf2899d bump will_paginate from 3.0.pre2 to 3.0.2 2011-12-10 14:07:43 -08:00
Jonne Hass
247863c6f7 update diaspora-client 2011-12-10 12:54:39 +01:00
Jonne Hass
4dd55ebdad fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly 2011-12-10 12:54:39 +01:00
danielgrippi
8666c6e209 update linecache, jasmine, selenium-webdriver 2011-12-09 18:36:45 -08:00
danielgrippi
02fb45e6fe update chef, ohai, fuubar, json 2011-12-09 18:15:52 -08:00
danielgrippi
89b3314d01 upgrade rspec-core, parallel, capistrano 2011-12-09 18:04:53 -08:00
danielgrippi
f4c9b548f9 update cucumber and capybara. one failing cuke. 2011-12-07 18:40:39 -08:00
danielgrippi
910b0e104c added fog back to the Gemfile 2011-12-07 10:49:00 -08:00
danielgrippi
d0f58e1bd4 Revert "upgrade devise; devise_invitable" 
This reverts commit 0f56ee7b77.
 2011-12-06 11:01:50 -08:00
danielgrippi
0f56ee7b77 upgrade devise; devise_invitable 2011-12-06 10:50:29 -08:00
Daniel Grippi
003a17d27a version bump mysql2 gem 2011-12-06 00:08:47 -08:00
Daniel Grippi
cea87f8cbf remove fog, aws, and excon gems; version bump carrierwave & nokogiri 2011-12-05 23:52:57 -08:00
Daniel Grippi
3dc247a4e6 version bump database_cleaner for better truncation 2011-12-05 23:19:30 -08:00
Daniel Grippi
bd0d4f9ca8 upgrade resque, sass, jammit, fixture_builder 2011-12-05 23:08:14 -08:00
Daniel Grippi
0d41c9c5f3 update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner) 2011-12-05 19:53:03 -08:00
Daniel Grippi
908d0b99a7 Merge pull request #2404 from torrancew/capistrano_colorized 
Capistrano colorized
 2011-11-28 09:11:10 -08:00
Jonne Hass
61d809659c updated 11 locale files [ci skip] 2011-11-22 20:30:58 +01:00
Jonne Hass
c7f19eb592 update to rails 3.0.11 2011-11-19 13:53:49 +01:00
Tray Torrance
bbc165137f Adds capistrano_colors gem; deprecates custom red method 
Also adjusts current_git_branch to use Capistrano's logger for printing to
STDOUT
 2011-11-15 01:41:41 -08:00
Jonne Hass
5d08bddb5b updated SystemTimer to 1.2.3 2011-11-10 21:49:09 +01:00
danielgrippi
77a6c7045b update newrelic_rpm 2011-11-08 15:39:36 -08:00
danielgrippi
0f19076b40 update selenium-driver to work in FF8 2011-11-07 16:48:28 -08:00
danielgrippi
6f7c9e9301 Remove resque_rescheduler as it was killing our app servers (receiving 
http requests).

Revert "retry less"

This reverts commit 7784156e3b.

Revert "supress resque retries"

This reverts commit 80cdcd4edd.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e502.

Conflicts:

	app/models/jobs/http_multi.rb
 2011-11-07 12:50:02 -08:00
Jonne Hass
c4a4516369 hm why do we update gems so rarely? Lets do it for em-websocket 2011-11-03 01:08:53 +01:00
Manuel Schölling
bcbc86e502 Retry federation if remote pod is down 2011-10-27 00:36:55 +02:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
Manuel Schölling
bdeae54c6c Make Photos not inherit from Posts 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
8029cb0784 SM MS basic api wip. able to get a users public profile 2011-10-15 18:57:13 -07:00
Jonne Hass
eb20f7e2f8 updated 84 locale files [ci skip] 2011-10-15 15:06:06 +02:00
Maxwell Salzberg
9fd1d7db63 updating gemfile and schema.rb 2011-10-11 16:53:37 -07:00
Ilya Zhitomirskiy
86e52b0799 remove statstample; made our own correlation function 2011-10-11 12:03:35 -07:00
danielgrippi
818167c565 DG IZ; wip 2011-10-11 10:57:26 -07:00
Maxwell Salzberg
75aa3f8f97 include people names in the from field 2011-10-05 17:12:31 -07:00
Maxwell Salzberg
d91ea4b9ce adding support for message bus email service 2011-10-05 12:06:19 -07:00
Maxwell Salzberg
85e51a6dd7 wip 2011-10-05 12:06:19 -07:00
Ilya Zhitomirskiy
8d12a57f37 reding from redis cache 2011-10-04 10:32:16 -07:00
danielgrippi
f25707a58e updated sass; removed kaminari gem 2011-10-02 12:35:12 -07:00
Maxwell Salzberg
5348c72209 add sqlite method; fix chubbies cukes 2011-09-30 14:27:54 -07:00
Maxwell Salzberg
5c96705069 fix typo, update webdriver 2011-09-29 14:48:47 -07:00
Jonne Hass
710f241b42 updated 21 locale files [ci skip] 2011-09-29 14:34:17 +02:00
Ilya Zhitomirskiy
1fe9de328b removing newrelic resque for now 2011-09-28 18:47:42 -07:00
Ilya Zhitomirskiy
95c8986b8e added new relic resque support 2011-09-28 17:53:29 -07:00
Jonne Hass
b706edf76f pull in parallel_testing to speed up rspec 
- Initally run rake parallel:create
- After each schema change run rake parallel:prepare
- To run rspec super fast run rake parallel:spec
- Todo fix upstreams summary logger
 2011-09-16 22:14:12 +02:00
Maxwell Salzberg
d3b6143a45 remove heroku gem' 2011-09-16 09:44:03 -07:00
Jonne Hass
7b06d3039e bump fixture builder since only 0.3.0 is available through rubygems.org 2011-09-16 18:37:24 +02:00
danielgrippi
a396ad811f remove debug line 2011-09-14 18:21:54 -07:00
danielgrippi
ba63c028e6 added heroku gem, slugignore, and heroku rake task to load application.yml vars as config vars 2011-09-14 18:05:40 -07:00
Loïc Guitaut
e25dd94d63 Fixes issue #1395 (utf8 and ruby 1.9.2) 2011-09-14 11:25:20 +02:00
Ilya Zhitomirskiy
6b9ad7c4c6 SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet 2011-09-13 20:20:49 -07:00
danielgrippi
810d8ab97a remove rcov from Gemfile (we never used it); this makes rbx happy. reverted back to using rbx on travis 2011-09-13 19:45:28 -07:00
Maxwell Salzberg
adaefd0cb5 MS DG rspec is green update gemfile 2011-09-13 13:34:49 -07:00
Jonne Hass
37787605aa updated 44 locale files [ci skip] 2011-09-12 00:00:58 +02:00
Ilya Zhitomirskiy
aeef0b5f6e changed the Gemfile to default to mysql 2011-09-09 12:04:31 -07:00
Maxwell Salzberg
cd7640a971 add resque timeout 2011-09-08 10:46:36 -07:00
Jonne Hass
292b1e7465 small cleanup 2011-09-06 20:13:56 +02:00