Brian Rose
bd89946dd3
Ensure option for select helper responds to #first before comparison.
2011-12-20 13:26:10 -07:00
Santiago Pastorino
cf2d31ab0b
Merge pull request #4069 from arunagw/issue_4067
...
It should be README.rdoc
2011-12-20 10:17:40 -08:00
Arun Agrawal
490c00baeb
It should be README.rdoc fixes #4067
2011-12-20 23:36:03 +05:30
José Valim
437f1e0af1
Merge pull request #4064 from nashby/date-helper-field-error-proc
...
fix adding field_with_errors to date selects, closes #3487
2011-12-20 09:43:58 -08:00
Vasiliy Ermolovich
92088131ac
fix adding field_with_errors to date selects, closes #3487
2011-12-20 20:25:56 +03:00
Alex Tambellini
fec2999e65
Fix reference to old :sql schema_format location
...
After 15fb430 the default location of the :sql schema_format location was
changed from environment_name.sql to structure.sql. This pull request updates
a reference to the old schema format location in the migration guides.
2011-12-20 22:27:33 +05:30
Hendy Tanata
e149d5059b
Improve doc for ActiveRecord::Base.unscoped.
2011-12-20 22:27:32 +05:30
José Valim
51e8adba43
Depend on 3-2-stable.
2011-12-20 17:15:53 +01:00
José Valim
f29b4a02fd
Add a test case for layout nil.
2011-12-20 14:56:18 +01:00
lest
e97aa2c22c
remove warnings about @variable_for_layout
...
Signed-off-by: José Valim <jose.valim@gmail.com >
2011-12-20 14:24:01 +01:00
José Valim
2305a98f7a
Check if source is encoding aware.
2011-12-20 12:39:28 +01:00
José Valim
2e0050ce5c
Do not hard code encoding to UTF8
2011-12-20 11:56:38 +01:00
Xu Pan
1897be9b50
don't encode an UTF-8 encoded template
...
Signed-off-by: José Valim <jose.valim@gmail.com >
2011-12-20 11:56:33 +01:00
José Valim
5d913640bc
Remove i18n dependencies from AP and AMo since they are in AS.
2011-12-20 11:56:22 +01:00
David Heinemeier Hansson
9d6e52b55e
Party like its R-C-UNO!
2011-12-19 18:34:57 -06:00
David Heinemeier Hansson
1e941dde7c
Add an invitation to use jbuilder, since we are not going to bundle it in 3.2
2011-12-19 18:27:19 -06:00
Piotr Sarnacki
61d0de2009
Merge pull request #4036 from Juanmcuello/database_tasks
...
Fix database tasks in test namespace.
2011-12-19 13:44:24 -08:00
Aaron Patterson
9d0789c415
adding tests for #4029
2011-12-19 13:34:54 -08:00
Juan M. Cuello
626c881863
Fix database tasks in test namespace.
...
This is mostly the same as 876bade599
that was reverted due to test failures, but now with a correction.
2011-12-19 18:20:17 -03:00
Vasiliy Ermolovich
024d3b9fcc
add failing tests for issue #3487
2011-12-19 21:55:37 +03:00
José Valim
3c1884e7dd
Revert "Merge pull request #4030 from Juanmcuello/database_tasks"
...
This reverts commit a0edfb4d20 , reversing
changes made to 4012fcff22 .
2011-12-19 19:31:36 +01:00
José Valim
a0edfb4d20
Merge pull request #4030 from Juanmcuello/database_tasks
...
Fix database tasks in test namespace.
2011-12-19 09:43:37 -08:00
Juan M. Cuello
876bade599
Fix database tasks in test namespace.
2011-12-19 13:52:27 -03:00
Jon Leighton
4012fcff22
Don't notify campfire when the build keeps passing
2011-12-18 23:37:05 +00:00
Vijay Dev
c59409b838
fix a minor typo
2011-12-19 01:31:12 +05:30
José Valim
e8d69437d4
Update activerecord/lib/active_record/railties/databases.rake
2011-12-18 20:56:59 +01:00
José Valim
81deb346af
Merge pull request #4019 from kommen/rake_db_structure
...
Make structure.sql file configureable in db:structure:dump analog to SCHEMA in db:schema:dump
2011-12-18 11:54:11 -08:00
Dieter Komendera
a2249eee76
Rename STRUCTURE to DB_STRUCTURE, update dump task description and add simple testcase.
2011-12-18 20:43:36 +01:00
Jon Leighton
de2306f10c
Merge pull request #4014 from lest/bypass-preloading-for-ids-reader
...
bypass preloading for ids_reader
2011-12-18 09:42:15 -08:00
Jon Leighton
81c67c1441
Merge pull request #4011 from lest/scope-with-lambda-duplicates
...
call scope within unscoped to prevent duplication of where values
2011-12-18 09:35:06 -08:00
José Valim
1214e16640
Merge pull request #4018 from arunagw/warning_removed_
...
Warning removed in test
2011-12-18 00:09:52 -08:00
Arun Agrawal
ff502d9601
Warning removed in test
2011-12-18 13:37:07 +05:30
Sergey Nartimov
109db5a550
bypass preloading for ids_reader
...
when fetching ids for a collection, bypass preloading
to avoid the unnecessary performance overhead
2011-12-18 10:59:24 +03:00
José Valim
5da792711b
Merge pull request #4017 from arunagw/remove_extra_require
...
No need 'abstract_unit' here. It's already in 'generators_test_helper'
2011-12-17 23:56:25 -08:00
Arun Agrawal
1e50af9b6f
No need 'abstract_unit' here. It's already in 'generators_test_helper'
2011-12-18 13:23:54 +05:30
Piotr Sarnacki
fe72f7d8c5
Merge pull request #4009 from kirs/generate-rake-task
...
Rake tasks generator
2011-12-17 14:05:26 -08:00
José Valim
d2951eb089
Merge pull request #4015 from schneems/schneems/routing_error_help
...
Add Help Text to Routing Error
2011-12-17 12:42:21 -08:00
schneems
921dcc2570
add help text to routing error
...
When a newcomer hits the routing error page they
are often confused about how to trouble shoot the
next step. Adding a simple help text can gently
remind coders where to get more help.
2011-12-17 14:23:40 -06:00
Santiago Pastorino
7bde2e2578
Add campfire notifications for travis
2011-12-17 13:05:14 -02:00
José Valim
941213040b
Merge pull request #4012 from JustinCampbell/master
...
Allow symbols to be passed as extension aliases in Mime::Type.register
2011-12-17 05:58:18 -08:00
Justin Campbell
27f3619cd5
Add test for register_alias
2011-12-17 07:52:47 -05:00
Kir
5e68fed450
Rake tasks generator with test
2011-12-17 16:42:35 +04:00
Justin Campbell
a87690b02c
Add test for type aliases
2011-12-17 07:40:54 -05:00
Justin Campbell
4d5266e270
Allow symbols to be passed for extension aliases
2011-12-17 07:40:25 -05:00
José Valim
8de96949e9
Use gem versions of sass-rails and coffee-rails.
2011-12-17 12:58:11 +01:00
Sergey Nartimov
04cea56d89
call scope within unscoped to prevent duplication of where values
2011-12-17 14:41:17 +03:00
José Valim
1bfed9efb3
Merge pull request #4010 from arunagw/fix_test_activemodel
...
Fixed test "ArgumentError: wrong number of arguments(1 for 0)"
2011-12-17 03:23:15 -08:00
Arun Agrawal
4fac64b1cc
Fixed test "ArgumentError: wrong number of arguments(1 for 0)"
2011-12-17 16:49:01 +05:30
José Valim
3346de600f
Merge pull request #4008 from arunagw/warning_variable_for_layout
...
warning removed "warning: instance variable @variable_for_layout not ini...
2011-12-16 22:57:02 -08:00
Arun Agrawal
23334be5b8
warning removed "warning: instance variable @variable_for_layout not initialized"
2011-12-17 12:00:57 +05:30