| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Move Rack::Cache after AD::Static in the stack | Jonathan Baudanza | 2013-09-25 | 2 | -6/+6 |
| | | |||||
| * | Merge pull request #12363 from jbaudanza/doc | Rafael Mendonça França | 2013-09-25 | 1 | -1/+1 |
| |\ | | | | | Fix small typo in docs | ||||
| | * | Fix small typo in docs | Jonathan Baudanza | 2013-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #12362 from arthurnn/inverse_on_find | Rafael Mendonça França | 2013-09-25 | 3 | -5/+22 |
| |\ \ | |/ |/| | fix .find when inverse is loaded | ||||
| | * | changelog entry | Arthur Neves | 2013-09-25 | 1 | -0/+6 |
| | | | |||||
| | * | fix .find when inverse is set | Arthur Neves | 2013-09-25 | 2 | -5/+16 |
| |/ | | | | .find([1]) should return an Array of entries, even when a invese object is in memory already | ||||
| * | Merge pull request #12359 from arthurnn/inverse_on_callbacks | Rafael Mendonça França | 2013-09-25 | 4 | -2/+18 |
| |\ | | | | | Make sure inverse_of is visible on the has_many callbacks | ||||
| | * | update changelog for #12359 | Arthur Neves | 2013-09-25 | 1 | -1/+5 |
| | | | |||||
| | * | Make sure inverse_of is visible on the has_many callbacks | Arthur Neves | 2013-09-25 | 3 | -1/+13 |
| | | | |||||
| * | | Merge branch 'master' into preload | Aaron Patterson | 2013-09-25 | 79 | -201/+735 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (62 commits) Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag Add CHANGELOG entry for #12344 Add regression test to #12343 Fix typo in number_to_human docs: you -> your [Documentation] Add a missing validation to I18n docs Use the given name in html_options for the hidden field in collection_check_boxes assign_attributes should return if argument is blank. No need the else clause Use join to concat the both side of the AST Add a CHANGELOG entry about Web Console inclusion added column type to example in section 2.3 Include web-console in new projects Gemfile ActiveRecord::ConnectionAdapters::Column.string_to_time method respects string with timezone. Closes #12278. add test_scoped_root_as_name Getting Started Guide: update RubyGems Guides link [ci skip] Deprecate unused quoted_locking_column method. Update references to wycats/thor to erikhuda/thor. bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows Fix the model name in the association basics guides We shouldn't override PostgreSQLAdapter's superclass inheritance while monkeypatching ... | ||||
| | * | Merge pull request #12290 from kennyj/fix_12278 | Andrew White | 2013-09-24 | 3 | -3/+28 |
| | |\ | | | | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone. | ||||
| | | * | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵ | kennyj | 2013-09-25 | 3 | -3/+28 |
| | | | | | | | | | | | | | string with timezone. Closes #12278. | ||||
| | * | | Merge pull request #12351 from francisgo/patch-2 | Rafael Mendonça França | 2013-09-24 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag | ||||
| | | * | | Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag | Francis Go | 2013-09-25 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Add CHANGELOG entry for #12344 | Rafael Mendonça França | 2013-09-24 | 1 | -0/+5 |
| | | | | | | | | | | | | | [ci skip] | ||||
| | * | | Merge pull request #12344 from angelic/collection_check_boxes_with_name | Rafael Mendonça França | 2013-09-24 | 2 | -1/+9 |
| | |\ \ | | | | | | | | | Use the given name in html_options for the hidden field in collection_ch... | ||||
| | | * | | Use the given name in html_options for the hidden field in ↵ | Angel N. Sciortino | 2013-09-24 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | collection_check_boxes | ||||
| | * | | | Add regression test to #12343 | Rafael Mendonça França | 2013-09-24 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | Merge pull request #12343 from wangjohn/fix_failing_agile_controller_tests | Rafael Mendonça França | 2013-09-24 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | assign_attributes should return if arguments are blank | ||||
| | | * | | | assign_attributes should return if argument is blank. | wangjohn | 2013-09-24 | 1 | -0/+1 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | If you are passed an empty hash, then assign_attributes doesn't need to do any work and can just return early. This should fix the failing Agile Web Development tests. | ||||
| | * | | | Merge pull request #12346 from graysonwright/patch-1 | Rafael Mendonça França | 2013-09-24 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | [Documentation] Add a missing validation to I18n docs | ||||
| | | * | | | [Documentation] Add a missing validation to I18n docs | Grayson Wright | 2013-09-24 | 1 | -0/+1 |
| | | |/ / | | | | | | | | | | | | | | | | | The guide was missing a description of the error message interpolation for validates_numericality_of with the :only_integer option. | ||||
| | * | | | Merge pull request #12341 from odigity/master | Rafael Mendonça França | 2013-09-24 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | added column type to example in section 2.3 | ||||
| | | * | | | added column type to example in section 2.3 | Ofer Nave | 2013-09-24 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #12347 from macmartine/master | Rafael Mendonça França | 2013-09-24 | 1 | -1/+1 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Fix typo in number_to_human docs: you -> your | ||||
| | | * | | | Fix typo in number_to_human docs: you -> your | Mac Martine | 2013-09-24 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #10822 from gaurish/pool | Xavier Noria | 2013-09-24 | 2 | -0/+13 |
| | |\ \ \ | | | | | | | | | | | Add note about database connection pool in postgres template | ||||
| | | * | | | Add notes about database connection pool [ci skip] | Gaurish Sharma | 2013-09-22 | 2 | -0/+13 |
| | | | | | | |||||
| | * | | | | No need the else clause | Rafael Mendonça França | 2013-09-24 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | Use join to concat the both side of the AST | Rafael Mendonça França | 2013-09-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | Onf of the sides can be nil and it will raise a Conversion error | ||||
| | * | | | | Merge pull request #12337 from rubys/route-formatter-test | Rafael Mendonça França | 2013-09-24 | 1 | -0/+13 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | add test_scoped_root_as_name | ||||
| | | * | | | | add test_scoped_root_as_name | Sam Ruby | 2013-09-24 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | test for regression introduced by https://github.com/rails/rails/pull/9155 | ||||
| | * | | | | | Merge pull request #12342 from gsamokovarov/web-console-changelog | Guillermo Iguaran | 2013-09-24 | 1 | -0/+4 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Add a CHANGELOG entry about Web Console inclusion | ||||
| | | * | | | | Add a CHANGELOG entry about Web Console inclusion | Genadi Samokovarov | 2013-09-24 | 1 | -0/+4 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #11667 from gsamokovarov/introduce-web-console | Guillermo Iguaran | 2013-09-24 | 1 | -0/+3 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Include web-console in new projects Gemfile | ||||
| | | * | | | Include web-console in new projects Gemfile | Genadi Samokovarov | 2013-09-24 | 1 | -0/+3 |
| | |/ / / | |||||
| | * | | | Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nil | Rafael Mendonça França | 2013-09-24 | 4 | -6/+25 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raising an error when nil is passed to update_attributes. Conflicts: activerecord/CHANGELOG.md | ||||
| | | * | | | Raising an error when nil or non-hash is passed to update_attributes. | wangjohn | 2013-06-25 | 4 | -6/+25 |
| | | | | | | |||||
| | * | | | | Merge pull request #11423 from kennyj/remove_quoted_locking_column | Rafael Mendonça França | 2013-09-24 | 3 | -0/+9 |
| | |\ \ \ \ | | | | | | | | | | | | | Remove unused quoted_locking_column method. | ||||
| | | * | | | | Deprecate unused quoted_locking_column method. | kennyj | 2013-09-24 | 3 | -0/+9 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #12335 from francisgo/patch-1 | Steve Klabnik | 2013-09-24 | 1 | -2/+2 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Getting Started Guide: update RubyGems Guides link [ci skip] | ||||
| | | * | | | | Getting Started Guide: update RubyGems Guides link [ci skip] | Francis Go | 2013-09-24 | 1 | -2/+2 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #12329 from benmanns/docrails | Rafael Mendonça França | 2013-09-23 | 1 | -3/+3 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Update references to wycats/thor to erikhuda/thor. | ||||
| | | * | | | Update references to wycats/thor to erikhuda/thor. | Benjamin Manns | 2013-09-23 | 1 | -3/+3 |
| | |/ / / | |||||
| | * | | | Merge pull request #12325 from tjschuck/bcrypt_version_bump | Rafael Mendonça França | 2013-09-23 | 4 | -6/+6 |
| | |\ \ \ | | | | | | | | | | | Bump bcrypt-ruby version to support Ruby 2.0 on Windows | ||||
| | | * | | | bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows | T.J. Schuck | 2013-09-23 | 4 | -6/+6 |
| | | | | | | |||||
| | * | | | | Fix the model name in the association basics guides | Rafael Mendonça França | 2013-09-23 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | Merge pull request #12315 from gaurish/super | Rafael Mendonça França | 2013-09-23 | 1 | -26/+28 |
| | |\ \ \ \ | | |/ / / | |/| | | | TypeError: superclass mismatch for class PostgreSQLAdapter | ||||
| | | * | | | We shouldn't override PostgreSQLAdapter's superclass inheritance while ↵ | Gaurish Sharma | 2013-09-23 | 1 | -26/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | monkeypatching Changing Inheritance section leads to following error on JRuby TypeError: superclass mismatch for class PostgreSQLAdapter After this change, Jruby: The above error no longer appear. Tests are still failing but they do run. Progress! MRI: No change, all green(tested by running take test_test_postgresql) Thanks to Aditya Sanghi(@asanghi) for help | ||||
| | * | | | | Merge pull request #10773 from wangjohn/link_and_routing_options | Rafael Mendonça França | 2013-09-23 | 2 | -2/+16 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | Adding documentation and tests to ``polymorphic_url`` and ``link_to`` | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |