Brian Lopez
42035fd112
move reload after touch
2010-08-02 15:10:34 -07:00
Brian Lopez
ab64499911
reload the owner model after update
2010-08-02 14:51:57 -07:00
Brian Lopez
954de9940b
Merge branch 'master' into mysql2
...
* master:
Bring returning back to ease migration.
Remove duplicated logic.
Eager loading an association should not change the count of children
fix loading of different elements in array then int and string [#5036 state:resolved]
Tidy up previous commit.
test and fix collection_singular_ids= with string primary keys [#5125 state:resolved]
Handle edge cases in the previous patch.
Improved how AppGenerator generates the application name. It now detects the current app name whenever possible. This means that renaming the residing directory will not effect the app name generated by AppGenerator.
ActiveModel::Errors json serialization to work as Rails 3b4 [#5254 state:resolved]
Add missing require in ActiveSupport::HashWithIndifferentAccess [#5189 state:resolved]
Add an internal (private API) after_touch callback. [#5271 state:resolved]
added failing touch propagation test
Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when using the deprecated syntax
Failing test to check for route file corruption if legacy map parameter is used. [#5263 state:open]
Corrected the rake test:units and test:functionals description [#5251 state:committed]
Use AS::OrderedHash when trusting in the order of the hash
Fix label form helper to use I18n and html options, without the need of 'nil' text param:
2010-08-02 13:30:08 -07:00
José Valim
88b5f938cf
Bring returning back to ease migration.
2010-08-02 18:40:20 +02:00
José Valim
9effe3cc18
Remove duplicated logic.
2010-08-02 17:20:17 +02:00
Neeraj Singh
009aa8825b
Eager loading an association should not change the count of children
...
[#4971 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com >
2010-08-02 17:12:59 +02:00
Josef Reidinger
59693c4c49
fix loading of different elements in array then int and string [ #5036 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com >
2010-08-02 17:06:09 +02:00
José Valim
e1344bf504
Tidy up previous commit.
2010-08-02 16:51:08 +02:00
Robert Pankowecki
f8b53f35b9
test and fix collection_singular_ids= with string primary keys [ #5125 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com >
2010-08-02 16:41:20 +02:00
José Valim
558ee6e95c
Handle edge cases in the previous patch.
2010-08-02 16:40:02 +02:00
Fred Wu
cdad483dff
Improved how AppGenerator generates the application name. It now detects the 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 >
2010-08-02 16:30:20 +02:00
Alex Le
aeaab06c79
ActiveModel::Errors json serialization to work as Rails 3b4 [ #5254 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com >
2010-08-02 16:26:32 +02:00
Chris Hoffman
59cf514a5b
Add missing require in ActiveSupport::HashWithIndifferentAccess [ #5189 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com >
2010-08-02 16:18:33 +02:00
José Valim
2dfeb7bc30
Merge branch 'master' of github.com:rails/rails
2010-08-02 16:17:34 +02:00
José Valim
b613c3cc7b
Add an internal (private API) after_touch callback. [ #5271 state:resolved]
2010-08-02 16:16:46 +02:00
Jakub Kuźma
311ea94f73
added failing touch propagation test
...
Signed-off-by: José Valim <jose.valim@gmail.com >
2010-08-02 15:56:49 +02:00
Santiago Pastorino
e6331b1e97
Makes rails destroy scaffold don't duplicate routes.draw do |map| |map| when using the deprecated syntax
...
[#5263 state:committed]
2010-08-02 10:55:09 -03:00
rohit
c544fcc8eb
Failing test to check for route file corruption if legacy map parameter is used. [ #5263 state:open]
2010-08-02 10:55:05 -03:00
Brian Lopez
2353e826b0
typo
2010-08-02 01:58:29 -07:00
Brian Lopez
21e81da335
update tests for mysql2 support
2010-08-02 01:37:57 -07:00
Prashant P. Shah
3b44b52fb0
Corrected the rake test:units and test:functionals description [ #5251 state:committed]
...
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com >
2010-08-01 22:17:15 -03:00
Santiago Pastorino
111234e7c1
Use AS::OrderedHash when trusting in the order of the hash
2010-08-01 21:56:06 -03:00
Carlos Antonio da Silva
11614bddc0
Fix label form helper to use I18n and html options, without the need of '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 >
2010-08-01 21:51:54 -03:00
Santiago Pastorino
fb0bd8c109
Makes form_helper use overriden model accessors
...
[#3374 state:committed]
2010-08-01 19:32:22 -03:00
Xavier Noria
f78de68649
explains Array.wrap directly, rather by comparison with Kernel#Array which is too obscure, leaves the comparison to document the differences, and adds a comparison with the related idiom that uses the splat operator
2010-08-01 03:19:58 +02:00
Johan Lundström
96f8325116
DHH forgot to remove JS, CSS in generated index.html [ #5261 state:resolved]
...
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com >
2010-07-31 20:38:12 -03:00
Xavier Noria
1d1f810d22
fixes typo
2010-07-31 17:28:16 +02:00
Xavier Noria
f7f5299ee6
use the same amount of left indent in all code blocks of README.rdoc
2010-07-31 12:06:00 +02:00
Xavier Noria
3d7099891f
Merge remote branch 'rails/master'
2010-07-31 11:55:24 +02:00
Xavier Noria
d3819daaac
README.rdoc is your first impression, make sure it is clean
...
* 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
2010-07-31 11:51:29 +02:00
Aaron Patterson
834e304b22
reverting where() functionality, adding a test
2010-07-30 14:12:01 -07:00
Aaron Patterson
ecfb252e7a
fewer method calls, using faster methods when possible
2010-07-30 14:05:26 -07:00
Aaron Patterson
d1c53a9ad2
reducing function calls and using faster methods for testing
2010-07-30 13:38:09 -07:00
Xavier Noria
87a28e34ae
if there's a Gemfile and doc:guides can't load RedCloth, print instructions for bundler
2010-07-30 21:50:53 +02:00
Xavier Noria
05e0fa9cfb
the main page of the API generated by the doc:rails task is README
2010-07-30 21:50:53 +02:00
Santiago Pastorino
5132081975
AS gem doesn't depend on nokogiri so shows a nicer error if users haven't installed
2010-07-30 16:05:51 -03:00
Neeraj Singh
0e20e3ebc2
returns not returned . fixing documentation for reflection
2010-07-30 14:43:43 -04:00
Arkadiusz Holko
8828651420
Command Line Guide: changes all 'rails app' commands to 'rails new app'
2010-07-30 09:19:01 -07:00
Santiago Pastorino
95e9ced581
Make options an attr_reader
2010-07-30 12:09:47 -03:00
Steve Agalloco
b823e50a54
fix for rails app generator when using --pretend option
...
[#5245 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com >
2010-07-30 11:55:07 -03:00
Rohit Arondekar
48d85a61bc
API Docs: Use 'HTTP_AUTHORIZATION' and not :authorize as key in integration tests.
2010-07-30 02:12:35 -07:00
Carl Lerche
d277b823d0
Add another missing require in 'active_support/inflector/inflections'
2010-07-29 22:53:21 -07:00
Santiago Pastorino
03fc2f03cb
Bump up bundler version to rc.2
2010-07-29 23:48:47 -03:00
Santiago Pastorino
e68e88e3ad
This version is going to be outdated when new nokogiri versions are released
2010-07-29 23:46:25 -03:00
Santiago Pastorino
55028a7326
Bump up nokogiri to 1.4.3.1
2010-07-29 23:44:31 -03:00
Tarmo Tänav
2ea922bcec
Don't increment and then decrement the same counter when re-assigning a belongs_to association
...
[#2786 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com >
2010-07-29 22:37:20 -03:00
Xavier Noria
ccd45618ed
Merge remote branch 'rails/master'
2010-07-30 02:35:24 +02:00
Xavier Noria
755af49755
edit pass to apply API guideline wrt the use of "# =>" in example code
2010-07-30 02:30:04 +02:00
Aaron Patterson
a7a6a2ff46
got the ternary backwards. somehow the sqlite tests passed!
2010-07-29 16:08:30 -07:00
Aaron Patterson
f171bc64a2
PERF: avoiding splat args and reducing function calls
2010-07-29 14:55:57 -07:00
