aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5861 from arunagw/multi_json_fix_3-2-stableJeremy Kemper2012-04-161-1/+1
|\ | | | | Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
| * multi_json is restricted to < 1.3 Arun Agrawal2012-04-161-1/+1
| | | | | | | | Some API changes are there above 1.3. 3-2-stable
* | Add missing require in Active Support time zones (fixes #5854)Piotr Sarnacki2012-04-151-0/+1
|/ | | | | I also removed the other require as it's already present in `activesupport/core_ext/time/calculations`
* "rails new -h" shows message in rails directoryask2012-04-132-3/+17
|
* fix typo in readme [ci skip]Vijay Dev2012-04-121-1/+1
|
* Fix code example in generator test casePrem Sichanugrist2012-04-121-2/+2
|
* Merge pull request #5820 from arunagw/more_ruby-2-0-fixesJeremy Kemper2012-04-121-1/+9
|\ | | | | Update test for Ruby 2 compatibility
| * test against ruby features in order to fix tests on Ruby 2.0Aaron Patterson2012-04-121-1/+9
|/
* Merge pull request #5800 from arunagw/bigdecimal_dupJeremy Kemper2012-04-102-3/+24
|\ | | | | Backport BigDecimal#duplicable? feature check from master
| * probably should require the objects we monkey patch.Aaron Patterson2012-04-101-0/+1
| |
| * bigdecimal can be duped on Ruby 2.0Aaron Patterson2012-04-102-2/+22
| | | | | | | | | | | | Conflicts: activesupport/test/core_ext/duplicable_test.rb
| * add the class name to the assertion messageAaron Patterson2012-04-101-1/+1
|/
* Merge pull request #5799 from arunagw/readme_fixVijay Dev2012-04-101-2/+2
|\ | | | | Readme fix
| * README fix! [skip ci]Arun Agrawal2012-04-101-2/+2
| |
* | Merge pull request #5725 from kevmoo/remove_unused_castcodeXavier Noria2012-04-091-2/+0
|\ \ | | | | | | Remove unused castcode
| * | Remove unused 'cast_code' variableKevin Moore2012-04-031-2/+0
| | |
* | | rewords the section about default_url_options in the Action Controller ↵Xavier Noria2012-04-091-3/+4
| |/ |/| | | | | Overview guide
* | Merge pull request #5784 from rafaelfranca/default_url-3-2Santiago Pastorino2012-04-083-4/+4
|\ \ | | | | | | [3-2-stable] Document that default_url_options must return a hash with symbolized keys
| * | Document that default_url_options must return a hash with symbolizedRafael Mendonça França2012-04-091-0/+1
| | | | | | | | | | | | keys
| * | default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-083-4/+3
| | |
* | | Fix 'Everyday Git' linkAnil Wadghule2012-04-071-1/+1
| | |
* | | Merge pull request #5765 from anildigital/3-2-stableVijay Dev2012-04-061-4/+4
|\ \ \ | |/ / |/| | Update getting started guide to change Rails version to Rails 3.2
| * | Fix Rails version in getting started guide.Anil Wadghule2012-04-061-4/+4
|/ /
* | Merge pull request #5737 from rafaelfranca/3-2-stableSantiago Pastorino2012-04-041-3/+1
|\ \ | | | | | | Fix tests of benchmark with silence equals to true
| * | Fix tests of benchmark with silence equals to trueRafael Mendonça França2012-04-041-3/+1
|/ /
* | Merge pull request #5188 from jlxw/patch-1Santiago Pastorino2012-04-041-1/+1
| | | | | | | | logger.silence is deprecated
* | Merge pull request #5727 from hone/ar_database_url_loggingAaron Patterson2012-04-032-0/+66
|\ \ | |/ |/| ActiveRecord configuration logging
| * log which config format AR uses to connect withTerence Lee2012-04-032-0/+23
| |
| * test initializer logic for DATABASE_URL env varTerence Lee2012-04-031-0/+43
|/
* DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
|
* Usage file in generators shouldn't be fetched only based on source_rootPiotr Sarnacki2012-04-023-5/+22
| | | | | | | | In case `source_roout` is not set, `default_source_root` is used, which includes also `templates` directory. If there is no `templates` directory, `default_source_root` is not available and USAGE will not be displayed. USAGE should be also checked based on default directory excluding `templates`.
* Fix the redirect when it receive blocks with arity of 1.Rafael Mendonça França2012-03-312-1/+17
| | | | Closes #5677
* Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_selectAaron Patterson2012-03-303-21/+29
|\ | | | | Fixing Identity Map when using find select in rails 3.2
| * refactor instantiate method in base, so we remove nesting if's which make ↵Arturo Pie2012-03-292-12/+19
| | | | | | | | | | | | | | | | the code harder to read. Minor changes to contain_all_columns in IdentityMap. Conflicts: activerecord/lib/active_record/base.rb
| * refactor the checking of the attributes of the record in IdentityMap#add, so ↵Arturo Pie2012-03-292-5/+12
| | | | | | | | it's more readable
| * Do not add record to identity map if the record doesn't have values for all ↵Arturo Pie2012-03-291-1/+1
| | | | | | | | the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
| * Adds a test that breaks IM when using #selectArturo Pie2012-03-291-12/+6
| |
* | Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-3010-9/+13
|\ \
| * | Bump up to 3.2.3Santiago Pastorino2012-03-309-9/+9
| | |
| * | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| | |
| * | Bumping to 3.2.3.rc2Santiago Pastorino2012-03-299-9/+9
| | |
| * | Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| | |
| * | Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| | |
| * | fix incorrect url in the deprecation message for vendor/plugins [ci skip]Vijay Dev2012-03-291-1/+1
| | |
| * | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
| | | | | | | | | | | | Closes #5632
| * | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
| | | | | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
| * | Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-285-14/+76
| | | | | | | | | | | | Embed auth token in remote forms
| * | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
| | | | | | | | | | | | Textarea newline fix breaks haml (3-2-stable)
* | | Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-303-2/+20
| | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/eager_test.rb
* | | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-13 16:34:31 +0000