aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Delete some stray linesJon Leighton2011-12-282-3/+0
|
* Revert "Merge pull request #4220 from bensie/singleton-class-master"Jon Leighton2011-12-281-1/+14
| | | | | | | This reverts commit 90df0d4f687596943bda108ab0b98dd99cacd46b, reversing changes made to 5e6fc81d63837559a393c173eade281ddeb687dd. Reason: build breakage
* Avoid deprecation warningJon Leighton2011-12-281-1/+1
|
* Support establishing connection on ActiveRecord::Model.Jon Leighton2011-12-2825-230/+251
| | | | | This is the 'top level' connection, inherited by any models that include ActiveRecord::Model or inherit from ActiveRecord::Base.
* Support configuration on ActiveRecord::Model.Jon Leighton2011-12-2828-222/+498
| | | | | | | | | | | | | | | The problem: We need to be able to specify configuration in a way that can be inherited to models that include ActiveRecord::Model. So it is no longer sufficient to put 'top level' config on ActiveRecord::Base, but we do want configuration specified on ActiveRecord::Base and descendants to continue to work. So we need something like class_attribute that can be defined on a module but that is inherited when ActiveRecord::Model is included. The solution: added ActiveModel::Configuration module which provides a config_attribute macro. It's a bit specific hence I am not putting this in Active Support or making it a 'public API' at present.
* Merge pull request #4207 from nashby/deprecate-base64-encode64sAaron Patterson2011-12-286-9/+15
|\ | | | | deprecate Base64.encode64s from AS
| * deprecate Base64.encode64s from AS. Use Base64.strict_encode64 insteadVasiliy Ermolovich2011-12-276-9/+15
| |
* | Add CHANGELOG entrySantiago Pastorino2011-12-281-0/+2
| |
* | Merge pull request #4220 from bensie/singleton-class-masterAaron Patterson2011-12-281-14/+1
|\ \ | | | | | | Further simplify singleton_class checking in class_attribute
| * | Further simplify singleton_class checking in class_attributeJames Miller2011-12-281-14/+1
|/ /
* | Merge pull request #4218 from bogdan/reset_runner_callbacksJosé Valim2011-12-281-6/+8
|\ \ | | | | | | Refactor AS::Callbacks
| * | Refactor AS::CallbacksBogdan Gusiev2011-12-281-6/+8
|/ / | | | | | | | | Extracted `__reset_runner` from `__define_runner` And call it in proper places
* | Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_valueJon Leighton2011-12-281-2/+5
|\ \ | | | | | | AR#where with an Array of 2 elements including a nil
| * | where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL"Akira Matsuda2011-12-281-1/+4
| | | | | | | | | | | | was "WHERE foo IN (1) OR foo IS NULL" before
| * | no need to compact an already compacted ArrayAkira Matsuda2011-12-281-1/+1
| |/
* | Bump to rack 1.4.0Santiago Pastorino2011-12-281-1/+1
| |
* | Merge pull request #4153 from ↵Jon Leighton2011-12-283-25/+81
|\ \ | |/ |/| | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test Fix a fixtures test case with table prefix/suffix
| * Use the correct table name from fixtureAlexey Muranov2011-12-281-2/+2
| | | | | | | | Fixed a bug in fixtures.rb where the table name was incorrectly inferred from the fixture path which was ambiguously called "table_name" but was also used as the fixture name. Now, the "correct" table name is taken from an instance variable.
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 13:04:37 +0000