aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Bring returning back to ease migration.José Valim2010-08-022-0/+44
| | |
* | | Remove duplicated logic.José Valim2010-08-021-7/+9
| | |
* | | Eager loading an association should not change the count of childrenNeeraj Singh2010-08-026-0/+42
| | | | | | | | | | | | | | | | | | [#4971 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | fix loading of different elements in array then int and string [#5036 ↵Josef Reidinger2010-08-022-3/+15
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Tidy up previous commit.José Valim2010-08-023-18/+16
| | |
* | | test and fix collection_singular_ids= with string primary keys [#5125 ↵Robert Pankowecki2010-08-024-3/+46
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Handle edge cases in the previous patch.José Valim2010-08-021-1/+2
| | |
* | | Improved how AppGenerator generates the application name. It now detects the ↵Fred Wu2010-08-022-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | current app name whenever possible. This means that renaming the residing directory will not effect the app name generated by AppGenerator. [#5225 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 ↵Alex Le2010-08-023-6/+22
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Add missing require in ActiveSupport::HashWithIndifferentAccess [#5189 ↵Chris Hoffman2010-08-021-0/+1
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Merge branch 'master' of github.com:rails/railsJosé Valim2010-08-022-1/+16
|\ \ \
| * | | Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when ↵Santiago Pastorino2010-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | using the deprecated syntax [#5263 state:committed]
| * | | Failing test to check for route file corruption if legacy map parameter is ↵rohit2010-08-021-0/+15
| | | | | | | | | | | | | | | | used. [#5263 state:open]
* | | | Add an internal (private API) after_touch callback. [#5271 state:resolved]José Valim2010-08-025-19/+24
| | | |
* | | | added failing touch propagation testJakub Kuźma2010-08-022-0/+19
|/ / / | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Corrected the rake test:units and test:functionals description [#5251 ↵Prashant P. Shah2010-08-011-1/+1
| | | | | | | | | | | | | | | | | | state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | Use AS::OrderedHash when trusting in the order of the hashSantiago Pastorino2010-08-011-2/+3
| | |
* | | Fix label form helper to use I18n and html options, without the need of ↵Carlos Antonio da Silva2010-08-012-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'nil' text param: Before: f.label :title, nil, :class => 'title' After : f.label :title, :class => 'title' [#5267 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * typoBrian Lopez2010-08-021-1/+1
| | |
| | * update tests for mysql2 supportBrian Lopez2010-08-0217-26/+467
| |/ |/|
* | Makes form_helper use overriden model accessorsSantiago Pastorino2010-08-012-3/+20
| | | | | | | | [#3374 state:committed]
* | explains Array.wrap directly, rather by comparison with Kernel#Array which ↵Xavier Noria2010-08-012-4/+48
| | | | | | | | is too obscure, leaves the comparison to document the differences, and adds a comparison with the related idiom that uses the splat operator
* | DHH forgot to remove JS, CSS in generated index.html [#5261 state:resolved]Johan Lundström2010-07-311-23/+0
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | fixes typoXavier Noria2010-07-311-1/+1
| |
* | use the same amount of left indent in all code blocks of README.rdocXavier Noria2010-07-311-2/+2
|/
* Merge remote branch 'rails/master'Xavier Noria2010-07-3119-56/+99
|\
| * README.rdoc is your first impression, make sure it is cleanXavier Noria2010-07-311-10/+19
| | | | | | | | | | | | | | * Removes spurious markup from code blocks * Integrates code blocks into ordinary paragraph flow * Change link to the Rails Tutorial so that it points directly to the book * Use proper RDoc markup for links
| * reverting where() functionality, adding a testAaron Patterson2010-07-302-4/+9
| |
| * fewer method calls, using faster methods when possibleAaron Patterson2010-07-301-5/+5
| |
| * reducing function calls and using faster methods for testingAaron Patterson2010-07-302-16/+10
| |
| * if there's a Gemfile and doc:guides can't load RedCloth, print instructions ↵Xavier Noria2010-07-301-1/+20
| | | | | | | | for bundler
| * the main page of the API generated by the doc:rails task is READMEXavier Noria2010-07-301-1/+1
| |
| * AS gem doesn't depend on nokogiri so shows a nicer error if users haven't ↵Santiago Pastorino2010-07-302-3/+13
| | | | | | | | installed
| * Make options an attr_readerSantiago Pastorino2010-07-301-6/+1
| |
| * fix for rails app generator when using --pretend optionSteve Agalloco2010-07-302-1/+7
| | | | | | | | | | | | [#5245 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Add another missing require in 'active_support/inflector/inflections'Carl Lerche2010-07-291-0/+1
| |
| * Bump up bundler version to rc.2Santiago Pastorino2010-07-293-3/+3
| |
| * This version is going to be outdated when new nokogiri versions are releasedSantiago Pastorino2010-07-292-2/+2
| |
| * Bump up nokogiri to 1.4.3.1Santiago Pastorino2010-07-292-3/+3
| |
| * Don't increment and then decrement the same counter when re-assigning a ↵Tarmo Tänav2010-07-292-1/+5
| | | | | | | | | | | | | | | | belongs_to association [#2786 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | returns not returned . fixing documentation for reflectionNeeraj Singh2010-07-301-28/+30
| |
* | Command Line Guide: changes all 'rails app' commands to 'rails new app'Arkadiusz Holko2010-07-301-6/+6
| |
* | API Docs: Use 'HTTP_AUTHORIZATION' and not :authorize as key in integration ↵Rohit Arondekar2010-07-301-1/+1
|/ | | | tests.
* Merge remote branch 'rails/master'Xavier Noria2010-07-3071-172/+303
|\
| * edit pass to apply API guideline wrt the use of "# =>" in example codeXavier Noria2010-07-3019-103/+104
| |
| * got the ternary backwards. somehow the sqlite tests passed!Aaron Patterson2010-07-291-1/+1
| |
| * PERF: avoiding splat args and reducing function callsAaron Patterson2010-07-291-8/+5
| |
| * link_to_function now expects a piece of javascript code for the onclick ↵Rodrigo Dominguez2010-07-291-4/+5
| | | | | | | | | | | | | | | | parameter [#5179] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Add a missing require in 'active_support/core_ext/string/inflections'Carl Lerche2010-07-291-0/+1
| |
| * Revert "Avoid uneeded queries in session stores if sid is not given."José Valim2010-07-293-5/+4
| | | | | | | | | | | | First step to merge Rails and Rack session stores. Rack always expects to receive the SID since it may have different behavior if the SID is nil. This reverts commit e210895ba95e498b9debbf43a3e5ae588bca81f0.