d900526f44464c737a262ec919d07b0cdc6824b0 3a67dc9a04eb1d731acb6b2e5f3e91b47cfc5dde Court3nay courtenay@caboo.se http://github.com/courtenay/altered_beast/commit/717d1cb8a4869d51420793bdac3ae64eb697654b 717d1cb8a4869d51420793bdac3ae64eb697654b

2008-10-08T20:18:15-07:00

Merge branch 'github_qrush_master' Conflicts: README.rdoc app/helpers/application_helper.rb app/models/post.rb app/views/forums/show.html.erb vendor/plugins/rspec-rails/History.txt vendor/plugins/rspec-rails/Manifest.txt vendor/plugins/rspec-rails/generators/rspec/rspec_generator.rb vendor/plugins/rspec-rails/generators/rspec_model/rspec_model_generator.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/rspec_scaffold_generator.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/routing_spec.rb vendor/plugins/rspec-rails/lib/autotest/rails_rspec.rb vendor/plugins/rspec-rails/lib/spec/rails.rb vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb vendor/plugins/rspec-rails/lib/spec/rails/example/controller_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/cookies_proxy.rb vendor/plugins/rspec-rails/lib/spec/rails/example/functional_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/helper_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/rails_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/view_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_view/base.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/assert_select.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/render_template.rb vendor/plugins/rspec-rails/lib/spec/rails/mocks.rb vendor/plugins/rspec-rails/lib/spec/rails/story_adapter.rb vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb vendor/plugins/rspec-rails/spec/rails/example/controller_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/example/cookies_proxy_spec.rb vendor/plugins/rspec-rails/spec/rails/example/view_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/assert_select_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/include_text_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/redirect_to_spec.rb vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb vendor/plugins/rspec-rails/spec/spec_helper.rb vendor/plugins/rspec-rails/spec_resources/controllers/controller_spec_controller.rb vendor/plugins/rspec-rails/spec_resources/controllers/render_spec_controller.rb vendor/plugins/rspec/History.txt vendor/plugins/rspec/README.txt vendor/plugins/rspec/Rakefile vendor/plugins/rspec/bin/autospec vendor/plugins/rspec/bin/spec vendor/plugins/rspec/lib/autotest/rspec.rb vendor/plugins/rspec/lib/spec.rb vendor/plugins/rspec/lib/spec/example/errors.rb vendor/plugins/rspec/lib/spec/example/example_group_methods.rb vendor/plugins/rspec/lib/spec/extensions/main.rb vendor/plugins/rspec/lib/spec/matchers/change.rb vendor/plugins/rspec/lib/spec/matchers/has.rb vendor/plugins/rspec/lib/spec/matchers/have.rb vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb vendor/plugins/rspec/lib/spec/mocks/methods.rb vendor/plugins/rspec/lib/spec/mocks/proxy.rb vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb vendor/plugins/rspec/lib/spec/runner.rb vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb vendor/plugins/rspec/lib/spec/runner/command_line.rb vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/nested_text_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb vendor/plugins/rspec/lib/spec/runner/option_parser.rb vendor/plugins/rspec/lib/spec/runner/options.rb vendor/plugins/rspec/lib/spec/runner/reporter.rb vendor/plugins/rspec/lib/spec/runner/spec_parser.rb vendor/plugins/rspec/lib/spec/story/runner.rb vendor/plugins/rspec/lib/spec/story/step.rb vendor/plugins/rspec/lib/spec/story/step_mother.rb vendor/plugins/rspec/rake_tasks/verify_rcov.rake vendor/plugins/rspec/spec/autotest/rspec_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_methods_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_spec.rb vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb vendor/plugins/rspec/spec/spec/extensions/main_spec.rb vendor/plugins/rspec/spec/spec/matchers/change_spec.rb vendor/plugins/rspec/spec/spec/matchers/has_spec.rb vendor/plugins/rspec/spec/spec/matchers/have_spec.rb vendor/plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb vendor/plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb vendor/plugins/rspec/spec/spec/mocks/null_object_mock_spec.rb vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/nested_text_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb vendor/plugins/rspec/spec/spec/story/scenario_spec.rb vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb vendor/plugins/rspec/spec/spec/story/step_spec.rb vendor/plugins/rspec/spec/spec/story/story_spec.rb vendor/plugins/rspec/spec/spec_helper.rb vendor/plugins/rspec/stories/configuration/before_blocks.story vendor/plugins/will_paginate/Rakefile vendor/plugins/will_paginate/init.rb vendor/plugins/will_paginate/lib/will_paginate.rb vendor/plugins/will_paginate/lib/will_paginate/collection.rb vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb vendor/plugins/will_paginate/lib/will_paginate/finder.rb vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb vendor/plugins/will_paginate/test/boot.rb vendor/plugins/will_paginate/test/console vendor/plugins/will_paginate/test/finder_test.rb vendor/plugins/will_paginate/test/fixtures/developer.rb vendor/plugins/will_paginate/test/fixtures/projects.yml vendor/plugins/will_paginate/test/fixtures/replies.yml vendor/plugins/will_paginate/test/fixtures/reply.rb vendor/plugins/will_paginate/test/fixtures/schema.rb vendor/plugins/will_paginate/test/fixtures/topic.rb vendor/plugins/will_paginate/test/helper.rb vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb vendor/plugins/will_paginate/test/lib/load_fixtures.rb d83c8e54ab952dbc0f03572bd6b98e0ea8571cbb Court3nay courtenay@caboo.se