aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12290 from kennyj/fix_12278Andrew White2013-09-243-3/+28
|\ | | | | Closes #12278. AR::ConnectionAdapters::Column.string_to_time method respects string with timezone.
| * ActiveRecord::ConnectionAdapters::Column.string_to_time method respects ↵kennyj2013-09-253-3/+28
| | | | | | | | string with timezone. Closes #12278.
* | Merge pull request #12351 from francisgo/patch-2Rafael Mendonça França2013-09-241-1/+1
|\ \ | | | | | | Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tag
| * | Getting Started Guide: Hello Rails! -> Hello, Rails! and wrap code tagFrancis Go2013-09-251-1/+1
|/ /
* | Add CHANGELOG entry for #12344Rafael Mendonça França2013-09-241-0/+5
| | | | | | | | [ci skip]
* | Merge pull request #12344 from angelic/collection_check_boxes_with_nameRafael Mendonça França2013-09-242-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. Sciortino2013-09-242-1/+9
| | | | | | | | | | | | collection_check_boxes
* | | Add regression test to #12343Rafael Mendonça França2013-09-241-0/+5
| | |
* | | Merge pull request #12343 from wangjohn/fix_failing_agile_controller_testsRafael Mendonça França2013-09-241-0/+1
|\ \ \ | | | | | | | | | | | | assign_attributes should return if arguments are blank
| * | | assign_attributes should return if argument is blank.wangjohn2013-09-241-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-1Rafael Mendonça França2013-09-241-0/+1
|\ \ \ | | | | | | | | [Documentation] Add a missing validation to I18n docs
| * | | [Documentation] Add a missing validation to I18n docsGrayson Wright2013-09-241-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/masterRafael Mendonça França2013-09-241-1/+1
|\ \ \ | | | | | | | | added column type to example in section 2.3
| * | | added column type to example in section 2.3Ofer Nave2013-09-241-1/+1
| | | |
* | | | Merge pull request #12347 from macmartine/masterRafael Mendonça França2013-09-241-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix typo in number_to_human docs: you -> your
| * | | Fix typo in number_to_human docs: you -> yourMac Martine2013-09-241-1/+1
|/ / /
* | | Merge pull request #10822 from gaurish/poolXavier Noria2013-09-242-0/+13
|\ \ \ | | | | | | | | Add note about database connection pool in postgres template
| * | | Add notes about database connection pool [ci skip]Gaurish Sharma2013-09-222-0/+13
| | | |
* | | | No need the else clauseRafael Mendonça França2013-09-241-2/+0
| | | |
* | | | Use join to concat the both side of the ASTRafael Mendonça França2013-09-241-1/+2
| | | | | | | | | | | | | | | | Onf of the sides can be nil and it will raise a Conversion error
* | | | Merge pull request #12337 from rubys/route-formatter-testRafael Mendonça França2013-09-241-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | add test_scoped_root_as_name
| * | | | add test_scoped_root_as_nameSam Ruby2013-09-241-0/+13
| | | | | | | | | | | | | | | | | | | | test for regression introduced by https://github.com/rails/rails/pull/9155
* | | | | Merge pull request #12342 from gsamokovarov/web-console-changelogGuillermo Iguaran2013-09-241-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Add a CHANGELOG entry about Web Console inclusion
| * | | | Add a CHANGELOG entry about Web Console inclusionGenadi Samokovarov2013-09-241-0/+4
|/ / / /
* | | | Merge pull request #11667 from gsamokovarov/introduce-web-consoleGuillermo Iguaran2013-09-241-0/+3
|\ \ \ \ | |_|_|/ |/| | | Include web-console in new projects Gemfile
| * | | Include web-console in new projects GemfileGenadi Samokovarov2013-09-241-0/+3
|/ / /
* | | Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nilRafael Mendonça França2013-09-244-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.wangjohn2013-06-254-6/+25
| | | |
* | | | Merge pull request #11423 from kennyj/remove_quoted_locking_columnRafael Mendonça França2013-09-243-0/+9
|\ \ \ \ | | | | | | | | | | Remove unused quoted_locking_column method.
| * | | | Deprecate unused quoted_locking_column method.kennyj2013-09-243-0/+9
| | | | |
* | | | | Merge pull request #12335 from francisgo/patch-1Steve Klabnik2013-09-241-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Getting Started Guide: update RubyGems Guides link [ci skip]
| * | | | Getting Started Guide: update RubyGems Guides link [ci skip]Francis Go2013-09-241-2/+2
|/ / / /
* | | | Merge pull request #12329 from benmanns/docrailsRafael Mendonça França2013-09-231-3/+3
|\ \ \ \ | |_|/ / |/| | | Update references to wycats/thor to erikhuda/thor.
| * | | Update references to wycats/thor to erikhuda/thor.Benjamin Manns2013-09-231-3/+3
|/ / /
* | | Merge pull request #12325 from tjschuck/bcrypt_version_bumpRafael Mendonça França2013-09-234-6/+6
|\ \ \ | | | | | | | | Bump bcrypt-ruby version to support Ruby 2.0 on Windows
| * | | bcrypt-ruby v3.1.2 supports Ruby 2.0 on WindowsT.J. Schuck2013-09-234-6/+6
| | | |
* | | | Fix the model name in the association basics guidesRafael Mendonça França2013-09-231-1/+4
| | | | | | | | | | | | [ci skip]
* | | | Merge pull request #12315 from gaurish/superRafael Mendonça França2013-09-231-26/+28
|\ \ \ \ | |/ / / |/| | | TypeError: superclass mismatch for class PostgreSQLAdapter
| * | | We shouldn't override PostgreSQLAdapter's superclass inheritance while ↵Gaurish Sharma2013-09-231-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_optionsRafael Mendonça França2013-09-232-2/+16
|\ \ \ \ | | | | | | | | | | | | | | | Adding documentation and tests to ``polymorphic_url`` and ``link_to``
| * | | | Adding documentation to +polymorphic_url+wangjohn2013-06-132-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concerning the options that it inherits from +url_for+. The way that +polymorhpic_url+ is built allows it to have options like +:anchor+, +:script_name+, etc. but this is currently not documented.
* | | | | Merge pull request #11987 from wangjohn/schema_dumper_optionsRafael Mendonça França2013-09-231-5/+16
|\ \ \ \ \ | | | | | | | | | | | | Creating options for schema dumper.
| * | | | | Creating options for schema dumper.wangjohn2013-08-221-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options make it easier to change the config from ActiveRecord::Base to use something else inside of the SchemaDumper.
* | | | | | Merge pull request #12070 from wangjohn/small_refactors_to_generatorsRafael Mendonça França2013-09-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small refactoring changes to generators. Conflicts: railties/lib/rails/generators/rails/controller/controller_generator.rb
| * | | | | | Small refactoring changes to generators.wangjohn2013-08-292-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made a method name clearer (added a bang to the end to show that it mutates arguments) and extracted indentation into its own method.
* | | | | | | Merge pull request #12287 from bogdan/select-with-selected-optionRafael Mendonça França2013-09-233-1/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix some edge cases for select with selected option
| * | | | | | | Fix some edge cases for AV `select` helper with `:selected` optionBogdan Gusiev2013-09-233-1/+22
|/ / / / / / /
* | | | | | | Fix the documentation method.Rafael Mendonça França2013-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is reload! in the class definition. [ci skip]
* | | | | | | Expand select documentation to tell about the blockRafael Mendonça França2013-09-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Use ERB in the CHANGELOG [ci skip]Rafael Mendonça França2013-09-231-3/+5
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 08:33:12 +0000