Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9274 from KrzysiekJ/spaces_in_scope_names | Rafael Mendonça França | 2013-03-27 | 2 | -5/+17 |
|\ | | | | | | | Use define_method when method name contains weird characters. | ||||
| * | Use define_method when method name contains weird characters. | Krzysztof Jurewicz | 2013-03-18 | 2 | -5/+17 |
| | | |||||
* | | Merge pull request #8458 from ↵ | Rafael Mendonça França | 2013-03-27 | 4 | -5/+68 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | lucisferre/improve-layout-override-fallback-behavior Provides standard layout lookup behavior for method and proc cases Conflicts: actionpack/CHANGELOG.md | ||||
| * | | Provides standard layout lookup behavior for method and proc cases | Chris Nicola | 2013-03-27 | 4 | -5/+67 |
| | | | | | | | | | | | | | | | | | | | | | When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method. | ||||
* | | | Merge pull request #9954 from neerajdotname/space_after_entirely | Rafael Mendonça França | 2013-03-27 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | entirelyby => 'entirely by' | ||||
| * | | | entirelyby => 'entirely by' | Neeraj Singh | 2013-03-27 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #9949 from vipulnsward/drop_yaml_error_constant | Rafael Mendonça França | 2013-03-27 | 2 | -4/+2 |
|\ \ \ | | | | | | | | | drop errors constant | ||||
| * | | | drop errors constant | Vipul A M | 2013-03-27 | 2 | -4/+2 |
| | | | | |||||
* | | | | Merge pull request #9952 from prathamesh-sonpatki/AR-typos | Rafael Mendonça França | 2013-03-27 | 5 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Fixed typos in activerecord | ||||
| * | | | | Fixed typos in activerecord | Prathamesh Sonpatki | 2013-03-27 | 5 | -5/+5 |
|/ / / / | |||||
* | | | | Merge pull request #9947 from senny/strong_params_doc_for_complex_forms | Rafael Mendonça França | 2013-03-27 | 1 | -1/+25 |
|\ \ \ \ | | | | | | | | | | | mention strong parameters in complex forms section of the guides. | ||||
| * | | | | mention strong parameters in complex forms section of the guides. | Yves Senn | 2013-03-27 | 1 | -1/+25 |
| |/ / / | | | | | | | | | | | | | Closes #9921. | ||||
* | | | | Merge pull request #8368 from SamSaffron/master | Rafael Mendonça França | 2013-03-27 | 3 | -3/+75 |
|\ \ \ \ | | | | | | | | | | | Allow connection_handler to be overriden per-thread | ||||
| * | | | | Make connection_handler overridable per thread | Sam Saffron | 2013-03-27 | 3 | -3/+75 |
| | | | | | |||||
* | | | | | Use thor master since 0.18.0 has a regression | Rafael Mendonça França | 2013-03-27 | 1 | -0/+1 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/wycats/thor/commit/08265a380d0ff3fce014e98e87bb8c2330858e4a for the discussion and https://github.com/wycats/thor/pull/316 for the fix | ||||
* | | | | Merge pull request #9945 from vipulnsward/drop_var_in_validations | Carlos Antonio da Silva | 2013-03-27 | 1 | -2/+1 |
|\ \ \ \ | |/ / / |/| | | | Drop variable assignment in validations | ||||
| * | | | drop variable assignment in validations | Vipul A M | 2013-03-27 | 1 | -2/+1 |
|/ / / | |||||
* | | | Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstore_test | Rafael Mendonça França | 2013-03-26 | 1 | -15/+5 |
|\ \ \ | | | | | | | | | Restore columns dropped by hstore test | ||||
| * | | | Combine tests and restore columns dropped by hstore testing | Mack Earnhardt | 2013-03-26 | 1 | -15/+5 |
| | | | | | | | | | | | | | | | | | | | | Disabling the hstore extension during testing created order dependent test failures. | ||||
* | | | | Merge pull request #9928 from vipulnsward/fix_rename_auto_increment_mysql | Rafael Mendonça França | 2013-03-26 | 6 | -11/+27 |
|\ \ \ \ | | | | | | | | | | | respect auto_increment in rename_column for mysql | ||||
| * | | | | respect auto_increment in rename_column for mysql | Vipul A M | 2013-03-27 | 6 | -11/+27 |
| | | | | | |||||
* | | | | | Merge pull request #9939 from dchapman1988/master | Rafael Mendonça França | 2013-03-26 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing some typo(s)/grammar. | ||||
| * | | | | | s/and and run/and runs/ | David Chapman | 2013-03-26 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | Fixing some typos/grammar. | ||||
* | | | | | Merge pull request #9937 from zolzaya/master | Rafael Mendonça França | 2013-03-26 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Asia/Ulaanbaatar is incorrect mapping Fixes #9936 | ||||
| * | | | | | Fixed timezone mapping of Ulaanbaatar. | Zolzaya | 2013-03-27 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #9923 from danmcclain/psql-concurrent-indexes | Rafael Mendonça França | 2013-03-26 | 9 | -35/+86 |
|\ \ \ \ \ | | | | | | | | | | | | | Adds support for concurrent indexing in PostgreSQL adapter | ||||
| * | | | | | Checks :algorithm argument for valid values | Dan McClain | 2013-03-26 | 4 | -1/+18 |
| | | | | | | |||||
| * | | | | | Adds support for concurrent indexing in PostgreSQL adapter | Dan McClain | 2013-03-25 | 9 | -35/+69 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for algorithm option in MySQL indexes Moves USING and algorithm options upstream The syntax is still specific to the Adapter, so the actual executed string happens in the corresponding adapter | ||||
* | | | | | Merge pull request #9930 from kennyj/bump_tzinfo | Santiago Pastorino | 2013-03-25 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data. | ||||
| * | | | | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data. | kennyj | 2013-03-26 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | default RAILS_ENV to test if we're in a test task | Aaron Patterson | 2013-03-25 | 1 | -0/+4 |
| |/ / / / |/| | | | | |||||
* | | | | | Fix typo | Rafael Mendonça França | 2013-03-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #9925 from senny/relative_guide_links | Steve Klabnik | 2013-03-25 | 3 | -18/+26 |
|\ \ \ \ \ | | | | | | | | | | | | | use relative links inside guides [ci skip] | ||||
| * | | | | | use relative links inside guides [ci skip] | Yves Senn | 2013-03-25 | 3 | -18/+26 |
| | | | | | | |||||
* | | | | | | The sql_type method called here is from | Rafael Mendonça França | 2013-03-25 | 2 | -7/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::Column See https://github.com/rails/rails/blob/28b8ca766e3e7c6c43d3ae900c99f8377153c62/activerecord/lib/active_record/connection_adapters/column.rb#L16 | ||||
* | | | | | | Merge pull request #9920 from senny/clean_up_testing_examples_for_action_mailer | Steve Klabnik | 2013-03-25 | 2 | -36/+26 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | move mailer testing examples into the testing guide. | ||||
| * | | | | | move mailer testing examples into the testing guide. | Yves Senn | 2013-03-25 | 2 | -36/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9325. I adjusted the example and the description in the testing guide and simply linked from the mailer to the testing guide. This way we don't have to maintain two separate places. | ||||
* | | | | | | Merge pull request #7324 from MSch/pg-geometric | Rafael Mendonça França | 2013-03-25 | 6 | -12/+77 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Add support for pg geometric datatypes point and box | ||||
| * | | | | | Move away from column.sql_type in untested code too | Martin Schürrer | 2013-03-25 | 1 | -5/+6 |
| | | | | | | |||||
| * | | | | | Make Postgres point type correspond to ruby array with two floats inside | Martin Schürrer | 2013-03-25 | 6 | -8/+72 |
|/ / / / / | |||||
* | | | | | Created a layer of abstraction for the valid type checking in schema dumper. ↵ | Ranjay Krishna | 2013-03-25 | 7 | -1/+40 |
| | | | | | | | | | | | | | | | | | | | | Now, connection handles the check for valid types so that each database can handle the changes individually. | ||||
* | | | | | Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5 | Rafael Mendonça França | 2013-03-25 | 1 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Skipping test for OpenSSL::PKCS5 JRuby | ||||
| * | | | | | Skipping test for OpenSSL::PKCS5 JRuby | Arun Agrawal | 2013-03-25 | 1 | -0/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #8527 from shockone/patch-1 | Rafael Mendonça França | 2013-03-25 | 3 | -0/+39 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add a method full_messages_for to the Errors class | ||||
| * | | | | | | Add a method full_messages_for to the Errors class | shock_one | 2013-03-24 | 3 | -0/+39 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #9864 from vipulnsward/fix_test_AR_v2 | Rafael Mendonça França | 2013-03-25 | 3 | -2/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Introduce test on Error#full_message for attribute with underscores; Fix... | ||||
| * | | | | | | Add Error#full_message test; Fix typos | Vipul A M | 2013-03-22 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce test on Error#full_message for attribute with underscores; Fix some typos | ||||
* | | | | | | | Merge pull request #9918 from prathamesh-sonpatki/railties-typos | Steve Klabnik | 2013-03-25 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed typo in railties/test | ||||
| * | | | | | | | Fixed typo in railties/test | Prathamesh Sonpatki | 2013-03-25 | 2 | -2/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #9916 from ↵ | Rafael Mendonça França | 2013-03-25 | 1 | -4/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | neerajdotname/no-exception-when-cookie-is-tampered-with nil is retuned if cookie is tampered with [ci skip] |