aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1556 from thoefer/masterJosé Valim2011-06-083-5/+17
|\ | | | | Brought back alternative convention for namespaced models in i18n
| * Brought back alternative convention for namespaced models in i18n.thoefer2011-06-083-5/+17
|/
* Merge pull request #1550 from ↵Xavier Noria2011-06-081-2/+2
|\ | | | | | | | | rsim/fix_test_has_many_with_pluralize_table_names_false Do not hardcode :id as it was ignored by mass assignment filter
| * Do not hardcode :id as it was ignored by mass assignment filterRaimonds Simanovskis2011-06-081-2/+2
|/ | | As a result test was failing on Oracle where ids are assigned by default from 1000
* Merge pull request #1549 from neerajdotname/rename_to_method_for_actionJosé Valim2011-06-081-2/+2
|\ | | | | test name should reflect the name of the method
| * test name should reflect the name of the methodNeeraj Singh2011-06-081-2/+2
| | | | | | | | that is actually being called
* | Merge pull request #1548 from neerajdotname/remove_class_me5José Valim2011-06-081-6/+0
|\ \ | | | | | | remove unused class from test
| * | remove unused class from testNeeraj Singh2011-06-081-6/+0
| |/
* | Merge pull request #1547 from sikachu/safebufferJosé Valim2011-06-073-5/+10
|\ \ | |/ |/| Fix ActionPack tests on `master`
| * Fix failing test on uninitialized `Rails.config.assets.prefix`Prem Sichanugrist2011-06-081-0/+1
| | | | | | | | This was introduced in [2684f17a17e4f97bdb89d20b4cd08585235263a2] :bomb:
| * Add proper fix to `mail_to` helper.Prem Sichanugrist2011-06-081-2/+2
| | | | | | | | | | * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer` * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
| * Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform ↵Prem Sichanugrist2011-06-081-3/+7
| | | | | | | | | | | | cloning before manipulation only on `OutputBuffer`. After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost.
* | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebufferJosé Valim2011-06-071-1/+2
|\ \ | | | | | | Don't operate on the safebuffer, operate on a string and convert.
| * | Don't operate on the safebuffer, operate on a string and convert.Christopher Meiklejohn2011-06-071-1/+2
| | |
* | | Merge pull request #1535 from smartinez87/eachJosé Valim2011-06-071-1/+1
|\ \ \ | |_|/ |/| | Prefer 'each' over 'for in' syntax.
| * | Prefer 'each' over 'for in' syntax.Sebastian Martinez2011-06-071-1/+1
| |/
* | remove warning: assigned but unused variableSantiago Pastorino2011-06-0820-26/+16
| |
* | ruby-prof doesn't work in 1.9.3Santiago Pastorino2011-06-081-1/+2
| |
* | Merge pull request #1539 from cmeiklejohn/fix_safe_buffer_in_fragment_cachingAaron Patterson2011-06-071-1/+3
|\ \ | |/ |/| Fragment caching needs to operate on the pure output, not the safebuffer.
| * Fragment caching needs to operate on the pure output, not theChristopher Meiklejohn2011-06-071-1/+3
|/ | | | safebuffer.
* Ensure that the strings returned by SafeBuffer#gsub and friends aren't ↵Michael Koziarski2011-06-072-0/+25
| | | | | | | | | | 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
* Allow polymorphic has_one to work when the association is set before the ↵Jon Leighton2011-06-082-3/+12
| | | | owner has been saved. Fixes #1524.
* When you add a record to a polymorphic has_one, you should be able to access ↵Jon Leighton2011-06-083-3/+6
| | | | the owner from the associated record
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-083-64/+80
|\
| * fix spacingVijay Dev2011-06-081-1/+1
| |
| * Add action_mailer observer and interceptors configuration optionsPaco Guzman2011-06-072-5/+15
| |
| * add missing generator configsVijay Dev2011-06-081-3/+7
| |
| * proof reading and fixes in configuring guideVijay Dev2011-06-081-55/+57
| |
| * fix indents and a code error in caching guideVijay Dev2011-06-081-4/+4
| |
* | Merge pull request #1533 from alexandrz/masterXavier Noria2011-06-071-1/+1
|\ \ | | | | | | Fix typo
| * | fix typoAlexandr Zykov2011-06-081-1/+1
|/ /
* / Update asset helpers to use `config.assets.prefix` Joshua Peek2011-06-071-2/+2
|/ | | Fixes #1489
* mention assets:clean in railties CHANGELOGXavier Noria2011-06-071-0/+2
|
* sprockets gzips assets nowXavier Noria2011-06-071-1/+4
|
* This way asserting that updated_at was changed in touch look more obvious.Dmitriy Kiriyenko2011-06-071-0/+1
|
* Do not use default_scope in ActiveRecord::Persistence#touch.Dmitriy Kiriyenko2011-06-072-1/+10
|
* Merge pull request #1516 from guilleiguaran/rack-urlmap-fixJosé Valim2011-06-072-1/+5
|\ | | | | Rails::Server#app should be nice with Rack::URLMap
| * Fixing Rails::Server#app under Rack::URLMapGuillermo Iguaran2011-06-072-1/+5
|/
* adds missing requireXavier Noria2011-06-071-0/+2
|
* Fix a couple of helper requires that were missed. This was causing the tests ↵Jon Leighton2011-06-072-2/+2
| | | | to fail to run on 1.8.7.
* Merge pull request #1474 from ganeshkumar/update_column_changesJosé Valim2011-06-071-0/+9
|\ | | | | added tests for update_column
| * added more tests for update_columnganesh2011-06-041-0/+9
| |
* | make sure AR isolated tests set the environment variableAaron Patterson2011-06-061-1/+2
| |
* | Added missing assert to test checking form with namespaced isolated model ↵Piotr Sarnacki2011-06-072-6/+6
| | | | | | | | and fixed helpers to work correctly in such case
* | oops! add parens so the block is properly boundAaron Patterson2011-06-061-1/+1
| |
* | set the environment variable from the rake fileAaron Patterson2011-06-0618-18/+6
| |
* | more oracle fixesAaron Patterson2011-06-061-1/+1
| |
* | do not muck with the load path, that is the test task responsibilityAaron Patterson2011-06-061-6/+0
| |
* | updating configs for oracleAaron Patterson2011-06-062-20/+14
| |
* | add test to the include pathAaron Patterson2011-06-061-0/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:34:14 +0000