aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4818 from arunagw/build_fix_isolatedJosé Valim2012-02-011-0/+1
|\ | | | | Build fix when running isolated test
| * Build fix when running isolated testArun Agrawal2012-02-011-0/+1
|/
* Merge pull request #4433 from carlosantoniodasilva/html-escape-onceJosé Valim2012-02-014-2/+35
|\ | | | | Html escape once
| * Move escaping regexps to constantsCarlos Antonio da Silva2012-02-011-2/+4
| |
| * Move escape_once logic to ERB::Util, where it belongs toCarlos Antonio da Silva2012-02-014-1/+32
|/ | | | | | All the logic is based on the HTML_ESCAPE constant available in ERB::Util, so it seems more logic to have the entire method there and just delegate the helper to use it.
* Merge pull request #4672 from carlosantoniodasilva/av-url-helperJosé Valim2012-02-012-31/+21
|\ | | | | Improvements on some url helper methods and tests
| * Refactor button_to to avoid calling method#to_s twiceCarlos Antonio da Silva2012-01-251-23/+13
| | | | | | | | | | Reorganize button_to implementation a bit. Also small refactor on current_page? method.
| * Change OrderedHash with array options to simple hash usageCarlos Antonio da Silva2012-01-251-8/+8
| |
* | Merge pull request #4808 from route/mb_chars_as_jsonJosé Valim2012-01-312-0/+7
|\ \ | | | | | | Added as_json method for multibyte strings
| * | Added as_json method for multibyte stringsDmitriy Vorotilin2012-02-012-0/+7
| | |
* | | Merge pull request #4799 from arunagw/warning_fixed_for_indentationsAaron Patterson2012-01-311-1/+1
|\ \ \ | |/ / |/| | warning removed: mismatched indentations
| * | warning removed: mismatched indentationsArun Agrawal2012-01-311-1/+1
| | |
* | | Revert "Merge pull request #4746 from jenslukowski/issue4718"Aaron Patterson2012-01-312-16/+1
| | | | | | | | | | | | | | | This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68.
* | | Merge pull request #4805 from xuanxu/none_and_null_object_patternJon Leighton2012-01-316-1/+71
|\ \ \ | | | | | | | | Added `none` query method to return zero records.
| * | | Added `none` query method to return zero records.Juanjo Bazán2012-01-316-1/+71
| | | | | | | | | | | | And added NullRelation class implementing the null object pattern for the `Relation` class.
* | | | QueryCache will just dup an AR::Result, AR::Result can deep copyAaron Patterson2012-01-312-9/+21
| | | |
* | | | always return the result set from select_allAaron Patterson2012-01-312-2/+2
| | | |
* | | | made the result set object act more like an arrayAaron Patterson2012-01-315-4/+24
| | | |
* | | | Merge pull request #4735 from arton/masterAaron Patterson2012-01-311-1/+5
|\ \ \ \ | | | | | | | | | | Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
| * | | | run direcly $0 if rake invoked by Windows batch file.arton2012-01-291-1/+5
| | | | |
* | | | | Merge pull request #4742 from petervandenabeele/masterAaron Patterson2012-01-311-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Set the timezone correctly for a test in activerecord/../base_test.rb
| * | | | | Set default_timezone explicitly for a test in activerecord/../base_test.rbPeter Vandenabeele2012-01-291-0/+3
| | | | | |
* | | | | | Merge pull request #4746 from jenslukowski/issue4718Aaron Patterson2012-01-312-1/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Test and fix for issue 4718
| * | | | | fix for Issue 4718Jens Lukowski2012-01-291-1/+8
| | | | | |
| * | | | | failing test case for Issue 4718Jens Lukowski2012-01-281-0/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #4803 from lucascaton/masterAaron Patterson2012-01-313-3/+5
|\ \ \ \ \ | | | | | | | | | | | | Remove slash from favicon_link_tag method attribute
| * | | | | Remove slash from favicon_link_tag method attributeLucas Caton2012-01-313-3/+5
|/ / / / /
* | | | | Merge pull request #4802 from carlosantoniodasilva/collection-helpers-refactorJosé Valim2012-01-313-14/+28
|\ \ \ \ \ | | | | | | | | | | | | Refactor select helper and remove eval
| * | | | | Remove eval calls, use send.. eval is evilCarlos Antonio da Silva2012-01-311-3/+3
| | | | | |
| * | | | | Refactor select tag form helpersCarlos Antonio da Silva2012-01-312-11/+25
| | |_|/ / | |/| | |
* | | | | Merge pull request #4791 from gregolsen/reflection_test_fixedJosé Valim2012-01-313-4/+4
|\ \ \ \ \ | | | | | | | | | | | | reflection test fixed
| * | | | | test_get_ids_for_ordered_association fixedgregolsen2012-01-312-2/+2
| | | | | |
| * | | | | reflection test fixedgregolsen2012-01-311-2/+2
| | | | | |
* | | | | | Merge pull request #4800 from rafaelfranca/remove-warningsJosé Valim2012-01-314-16/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove deprecation warnings from tests
| * | | | | | Remove deprecation warnings from testsRafael Mendonça França2012-01-313-13/+28
| | | | | | |
| * | | | | | Put spaces between the words at deprecation warningRafael Mendonça França2012-01-311-3/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4797 from kennyj/fix_4774José Valim2012-01-312-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix GH #4744. Don't run bundle install when executing `rails new app` with --pretend option
| * | | | | | Don't run bundle install when passed with --pretend optionkennyj2012-02-012-1/+6
| |/ / / / /
* | | | | | Merge pull request #4798 from ihower/fix_routing_typoJosé Valim2012-01-311-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix typo in routing documentation
| * | | | | Fix typo in routing documentationWen-Tien Chang2012-02-011-1/+1
|/ / / / /
* | | | | Merge pull request #4792 from rafaelfranca/build-fixJosé Valim2012-01-312-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Only add ActiveRecord configuration if it is present
| * | | | | Only add ActiveRecord configuration if it is presentRafael Mendonça França2012-01-312-1/+2
| |/ / / /
* | | | | to_proper_path -> to_partial_pathJosé Valim2012-01-311-1/+1
| | | | |
* | | | | Update actionpack/lib/action_view/renderer/partial_renderer.rbJosé Valim2012-01-311-2/+1
|/ / / /
* | | | Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-313-1/+6
|\ \ \ \ | | | | | | | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL)
| * | | | ids_reader method fixed, test added to has_many associationgregolsen2012-01-313-1/+6
| | | | |
* | | | | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_errorJon Leighton2012-01-3111-35/+157
|\ \ \ \ \ | | | | | | | | | | | | has_many/has_one, :dependent => :restrict, deprecation added
| * | | | | suggested fixes for :dependent => :restrict deprecation.Manoj2012-01-315-36/+16
| | | | | |
| * | | | | Same method for has_many and has_one associationsPaco Guzman2012-01-313-30/+17
| | | | | |
| * | | | | Easy dependent_restrict error messagePaco Guzman2012-01-312-4/+2
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 23:40:24 +0000