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

349 commits

Author SHA1 Message Date
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
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
Raphael Sofaer
cfbc2b7546 Revert "Merge pull request #2375 from michaelklishin/patch-1" 
This reverts commit e109d22ce5, reversing
changes made to 4f993b3d24.
 2011-11-10 13:14:45 -05:00
Michael Klishin
7f6f8f651c Do not install ruby-debug on travis-ci.org, it only wastes time 
We are trying to make Ruby project maintainers aware of how long it takes to compile linecache
every time. See https://twitter.com/#!/travisci/status/134609246036836352.
 2011-11-10 20:40:46 +04: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
Maxwell Salzberg
8029cb0784 SM MS basic api wip. able to get a users public profile 2011-10-15 18:57:13 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -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
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
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
buddhamagnet
acb98ddc51 cleaned up Gemfile 2011-09-13 11:56:31 +01:00
Jonne Hass
28b6e276f8 added possibility to install all database gems 
…via DB=all bundle install, useful for development
 2011-09-11 13:07:52 +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
Maxwell Salzberg
7ff11188b6 update gemfile 2011-09-05 13:28:08 -07:00
Sarah Mei
5e7ec82fe4 Moving jasmine into the test group only breaks the jasmine rake tasks, so move it back to both test & development. 2011-09-04 10:04:28 -07:00
Jonne Hass
835c4447f6 I just want to see if this works :P 
- Removed launchy since I couldn't find any use of it
- Ruby 1.9 seems to need em-synchrony explictly
- No need to recreate the Gemfile.lock on Travis if proper :platforms
options are used in the Gemfile
- Removed group :development, :test and moved the stuff in the
corresponding sections
- Install adapter Gems according to the env var DB, install al if it is
unset
- Merged database.yml.postgres into database.yml.example. Bonus point:
easier switching between mysql and postgres
- May break everything but lets see what CI says
 2011-09-04 14:53:28 +02:00
Sarah Mei
689fd7ec94 Include both mysql and pg in the Gemfile tp reduce travis startup time. 2011-09-03 22:48:56 -07:00
danielgrippi
1198670383 Added Foreman gem. Run Diaspora using foreman start (will start everything except mySQL. Passing in a -p flag will let you specifiy the port. Also: I took single_process_mode out of app config and made it an environment variable. If you want to boot a lightweight server, run SINGLE_PROCESS=true rails s. 2011-08-29 14:38:07 -07:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown 
Conflicts:
	Gemfile.lock
 2011-08-27 14:13:15 -07:00
Maxwell Salzberg
1df4e76f36 updating gemfile again 2011-08-23 17:43:35 -07:00
Maxwell Salzberg
89bd4f8da5 updating gemfile and gemfile.lock 2011-08-23 17:28:05 -07:00
Raphael Sofaer
89edfb7ed6 WIP prefilling username on logout of user is almost there 2011-08-23 16:37:50 -07:00
danielgrippi
27049e52b5 connect logic 2011-08-23 16:37:50 -07:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Raphael Sofaer
60e9fd54e2 Fix a problem with re-saving deleted objects in a spec in postgres, add postgres to test group in gemfile 2011-08-18 16:05:14 -07:00
Maxwell Salzberg
419707412a update jasmine to destroy deprication warnings in the tests 2011-08-17 20:57:11 -07:00
danielgrippi
4d4d11b90b upgrade selenium-webdriver to 2.4 for FF6 support 2011-08-17 12:49:07 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Raphael Sofaer
685165d133 Lock fixture_builder at 0.2.2 2011-08-10 10:12:14 -07:00
danielgrippi
aac72b12e7 added hoptoad support, API key read from application.yml 2011-08-09 10:46:15 -07:00
Maxwell Salzberg
f0075db694 mac osx only dependenacy is freaking out production gems 2011-07-31 21:46:38 -07:00
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07:00
Raphael Sofaer
55009a8381 Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch. 2011-07-13 10:59:41 -07:00
MrZYX
2a15a17983 rails-i18n is now a gem 2011-07-12 15:04:48 +02:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
Raphael Sofaer
3baf433b3a More travis stuff 2011-07-02 00:50:11 -07:00
Raphael Sofaer
63902fd273 Lock oauth2-provider 2011-06-29 17:30:12 -07:00
Raphael Sofaer
3887144db6 I seriously think that this commit is going to fix CI. SRSLY. 2011-06-29 15:34:45 -07:00
Raphael Sofaer
d6321d2327 Bundle in the oauth features, take the source out of the chubbies Gemfile 2011-06-29 11:21:23 -07:00
Raphael Sofaer
4683047ee0 point diaspora client to the right place in the gemfiles 2011-06-28 17:36:01 -07:00
Raphael Sofaer
3078220bc0 Point diaspora-client to git 2011-06-28 17:25:02 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Michael Sofaer
ef7580a698 Notifications page works with Vanna 2011-06-27 19:51:35 -07:00
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
danielgrippi
0b5de2aa7a WIP getting rid of app_url in params 2011-06-24 11:22:44 -07:00
danielgrippi
bd84eaaf75 added cucumber test for re-registering a pod from a client 2011-06-23 18:57:39 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
danielgrippi
890dc7efd5 put some dependent destroys on models for better sqlite compatability 2011-06-19 23:39:57 +02: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
Ilya Zhitomirskiy
9366b7243a configured the testmode 2011-06-15 16:04:38 -07:00
Ilya Zhitomirskiy
844bf48851 changed back to the git repo for client 2011-06-14 18:35:36 -07:00
Ilya Zhitomirskiy
dca2eca67c cucumber specs are green 2011-06-14 15:36:05 -07: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
Ilya Zhitomirskiy
f31a78f23f updated the Gemfile to point to repo instead of path 2011-06-09 17:42:33 -07:00
Raphael Sofaer
775dbda2b2 Chubbies now uses diaspora-client 2011-06-09 12:40:30 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -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
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