aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix a fixtures test case with table prefix/suffixAlexey Muranov2011-12-272-23/+79
| | | | | | | | | | | | | | | | Make sure the table name of a model is reset in a test case after assigning ActiveRecord::Base.table_name_prefix and ActiveRecord::Base.table_name_suffix.
* | | | Merge pull request #4201 from arunagw/no_worry_about_1.9.2Santiago Pastorino2011-12-271-2/+1
|\ \ \ \ | | | | | | | | | | Revert "This conditions is required to work with database create task.
| * | | | Revert "This conditions is required to work with database create task. 1.9.2 ↵Arun Agrawal2011-12-271-2/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | is having a bug with "Calling return within begin still executes else". " No need to worry about 1.9.2 with master This reverts commit fbf4bee6ed3682b361d6fbeca8e185e665e26b81.
* | | | Merge pull request #4198 from castlerock/remove_GC_checks_for_ruby19Santiago Pastorino2011-12-271-10/+4
|\ \ \ \ | | | | | | | | | | remove conditions for GC::Profiler in ruby19
| * | | | remove conditions for GC::Profiler in ruby19Vishnu Atrai2011-12-271-10/+4
| |/ / /
* | | | Merge pull request #4199 from cibernox/patch-1José Valim2011-12-261-3/+1
|\ \ \ \ | |/ / / |/| | | Removed RUBY_ENGINE checks for ruby18
| * | | Removed RUBY_ENGINE checks for ruby18Miguel Camba2011-12-271-3/+1
|/ / /
* | | Merge pull request #4195 from castlerock/remove_19_condition_for_GC_ProfilerSantiago Pastorino2011-12-261-9/+6
|\ \ \ | | | | | | | | GC::Profiler available in ruby19
| * | | GC::Profiler available in ruby19Vishnu Atrai2011-12-271-9/+6
| | | |
* | | | Merge pull request #4197 from nashby/refactor-range-includeJosé Valim2011-12-261-3/+1
|\ \ \ \ | | | | | | | | | | refactor Range#include? for range value
| * | | | refactor Range#include? for range valueVasiliy Ermolovich2011-12-261-3/+1
| |/ / /
* | | | Merge pull request #4194 from castlerock/remove_18_test_supportJosé Valim2011-12-262-112/+2
|\ \ \ \ | |/ / / |/| | | remove ForClassicTestUnit support for ruby 1.8 in performance and setup and teardown
| * | | remove ForClassicTestUnit support for ruby 1.8Vishnu Atrai2011-12-262-112/+2
|/ / /
* | | Merge pull request #4193 from nashby/remove-old-rexml-security-fixJosé Valim2011-12-262-48/+0
|\ \ \ | | | | | | | | remove rexml security fix for rubies 1.8
| * | | remove rexml security fix for rubies 1.8Vasiliy Ermolovich2011-12-262-48/+0
|/ / /
* | | Refactor RouteInspectorPiotr Sarnacki2011-12-261-32/+69
| | |
* | | Merge pull request #4150 from Karunakar/new_PRSantiago Pastorino2011-12-265-8/+9
|\ \ \ | | | | | | | | change Log
| * | | Moving to logger methods to ActiveSupport LoggerKarunakar (Ruby)2011-12-244-7/+8
| | | |
| * | | change LogKarunakar (Ruby)2011-12-241-1/+1
| | | |
* | | | Revert "Merge pull request #4154 from nashby/include-blank-date-helper"Piotr Sarnacki2011-12-262-22/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 76f0fa6066b78cd8f0e139dff4a7b65c96db5778, reversing changes made to 28cd098d99c52486aecb72aab39105d8abcd52ad.
* | | | Merge pull request #4154 from nashby/include-blank-date-helperPiotr Sarnacki2011-12-262-2/+22
|\ \ \ \ | | | | | | | | | | a prompt string in include_blank option for date helpers
| * | | | add ability to set a prompt string in include_blank option for date helpers, ↵Vasiliy Ermolovich2011-12-242-2/+22
| | | | | | | | | | | | | | | | | | | | closes #4143
* | | | | Correctly display rack apps with dynamic constraints in RoutesInspectorPiotr Sarnacki2011-12-263-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you used dynamic constraint like that: scope :constraint => MyConstraint.new do mount RackApp => "/foo" end routes were not displayed correctly when using `rake routes`. This commit fixes it. If you want nice display of dynamic constraints in `rake routes` output, please just override to_s method in your constraint's class.
* | | | | Merge pull request #4118 from nashby/remove-file-to-pathXavier Noria2011-12-266-15/+2
|\ \ \ \ \ | | | | | | | | | | | | remove File#to_path alias
| * | | | | remove File#to_path aliasVasiliy Ermolovich2011-12-256-15/+2
| | | | | |
* | | | | | Merge pull request #4188 from castlerock/remove_1.8_testJosé Valim2011-12-251-17/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Test::Unit::Util::BacktraceFilter not available in ruby19 test/unit
| * | | | | | Test::Unit::Util::BacktraceFilter not available in ruby19 test/unitVishnu Atrai2011-12-261-17/+0
| |/ / / / /
* | | | | | Merge pull request #4189 from bogdan/non_keyed_callbacksJosé Valim2011-12-251-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | AS::Callbacks: improved __define_runner performance
| * | | | | AS::Callbacks: improved __define_runner performanceBogdan Gusiev2011-12-251-3/+2
|/ / / / /
* | | | | removes the compatibility method Module#method_namesXavier Noria2011-12-255-13/+3
| | | | |
* | | | | removes the compatibility method Module#instance_method_namesXavier Noria2011-12-254-15/+7
| | | | |
* | | | | Merge pull request #4187 from castlerock/basic_object_in_19José Valim2011-12-251-16/+9
|\ \ \ \ \ | | | | | | | | | | | | ::BasicObject always defined in ruby 19
| * | | | | ::BasicObject always defined in ruby 19Vishnu Atrai2011-12-261-16/+9
|/ / / / /
* | | | | Merge pull request #4186 from lest/remove-1-8-codeXavier Noria2011-12-251-11/+6
|\ \ \ \ \ | | | | | | | | | | | | ruby 1.9 returns method names as symbols
| * | | | | ruby 1.9 returns method names as symbolsSergey Nartimov2011-12-251-11/+6
|/ / / / /
* | | | | Merge pull request #4185 from nashby/module-anonymousXavier Noria2011-12-252-7/+3
|\ \ \ \ \ | | | | | | | | | | | | Module#name returns nil for anonymous class in ruby 1.9
| * | | | | Module#name returns nil for anonymous class in ruby 1.9Vasiliy Ermolovich2011-12-252-7/+3
|/ / / / /
* | | | | add back the version info to the title in guides index pageVijay Dev2011-12-251-1/+1
| | | | |
* | | | | Merge pull request #4184 from lest/remove-1-8-codeJosé Valim2011-12-251-20/+0
|\ \ \ \ \ | | | | | | | | | | | | remove date methods that are present in 1.9 ruby
| * | | | | remove date methods that are present in 1.9 rubySergey Nartimov2011-12-251-20/+0
|/ / / / /
* | | | | Merge pull request #4183 from nashby/blockless-step-rangeJosé Valim2011-12-251-21/+5
|\ \ \ \ \ | | | | | | | | | | | | remove useless 1.8 ruby code from Range#step
| * | | | | remove useless 1.8 ruby code from Range#step, because Range#step without ↵Vasiliy Ermolovich2011-12-251-21/+5
| | |_|_|/ | |/| | | | | | | | | | | | | block always returns enumerator
* | | | | Merge pull request #4182 from bogdan/non_keyed_callbacksJosé Valim2011-12-251-10/+11
|\ \ \ \ \ | | | | | | | | | | | | AS::Callbacks: improve __define_runner perfomance for non-keyed callbacks.
| * | | | | AS::Callbacks: improve __define_runner perfomanceBogdan Gusiev2011-12-251-10/+11
| | | | | |
* | | | | | Some fixes in rails guides generationVijay Dev2011-12-252-11/+9
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Passing edge information to the views fixes the lack of the edge badge and sets the appropriate welcome page on edgeguides.rubyonrails.org. * Changes in the welcome message to hyper link the rails tree based on the version. * Mention the Amazon url from where kindlegen can be downloaded.
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-259-13/+25
|\ \ \ \ \
| * | | | | Clarify what persisted? returns.Uģis Ozols2011-12-251-2/+2
| | | | | |
| * | | | | Remove extra 'be'.Uģis Ozols2011-12-251-1/+1
| | | | | |
| * | | | | Revert "Changelog release dates fixed according to rubygems.org"Vijay Dev2011-12-243-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ae60475a41cb0f5b3f7e071b75a0b5c5214c9f85. Reason: Changelogs are not meant to be edited in docrails.
| * | | | | Changelog release dates fixed according to rubygems.orgJosef Šimánek2011-12-243-7/+7
| | | | | |