Commit Graph

23238 Commits

Author SHA1 Message Date
Michael Koziarski
1300c03477 Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.

Conflicts:

	activesupport/test/safe_buffer_test.rb
2011-06-07 17:02:48 -07:00
Jon Leighton
7d1782a2c1 Allow polymorphic has_one to work when the association is set before the owner has been saved. Fixes #1524. 2011-06-08 00:32:49 +01:00
Jon Leighton
4f5f6a3257 When you add a record to a polymorphic has_one, you should be able to access the owner from the associated record 2011-06-08 00:32:49 +01:00
Xavier Noria
a1e78cfc36 Merge branch 'master' of git://github.com/lifo/docrails 2011-06-08 00:22:36 +02:00
Vijay Dev
645f003be7 fix spacing 2011-06-08 03:43:53 +05:30
Xavier Noria
97036eb5ba Merge pull request #1533 from alexandrz/master
Fix typo
2011-06-07 14:45:36 -07:00
Alexandr Zykov
4c3ec9889a fix typo 2011-06-08 03:31:33 +06:00
Joshua Peek
2684f17a17 Update asset helpers to use config.assets.prefix
Fixes #1489
2011-06-07 14:27:57 -07:00
Paco Guzman
5acf76d173 Add action_mailer observer and interceptors configuration options 2011-06-07 23:27:09 +02:00
Vijay Dev
366ffd8164 add missing generator configs 2011-06-08 02:25:19 +05:30
Vijay Dev
dc15a0f7d0 proof reading and fixes in configuring guide 2011-06-08 02:25:19 +05:30
Vijay Dev
0b09f84c91 fix indents and a code error in caching guide 2011-06-08 02:25:19 +05:30
Xavier Noria
c00da252b8 mention assets:clean in railties CHANGELOG 2011-06-07 22:03:15 +02:00
Xavier Noria
2d4115528f sprockets gzips assets now 2011-06-07 21:58:40 +02:00
Dmitriy Kiriyenko
8aabefb0b7 This way asserting that updated_at was changed in touch look more obvious. 2011-06-07 18:42:40 +01:00
Dmitriy Kiriyenko
7c1f73c843 Do not use default_scope in ActiveRecord::Persistence#touch. 2011-06-07 18:42:40 +01:00
José Valim
050d6ef060 Merge pull request #1516 from guilleiguaran/rack-urlmap-fix
Rails::Server#app should be nice with Rack::URLMap
2011-06-07 09:08:51 -07:00
Guillermo Iguaran
8496be7e11 Fixing Rails::Server#app under Rack::URLMap 2011-06-07 11:03:02 -05:00
Xavier Noria
72cca79d36 adds missing require 2011-06-07 12:06:02 +02:00
Jon Leighton
ad9586bf38 Fix a couple of helper requires that were missed. This was causing the tests to fail to run on 1.8.7. 2011-06-07 08:35:55 +01:00
José Valim
e32e8ed966 Merge pull request #1474 from ganeshkumar/update_column_changes
added  tests for update_column
2011-06-07 00:14:42 -07:00
Aaron Patterson
80451a1fa6 make sure AR isolated tests set the environment variable 2011-06-06 18:01:45 -07:00
Piotr Sarnacki
a6c5cc2377 Added missing assert to test checking form with namespaced isolated model and fixed helpers to work correctly in such case 2011-06-07 02:40:41 +02:00
Aaron Patterson
cd27cd5e49 oops! add parens so the block is properly bound 2011-06-06 17:00:08 -07:00
Aaron Patterson
8392f10b58 set the environment variable from the rake file 2011-06-06 16:51:45 -07:00
Aaron Patterson
424cf3b050 more oracle fixes 2011-06-06 15:47:29 -07:00
Aaron Patterson
517ca8771c do not muck with the load path, that is the test task responsibility 2011-06-06 15:47:26 -07:00
Aaron Patterson
841d29639b updating configs for oracle 2011-06-06 15:47:22 -07:00
Aaron Patterson
c8d124c0fc add test to the include path 2011-06-06 15:47:17 -07:00
Aaron Patterson
61774e0d49 please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT 2011-06-06 15:47:13 -07:00
Xavier Noria
6cf458823f Merge branch 'master' of git://github.com/lifo/docrails 2011-06-06 22:50:09 +02:00
Vijay Dev
1f272538bd add info about docrails policy on changelogs 2011-06-07 02:03:48 +05:30
Jon Leighton
445c0607f7 Don't ensure all keys in build_results are only written once, otherwise we get false positive builds reported. 2011-06-06 21:27:29 +01:00
Jon Leighton
499dec0102 Make sure that the build/drop database rake tasks take account of the test/config.yml config 2011-06-06 21:27:28 +01:00
Xavier Noria
5e21247131 Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
	activerecord/RUNNING_UNIT_TESTS
2011-06-06 22:23:30 +02:00
Xavier Noria
689e12b828 Revert "updated Changelog "
This reverts commit 79990505e5080804b53d81fec059136afa2237d7.

Conflicts:

	activerecord/CHANGELOG

Reason: Sorry, CHANGELOGs can't be edited via docrails.
2011-06-06 22:12:34 +02:00
Vijay Dev
5d8df14d6d comment the recorder methods 2011-06-07 01:38:03 +05:30
Vijay Dev
428883b579 up and down are no longer class methods in a migration 2011-06-07 01:23:08 +05:30
Vijay Dev
c5786a951e rearrange sections of the commandline guide giving more importance to rake tasks 2011-06-07 01:00:07 +05:30
Vijay Dev
660fb143fb document assets related rake tasks 2011-06-07 00:16:43 +05:30
Jon Leighton
38ad6bb2f5 Fix double definition of #teardown. Thanks @mike-burns 👍 2011-06-06 17:57:02 +01:00
Jon Leighton
afe1911228 Fix another CIfail 🔥 Deleting RAILS_ENV from ENV doesn't produce the desired result if RACK_ENV is still defined. And in any case it's better to be explicit here, so just set RALS_ENV=development. 2011-06-06 17:57:02 +01:00
Aaron Patterson
fe5a6ec45f remove call to source index 2011-06-06 09:52:40 -07:00
David Heinemeier Hansson
73b64bcd15 Use Latest Sprockets beta 2011-06-06 18:37:35 +02:00
Jon Leighton
62570e8626 Solve the RAILS_ENV problem in the railties tests in a more generic way 2011-06-06 13:54:05 +01:00
José Valim
2d3ba54b86 Merge pull request #1504 from arunagw/console_test_for_ci_server
Fix for CI server. Dependent on RAILS_ENV=development
2011-06-06 03:52:34 -07:00
Arun Agrawal
5d78d81222 Fix for CI server. Dependent on RAILS_ENV=development 2011-06-06 16:13:22 +05:30
Mariusz Pękala
c0c0a64ce6 Validations guide: order of :after_save callback was incorrect.
The guide was contracting itself. First it stated that 'there is a list
of callbacks in order of execution', on the list 'after_save' was placed
before 'after_create', and then there was a warning that 'after_save'
runs after them. I am not sure about 'around_' callbacks, but let's
leave that for another patch.
2011-06-06 11:51:18 +02:00
José Valim
38b97d289c Merge pull request #1497 from arunagw/framework_test
framework_test.rb also dependent on RAILS_ENV=development
2011-06-06 02:43:32 -07:00
Guillermo Iguaran
d3d5b048f9 Change http://api.rubyonrails.com to http://api.rubyonrails.org 2011-06-05 20:36:09 -07:00