aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Remove :confirm and :disable_with options for ↵kennyj2013-06-012-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | ActionView::Helpers::UrlHelper#link_to and #button_to were deprecated.
| * | | | | Remove active_support/testing/pending.rb was deprecated.kennyj2013-06-013-27/+0
| | | | | |
| * | | | | Remove ActiveSupport::Benchmarkable#silence was deprecated.kennyj2013-06-012-42/+0
| | | | | |
| * | | | | Remove active_support/json/variable was deprecated.kennyj2013-06-013-26/+0
|/ / / / /
* | / / / revises the documentation of ActiveRecord::Relation#find_or_create_by [ci skip]Xavier Noria2013-06-011-14/+38
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Inspect uses double quotes. * Inspect puts a hash as in #<User ...>. * Documents the return value, and makes explicit it can be an invalid record. * Documents the method is not atomic. * Documents a way to handle UNIQUE contraint violations in the event of a race condition. * Removes the "Examples" header according to our guidelines.
* | | | rewrites AR's reload documentationXavier Noria2013-05-311-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It is no longer true that options are passed to find. * Documents that ActiveRecord::RecordNotFound may be raised. * Documents that the reload happens in-place. * Documents that caches are wiped. * Documents that the method returns self. * Documents a couple of use cases.
* | | | Add propery docs to ActionDispatch::Response [ci skip]Steve Klabnik2013-05-301-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After some discussion on Twitter with @skud, the documentation on ActionDispatch::Response is a bit sparse. This class is useful when you're writing tests, as often you want to assert various things about the response that's coming back. Better docs would make this easier for people new to testing in Rails. I only added some descriptions for various properties that were defined, and mostly just a sentence or two. Most of these things are familliar if you're working with HTTP, but some words is better than no words at all. Hopefully further commits will fix up things that aren't just documentation.
* | | | Merge pull request #10783 from wangjohn/rake_routes_additional_environmentRafael Mendonça França2013-05-301-0/+12
|\ \ \ \ | | | | | | | | | | Adding the ability to filter routes by the verb
| * | | | Adding a test to make sure that using rake routes with the CONTROLLERwangjohn2013-05-291-0/+12
| | |_|/ | |/| | | | | | | | | | environment works correctly.
* | | | Merge pull request #10805 from pilaf/masterSteve Klabnik2013-05-301-1/+1
|\ \ \ \ | | | | | | | | | | Fix word order in documentation for with_lock [ci skip]
| * | | | Fix word order in documentation for with_lockPedro Fayolle2013-05-301-1/+1
|/ / / /
* | | | Merge pull request #10803 from gsamokovarov/extract-deep-mungeRafael Mendonça França2013-05-303-18/+27
|\ \ \ \ | | | | | | | | | | Extract ActionDispatch::Request#deep_munge
| * | | | Extract ActionDispatch::Request#deep_mungeGenadi Samokovarov2013-05-303-18/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Request#deep_munge was introduced as a private method, but was turned into a public one for the use of ActionDispatch::ParamsParser. I have extracted it into ActionDispatch::Request::Utils, so it does not get mixed up with the Request public methods.
* | | | Merge pull request #10694 from steveklabnik/hsp_regressionSteve Klabnik2013-05-303-4/+17
|\ \ \ \ | | | | | | | | | | Fix regression in has_secure_password.
| * | | | Fix regression in has_secure_password.Phil Calvin2013-05-303-4/+17
|/ / / / | | | | | | | | | | | | If the confirmation was blank, but the password wasn't, it would still save.
* | | | Merge pull request #10785 from ↵Rafael Mendonça França2013-05-302-1/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | senny/10782_routes_inspector_deals_with_controller_regexp `RoutesInspector` deals with routes using regexp as `:controller` option
| * | | `RoutesInspector` deals with routes using regexp as `:controller` optionYves Senn2013-05-302-1/+10
|/ / /
* | | Merge pull request #10767 from jmondo/masterCarlos Antonio da Silva2013-05-291-1/+1
|\ \ \ | | | | | | | | Use grep instead of select with === in QueryMethods
| * | | use grep over select for consistency and efficiencyJohn Gesimondo2013-05-281-1/+1
| | | | | | | | | | | | | | | | pass block directly to grep
* | | | Merge pull request #10781 from arunagw/run-isolated-testRafael Mendonça França2013-05-284-37/+13
|\ \ \ \ | | | | | | | | | | Running isolated tests
| * | | | Running isolated testsArun Agrawal2013-05-284-37/+13
| | | | | | | | | | | | | | | | | | | | These stopped running don't know when. But these should be running now.
* | | | | Merge pull request #10766 from kylerippey/minor_schema_migration_refactorRafael Mendonça França2013-05-281-18/+24
|\ \ \ \ \ | | | | | | | | | | | | Minor refactor of ActiveRecord::SchemaMigration
| * | | | | Minor refactor of ActiveRecord::SchemaMigration to remove references to ↵Kyle Rippey2013-05-261-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | Base, override table_exists method, and switch to preferred style for class method definitions.
* | | | | | Merge pull request #10495 from senny/postgres_test_cleanupRafael Mendonça França2013-05-282-30/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | PostgreSQL specific test cleanup
| * | | | | | cleanup, assert on warning from postgres adapterYves Senn2013-05-081-1/+1
| | | | | | |
| * | | | | | cleanup, switch arguments in assert_equal callsYves Senn2013-05-081-29/+29
| | | | | | |
* | | | | | | Merge branch 'fix-test_unit-railtie'Rafael Mendonça França2013-05-281-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This branch is composed of #10629 and #10708 Closes #10629 Closes #10708 Fixes #10628
| * | | | | | No need changelog entryRafael Mendonça França2013-05-281-2/+0
| | | | | | |
| * | | | | | condition simplifiedOleg Sukhodolsky2013-05-281-1/+1
| | | | | | |
| * | | | | | Merge pull request #10629 from stmpjmpr/bug_10628Rafael Mendonça França2013-05-282-1/+3
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 10628.
| * | | | | | Fixes bug 10628.Scott Hill2013-05-152-1/+3
| | | | | | |
* | | | | | | Merge pull request #10755 from lukewendling/masterRafael Mendonça França2013-05-281-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Add notice on server boot if binding to 0.0.0.0
| * | | | | | add notice to server boot messages if using default 0.0.0.0 bindingLuke Wendling2013-05-251-0/+3
| | | | | | |
* | | | | | | Merge pull request #10775 from senny/postgres_adapter_test_cleanupRafael Mendonça França2013-05-281-5/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | test cleanup, replace `define_method` and `remove_method` with stubs.
| * | | | | | | test cleanup, replace `define_method` and `remove_method` with stubs.Yves Senn2013-05-281-5/+1
|/ / / / / / /
* | | | | | | Merge pull request #10769 from ↵Rafael Mendonça França2013-05-275-28/+29
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | senny/10615_join_should_not_return_readonly_records using `#joins` does not imply `readonly = true`.
| * | | | | | `implicit_readonly` is being removed in favor of calling `readonly` explicitlyYves Senn2013-05-275-24/+25
| | | | | | |
| * | | | | | cleanup whitespace in `active_record/relation.rb`.Yves Senn2013-05-271-4/+4
|/ / / / / /
* | | | | | Merge pull request #10763 from senny/10758_to_sentence_with_blank_elementsCarlos Antonio da Silva2013-05-261-0/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | test-case for `Array#to_sentence` with `blank?` items.
| * | | | | add test-case for `Array#to_sentence with blank items.Yves Senn2013-05-261-0/+4
| |/ / / /
* | | | | Merge pull request #10762 from vipulnsward/change_compatibilityCarlos Antonio da Silva2013-05-261-3/+3
|\ \ \ \ \ | | | | | | | | | | | | compatability => compatibility
| * | | | | compatability => compatibilityVipul A M2013-05-261-3/+3
| |/ / / /
* | | | | Merge pull request #10761 from vipulnsward/fix-typo-1Carlos Antonio da Silva2013-05-264-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | Fix some typo in method names, variables
| * | | | Fix some typo in method names, variablesVipul A M2013-05-264-4/+4
| | |_|/ | |/| |
* / | | Add note about decorator loading in Engines guide.Steve Klabnik2013-05-241-0/+26
|/ / / | | | | | | | | | | | | | | | | | | | | | Because decorators aren't referenced by the application, they won't get autoloaded. And because we recommend the pattern, it would be irresponsible to not show how to load them properly. Fixes #10647.
* | | Merge pull request #10222 from senny/update_bundler_section_in_assets_guideRafael Mendonça França2013-05-231-9/+7
|\ \ \ | | | | | | | | | | | | | | | | docs, adjust the application.rb snippets to match the generated file. Closes #10449
| * | | asset guide, match application.rb snippets to the generated file [ci skip]Yves Senn2013-04-151-9/+7
| | | | | | | | | | | | | | | | `if defined?(Bundler)` is no longer used in our current application.rb
* | | | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-234-2/+15
|\ \ \ \ | | | | | | | | | | Fix the `:primary_key` option for `has_many` associations.
| * | | | Fix the `:primary_key` option for `has_many` associations.Yves Senn2013-05-234-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing records from a `has_many` association it used the `primary_key` defined on the association. Our test suite didn't fail because on all occurences of `:primary_key`, the specified column was available in both tables. This prevented the code from raising an exception but it still behaved badly. I added a test-case to prevent regressions that failed with: ``` 1) Error: HasManyAssociationsTest#test_has_many_assignment_with_custom_primary_key: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: essays.first_name: UPDATE "essays" SET "writer_id" = NULL WHERE "essays"."writer_id" = ? AND "essays"."first_name" IS NULL ```
* | | | | Merge branch 'deprecate-validator-setup'Rafael Mendonça França2013-05-238-42/+61
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Closes #10716