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

982 commits

Author SHA1 Message Date
Raphael Sofaer
e8552fc417 Fix direct query execution issues in PG by using select_values/select_rows instead of execute. 2011-06-22 14:47:59 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
Jonne Hass
58ba4db3c8 Merge pull request #656 from cyberkov/1041-whitespace-tasks 
fixed whitespace task mentioned in bug 1041
 2011-06-22 04:17:04 -07:00
danielgrippi
74f9ffbbdf 8 failures left with sqlite3 adapter 2011-06-22 00:22:16 +02:00
Raphael Sofaer
2d3eeb9c46 Get another couple specs green on pg 2011-06-19 16:16:31 +02:00
Raphael Sofaer
ab398555d6 Back to green in mysql 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
cyberkov
94b152e733 fixed whitespace task mentioned in bug 1041 2011-06-15 13:48:40 +02:00
Raphael Sofaer
480d7c47cf Documentation is so rad. 2011-06-13 17:02:18 -07:00
Raphael Sofaer
7171aa05ed Do a little bit more documenting. 2011-06-13 16:31:40 -07:00
Ilya Zhitomirskiy
71dd8dc7f3 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/models/app_config.rb
 2011-06-09 15:51:59 -07:00
Raphael Sofaer
c78e903794 Change rebuild back to using migrate 2011-06-09 15:30:58 -07:00
Ilya Zhitomirskiy
b575983c22 WIP certs 2011-06-08 18:46:38 -07:00
danielgrippi
d7efee55a1 load schema instead of migrating on rake db:rebuild 2011-06-06 19:39:14 -07:00
danielgrippi
bd8ea324ae remove unused rake task 2011-06-06 19:37:51 -07:00
Raphael Sofaer
1aa1ddc829 Forgot the space in SplunkLogging 2011-06-04 23:44:12 -07:00
Raphael Sofaer
6d105e5c09 Don't n query in UsersController#public 2011-06-04 22:34:48 -07:00
Raphael Sofaer
5314e27e78 Clean up the SplunkLogging mixin to make searching in the splunk console a little easier 2011-06-04 18:37:20 -07:00
Raphael Sofaer
283e376712 Move initialize_signatures method out of user and into relayable 2011-06-01 16:45:30 -07:00
Raphael Sofaer
06217a0a1d Fix stream query 2011-06-01 14:19:27 -07:00
Raphael Sofaer
9aad7810c0 Move visible_posts defaults into a defaults hash, mostly 2011-06-01 12:24:07 -07:00
Raphael Sofaer
5455aedf1d Compress the database dump during backup 2011-06-01 10:56:12 -07:00
Raphael Sofaer
b3cbe0a3a5 Wrap integration rake in MissingSourceFile rescue to avoid failure when the test gems aren't present. 2011-06-01 10:25:19 -07:00
Raphael Sofaer
71c3a29aa6 Move YoutubeTitles callback into module 2011-05-31 12:27:57 -07:00
Sarah Mei
8de71d41e4 Don't need to export the selenium server port anymore on CI. Yay! 2011-05-28 22:22:06 -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
Raphael Sofaer
38289b1a47 Multi-server integration tests are now possible 2011-05-25 15:16:14 -07:00
MrZYX
0c5bdece5a warn and exit if there's no config at all 2011-05-25 23:39:54 +02:00
Sarah Mei
c6d61c68c0 Backfill some tests for app config, refactor base file name so people copy it instead of moving it 2011-05-25 11:07:29 -07:00
MrZYX
574deada03 get rid of nil values in app config, they destroy the merge 2011-05-24 23:54:31 +02:00
Raphael Sofaer
609439f948 Destroy notifications on contact destroy 2011-05-23 18:33:18 -07:00
Raphael Sofaer
e28ec16781 Gross, but hopefully temporary solution for namespaced classes and old versions of libxml 2011-05-23 16:24:28 -07:00
Raphael Sofaer
6b094b2f35 Take out begin rescue in diaspora parser, that's handled in the resque job wrapper 2011-05-23 15:40:03 -07:00
Raphael Sofaer
93be5497a7 Small controller for generating an auth token, if you are an authable user 2011-05-19 18:29:53 -07:00
Raphael Sofaer
7912c8af3b Be nicer about changing app_config.yml to app.yml 2011-05-19 17:01:41 -07:00
danielgrippi
b0967ad8b4 Fakes respond as expected to respond_to? 2011-05-19 16:24:12 -07:00
MrZYX
443b66ba32 one more important app_config 2011-05-18 20:56:22 +02:00
MrZYX
60870cab37 one more app_config 2011-05-18 20:53:45 +02:00
Shane Becker
910cc52387 rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
MrZYX
1a78c8fca1 whoops lets do a deep merge 2011-05-18 19:22:15 +02:00
MrZYX
e79a6597e6 eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something 2011-05-18 16:11:20 +02:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
MrZYX
00c6631f11 replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server 2011-05-17 16:00:47 +02:00
danielgrippi
55d39521c4 rescue redis connection attempts in websocket 2011-05-16 18:34:37 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
Sarah Mei
3b3ae86125 Get rid of annoying app_config.yml warning in test and development 2011-05-14 12:52:53 -07:00
Raphael Sofaer
70fd2e916a Update rspec 2011-05-13 17:52:37 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
MrZYX
3e3b8e07b2 add space before adding pid to logline 2011-05-08 21:36:27 +02:00