Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 11 | -99/+239 |
| | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config | ||||
* | Merge pull request #9984 from ranjaykrishna/col-prob | Rafael Mendonça França | 2013-03-28 | 3 | -4/+8 |
|\ | | | | | valid_type? added to super class abstract_adapter | ||||
| * | added comments to test_invalid_type in sqlite3 adapter test and added ↵ | Ranjay Krishna | 2013-03-28 | 3 | -4/+8 |
| | | | | | | | | valid_type? method to abstract_adapter.rb and removed unnecessary method from sqlite3 adapter | ||||
* | | Merge pull request #9982 from prathamesh-sonpatki/railite-typo | Carlos Antonio da Silva | 2013-03-28 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo | ||||
| * | | Fix typo | Prathamesh Sonpatki | 2013-03-28 | 1 | -1/+1 |
|/ / | |||||
* | | contrib guide: documents guidelines for running the test suite | Xavier Noria | 2013-03-28 | 1 | -0/+11 |
| | | |||||
* | | contrib guide: documents how to generate a --dev application | Xavier Noria | 2013-03-28 | 1 | -0/+16 |
| | | |||||
* | | Merge pull request #9977 from vipulnsward/fix_column_test_typo | Rafael Mendonça França | 2013-03-28 | 1 | -3/+3 |
|\ \ | |/ |/| | anual_salary => annual_salary | ||||
| * | anual_salary => annual_salary | Vipul A M | 2013-03-28 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #9974 from prathamesh-sonpatki/change_log | Steve Klabnik | 2013-03-28 | 1 | -1/+1 |
|\ | | | | | Removed unused variable in proc [ci skip] | ||||
| * | Removed unused variable in proc | Prathamesh Sonpatki | 2013-03-28 | 1 | -1/+1 |
|/ | | | | | | * This unused variable is already removed from the code here. d18e8b1a3839c5c214e96c7e37e0d86febe15f99 * So removing it from CHANGELOG to be consistent with code | ||||
* | Merge pull request #9972 from divineforest/fix-overriden-typo | Rafael Mendonça França | 2013-03-28 | 4 | -5/+5 |
|\ | | | | | Fix typo: overriden => overriDDen | ||||
| * | Fix typo: overriden => overriDDen | Alexander Balashov | 2013-03-28 | 4 | -5/+5 |
| | | |||||
* | | Merge pull request #9973 from prathamesh-sonpatki/AR-typos | Rafael Mendonça França | 2013-03-28 | 3 | -5/+5 |
|\ \ | | | | | | | Fixed typos in ActiveRecord | ||||
| * | | Fixed typos in ActiveRecord | Prathamesh Sonpatki | 2013-03-28 | 3 | -5/+5 |
|/ / | |||||
* | | Merge pull request #9970 from divineforest/fix-typo | Rafael Mendonça França | 2013-03-28 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo | ||||
| * | | Fix typo | Alexander Balashov | 2013-03-28 | 1 | -1/+1 |
| |/ | |||||
* | | Use snake case variable names, stick with the convention | Carlos Antonio da Silva | 2013-03-28 | 1 | -13/+13 |
| | | |||||
* | | Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_cases | Carlos Antonio da Silva | 2013-03-28 | 2 | -3/+3 |
|\ \ | | | | | | | Refactored to remove unused loop variable | ||||
| * | | Refactored to remove unused variable | Anupam Choudhury | 2013-03-28 | 2 | -3/+3 |
| | | | |||||
* | | | Merge pull request #9963 from obrie/fix/after_create_updates | Carlos Antonio da Silva | 2013-03-28 | 2 | -1/+17 |
|\ \ \ | |_|/ |/| | | Fix updates not working within after_create hooks | ||||
| * | | Fix updates not working within after_create hooks | Aaron Pfeifer | 2013-03-27 | 2 | -1/+17 |
| | | | |||||
* | | | Merge pull request #9968 from choudhuryanupam/fix_typo_n_grammar | Carlos Antonio da Silva | 2013-03-28 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fixed grammar | ||||
| * | | Fixed grammar | Anupam Choudhury | 2013-03-28 | 1 | -1/+1 |
|/ / | |||||
* | | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn] | Xavier Noria | 2013-03-28 | 2 | -0/+12 |
| | | |||||
* | | Add coffee-rails and javascript runtime to gemfile if skip_javascript is | Rafael Mendonça França | 2013-03-28 | 1 | -2/+9 |
| | | | | | | | | provided | ||||
* | | Merge pull request #9944 from where/rebased-fulltext-spacial | Rafael Mendonça França | 2013-03-27 | 13 | -37/+108 |
|\ \ | | | | | | | Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL | ||||
| * | | Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL. | Ken Mazaika | 2013-03-27 | 13 | -37/+108 |
|/ / | |||||
* | | Merge pull request #9964 from where/using-schema-dump | Rafael Mendonça França | 2013-03-27 | 3 | -2/+11 |
|\ \ | |/ |/| | Dump the 'using' options for a SQL index into the schema. | ||||
| * | Dump the 'using' options for a SQL index into the schema. | Ken Mazaika | 2013-03-27 | 3 | -2/+11 |
|/ | |||||
* | Merge pull request #9523 from ↵ | Rafael Mendonça França | 2013-03-27 | 4 | -2/+16 |
|\ | | | | | | | | | | | | | | | | | stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md | ||||
| * | ActiveSupport::Notifications::Instrumenter#instrument should yield | stopdropandrew | 2013-03-02 | 4 | -3/+16 |
| | | | | | | | | its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name. | ||||
* | | Merge pull request #9955 from rubys/cleanup_app_gemfile | Rafael Mendonça França | 2013-03-27 | 1 | -17/+7 |
|\ \ | | | | | | | Cosmetic cleanup of generated Gemfile | ||||
| * | | Remove buggy and unnecessary logic | Sam Ruby | 2013-03-27 | 1 | -7/+0 |
| | | | | | | | | | | | | based on a discussion with @rafaelfranca | ||||
| * | | Cosmetic cleanup of generated Gemfile | Sam Ruby | 2013-03-27 | 1 | -17/+14 |
| | | | | | | | | | | | | | | | | | | - Remove obsolete/misleading comment about assets only being used production - Remove unnecessary group :assets - Eliminate blank lines if options[:skip_javascript] is not specified | ||||
* | | | Fix syntax error | Rafael Mendonça França | 2013-03-27 | 1 | -1/+0 |
| | | | |||||
* | | | 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 |
| | | | | | |