Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Adding a test to make sure that using rake routes with the CONTROLLER | wangjohn | 2013-05-29 | 1 | -0/+12 | |
| | |_|/ | |/| | | | | | | | | | | environment works correctly. | |||||
* | | | | Merge pull request #10805 from pilaf/master | Steve Klabnik | 2013-05-30 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix word order in documentation for with_lock [ci skip] | |||||
| * | | | | Fix word order in documentation for with_lock | Pedro Fayolle | 2013-05-30 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #10803 from gsamokovarov/extract-deep-munge | Rafael Mendonça França | 2013-05-30 | 3 | -18/+27 | |
|\ \ \ \ | | | | | | | | | | | Extract ActionDispatch::Request#deep_munge | |||||
| * | | | | Extract ActionDispatch::Request#deep_munge | Genadi Samokovarov | 2013-05-30 | 3 | -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_regression | Steve Klabnik | 2013-05-30 | 3 | -4/+17 | |
|\ \ \ \ | | | | | | | | | | | Fix regression in has_secure_password. | |||||
| * | | | | Fix regression in has_secure_password. | Phil Calvin | 2013-05-30 | 3 | -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ça | 2013-05-30 | 2 | -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` option | Yves Senn | 2013-05-30 | 2 | -1/+10 | |
|/ / / | ||||||
* | | | Merge pull request #10767 from jmondo/master | Carlos Antonio da Silva | 2013-05-29 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Use grep instead of select with === in QueryMethods | |||||
| * | | | use grep over select for consistency and efficiency | John Gesimondo | 2013-05-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | pass block directly to grep | |||||
* | | | | Merge pull request #10781 from arunagw/run-isolated-test | Rafael Mendonça França | 2013-05-28 | 4 | -37/+13 | |
|\ \ \ \ | | | | | | | | | | | Running isolated tests | |||||
| * | | | | Running isolated tests | Arun Agrawal | 2013-05-28 | 4 | -37/+13 | |
| | | | | | | | | | | | | | | | | | | | | These stopped running don't know when. But these should be running now. | |||||
* | | | | | Merge pull request #10766 from kylerippey/minor_schema_migration_refactor | Rafael Mendonça França | 2013-05-28 | 1 | -18/+24 | |
|\ \ \ \ \ | | | | | | | | | | | | | Minor refactor of ActiveRecord::SchemaMigration | |||||
| * | | | | | Minor refactor of ActiveRecord::SchemaMigration to remove references to ↵ | Kyle Rippey | 2013-05-26 | 1 | -18/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Base, override table_exists method, and switch to preferred style for class method definitions. | |||||
* | | | | | | Merge pull request #10495 from senny/postgres_test_cleanup | Rafael Mendonça França | 2013-05-28 | 2 | -30/+30 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PostgreSQL specific test cleanup | |||||
| * | | | | | | cleanup, assert on warning from postgres adapter | Yves Senn | 2013-05-08 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | cleanup, switch arguments in assert_equal calls | Yves Senn | 2013-05-08 | 1 | -29/+29 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'fix-test_unit-railtie' | Rafael Mendonça França | 2013-05-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This branch is composed of #10629 and #10708 Closes #10629 Closes #10708 Fixes #10628 | |||||
| * | | | | | | No need changelog entry | Rafael Mendonça França | 2013-05-28 | 1 | -2/+0 | |
| | | | | | | | ||||||
| * | | | | | | condition simplified | Oleg Sukhodolsky | 2013-05-28 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #10629 from stmpjmpr/bug_10628 | Rafael Mendonça França | 2013-05-28 | 2 | -1/+3 | |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 10628. | |||||
| * | | | | | | Fixes bug 10628. | Scott Hill | 2013-05-15 | 2 | -1/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #10755 from lukewendling/master | Rafael Mendonça França | 2013-05-28 | 1 | -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 binding | Luke Wendling | 2013-05-25 | 1 | -0/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #10775 from senny/postgres_adapter_test_cleanup | Rafael Mendonça França | 2013-05-28 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | test cleanup, replace `define_method` and `remove_method` with stubs. | |||||
| * | | | | | | | test cleanup, replace `define_method` and `remove_method` with stubs. | Yves Senn | 2013-05-28 | 1 | -5/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10769 from ↵ | Rafael Mendonça França | 2013-05-27 | 5 | -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` explicitly | Yves Senn | 2013-05-27 | 5 | -24/+25 | |
| | | | | | | | ||||||
| * | | | | | | cleanup whitespace in `active_record/relation.rb`. | Yves Senn | 2013-05-27 | 1 | -4/+4 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #10763 from senny/10758_to_sentence_with_blank_elements | Carlos Antonio da Silva | 2013-05-26 | 1 | -0/+4 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | test-case for `Array#to_sentence` with `blank?` items. | |||||
| * | | | | | add test-case for `Array#to_sentence with blank items. | Yves Senn | 2013-05-26 | 1 | -0/+4 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #10762 from vipulnsward/change_compatibility | Carlos Antonio da Silva | 2013-05-26 | 1 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | compatability => compatibility | |||||
| * | | | | | compatability => compatibility | Vipul A M | 2013-05-26 | 1 | -3/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #10761 from vipulnsward/fix-typo-1 | Carlos Antonio da Silva | 2013-05-26 | 4 | -4/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix some typo in method names, variables | |||||
| * | | | | Fix some typo in method names, variables | Vipul A M | 2013-05-26 | 4 | -4/+4 | |
| | |_|/ | |/| | | ||||||
* / | | | Add note about decorator loading in Engines guide. | Steve Klabnik | 2013-05-24 | 1 | -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_guide | Rafael Mendonça França | 2013-05-23 | 1 | -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 Senn | 2013-04-15 | 1 | -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_many | Rafael Mendonça França | 2013-05-23 | 4 | -2/+15 | |
|\ \ \ \ | | | | | | | | | | | Fix the `:primary_key` option for `has_many` associations. | |||||
| * | | | | Fix the `:primary_key` option for `has_many` associations. | Yves Senn | 2013-05-23 | 4 | -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ça | 2013-05-23 | 8 | -42/+61 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | Closes #10716 | |||||
| * | | | | deprecate Validator#setup (to get rid of a respond_to call). validators do ↵ | Nick Sutterer | 2013-05-23 | 8 | -42/+61 | |
|/ / / / | | | | | | | | | | | | | their setup in their constructor now. | |||||
* | | | | Add CHANGELOG entry for 99860582b2b1c0fc42bf84c52aac57b243d42678 | Rafael Mendonça França | 2013-05-22 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Require only minitest. | Rafael Mendonça França | 2013-05-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | minitest/autorun required minitest/spec and we are avoiding to require it. | |||||
* | | | | Merge pull request #10667 from rubys/minitest-autorun | Rafael Mendonça França | 2013-05-22 | 2 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Eliminate minitest warnings | |||||
| * | | | | Eliminate minitest warnings | Sam Ruby | 2013-05-17 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | https://github.com/seattlerb/minitest/commit/9a57c520ceac76abfe6105866f8548a94eb357b6#L15R8 | |||||
* | | | | | Merge pull request #10725 from neerajdotname/remove_code_duplication | Carlos Antonio da Silva | 2013-05-22 | 1 | -2/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove code duplication | |||||
| * | | | | | remove code duplication | Neeraj Singh | 2013-05-22 | 1 | -2/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #10714 from tkhr/extract_test_from_base_test.rb_in_AR | Carlos Antonio da Silva | 2013-05-22 | 4 | -45/+54 | |
|\ \ \ \ \ | | | | | | | | | | | | | Extract tests code out from AR's base_test.rb |