aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | 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
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #11055 from bogdan/select-with-blockRafael Mendonça França2013-09-234-5/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to pass block to select form builder helper
| | * | | | | | | | | | | | Ability to pass block to AV#select helperBogdan Gusiev2013-09-234-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: = select(report, "campaign_ids") do - available_campaigns.each do |c| %option{:data => {:tags => c.tags.to_json}, :value => c.id}= c.name
| * | | | | | | | | | | | | No need to abbreviate ActiveModelRafael Mendonça França2013-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | Document reset_changes since it is part of public APIRafael Mendonça França2013-09-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | Merge pull request #10816 from bogdan/less-dirty-dirtyRafael Mendonça França2013-09-237-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library
| * | | | | | | | | | | | | Merge pull request #12321 from bogdan/time-with-zone-succRafael Mendonça França2013-09-231-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Changelog entry for pr #11474
| | * | | | | | | | | | | | Changelog entry for pr #11474Bogdan Gusiev2013-09-231-0/+5
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #12314 from JuanitoFatas/migrationsYves Senn2013-09-231-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Add `null` type modifier in migrations.md.
| | * | | | | | | | | | | | [ci skip] Add a type modifier in migrations.md.Juanito Fatas2013-09-221-0/+1
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |