Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #4220 from bensie/singleton-class-master | Aaron Patterson | 2011-12-28 | 1 | -14/+1 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Further simplify singleton_class checking in class_attribute | |||||
| * | | | | | | | | | | Further simplify singleton_class checking in class_attribute | James Miller | 2011-12-28 | 1 | -14/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4218 from bogdan/reset_runner_callbacks | José Valim | 2011-12-28 | 1 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Refactor AS::Callbacks | |||||
| * | | | | | | | | | | Refactor AS::Callbacks | Bogdan Gusiev | 2011-12-28 | 1 | -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_value | Jon Leighton | 2011-12-28 | 1 | -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 Matsuda | 2011-12-28 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was "WHERE foo IN (1) OR foo IS NULL" before | |||||
| * | | | | | | | | | | no need to compact an already compacted Array | Akira Matsuda | 2011-12-28 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
* | | / / / / / / / | Bump to rack 1.4.0 | Santiago Pastorino | 2011-12-28 | 1 | -1/+1 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4153 from ↵ | Jon Leighton | 2011-12-28 | 3 | -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 fixture | Alexey Muranov | 2011-12-28 | 1 | -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/suffix | Alexey Muranov | 2011-12-27 | 2 | -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.2 | Santiago Pastorino | 2011-12-27 | 1 | -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 Agrawal | 2011-12-27 | 1 | -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_ruby19 | Santiago Pastorino | 2011-12-27 | 1 | -10/+4 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | remove conditions for GC::Profiler in ruby19 | |||||
| * | | | | | | | | | remove conditions for GC::Profiler in ruby19 | Vishnu Atrai | 2011-12-27 | 1 | -10/+4 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4199 from cibernox/patch-1 | José Valim | 2011-12-26 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Removed RUBY_ENGINE checks for ruby18 | |||||
| * | | | | | | | | Removed RUBY_ENGINE checks for ruby18 | Miguel Camba | 2011-12-27 | 1 | -3/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #4195 from castlerock/remove_19_condition_for_GC_Profiler | Santiago Pastorino | 2011-12-26 | 1 | -9/+6 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | GC::Profiler available in ruby19 | |||||
| * | | | | | | | | GC::Profiler available in ruby19 | Vishnu Atrai | 2011-12-27 | 1 | -9/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4197 from nashby/refactor-range-include | José Valim | 2011-12-26 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | refactor Range#include? for range value | |||||
| * | | | | | | | | | refactor Range#include? for range value | Vasiliy Ermolovich | 2011-12-26 | 1 | -3/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4194 from castlerock/remove_18_test_support | José Valim | 2011-12-26 | 2 | -112/+2 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | remove ForClassicTestUnit support for ruby 1.8 in performance and setup and teardown | |||||
| * | | | | | | | | remove ForClassicTestUnit support for ruby 1.8 | Vishnu Atrai | 2011-12-26 | 2 | -112/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #4193 from nashby/remove-old-rexml-security-fix | José Valim | 2011-12-26 | 2 | -48/+0 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | remove rexml security fix for rubies 1.8 | |||||
| * | | | | | | | | remove rexml security fix for rubies 1.8 | Vasiliy Ermolovich | 2011-12-26 | 2 | -48/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Refactor RouteInspector | Piotr Sarnacki | 2011-12-26 | 1 | -32/+69 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #4150 from Karunakar/new_PR | Santiago Pastorino | 2011-12-26 | 5 | -8/+9 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | change Log | |||||
| * | | | | | | | | Moving to logger methods to ActiveSupport Logger | Karunakar (Ruby) | 2011-12-24 | 4 | -7/+8 | |
| | | | | | | | | | ||||||
| * | | | | | | | | change Log | Karunakar (Ruby) | 2011-12-24 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Revert "Merge pull request #4154 from nashby/include-blank-date-helper" | Piotr Sarnacki | 2011-12-26 | 2 | -22/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 76f0fa6066b78cd8f0e139dff4a7b65c96db5778, reversing changes made to 28cd098d99c52486aecb72aab39105d8abcd52ad. | |||||
* | | | | | | | | | Merge pull request #4154 from nashby/include-blank-date-helper | Piotr Sarnacki | 2011-12-26 | 2 | -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 Ermolovich | 2011-12-24 | 2 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #4143 | |||||
* | | | | | | | | | | Correctly display rack apps with dynamic constraints in RoutesInspector | Piotr Sarnacki | 2011-12-26 | 3 | -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-path | Xavier Noria | 2011-12-26 | 6 | -15/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | remove File#to_path alias | |||||
| * | | | | | | | | | | remove File#to_path alias | Vasiliy Ermolovich | 2011-12-25 | 6 | -15/+2 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #4188 from castlerock/remove_1.8_test | José Valim | 2011-12-25 | 1 | -17/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Test::Unit::Util::BacktraceFilter not available in ruby19 test/unit | |||||
| * | | | | | | | | | | | Test::Unit::Util::BacktraceFilter not available in ruby19 test/unit | Vishnu Atrai | 2011-12-26 | 1 | -17/+0 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #4189 from bogdan/non_keyed_callbacks | José Valim | 2011-12-25 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | AS::Callbacks: improved __define_runner performance | |||||
| * | | | | | | | | | | AS::Callbacks: improved __define_runner performance | Bogdan Gusiev | 2011-12-25 | 1 | -3/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | removes the compatibility method Module#method_names | Xavier Noria | 2011-12-25 | 5 | -13/+3 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | removes the compatibility method Module#instance_method_names | Xavier Noria | 2011-12-25 | 4 | -15/+7 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #4187 from castlerock/basic_object_in_19 | José Valim | 2011-12-25 | 1 | -16/+9 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | ::BasicObject always defined in ruby 19 | |||||
| * | | | | | | | | | | ::BasicObject always defined in ruby 19 | Vishnu Atrai | 2011-12-26 | 1 | -16/+9 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4186 from lest/remove-1-8-code | Xavier Noria | 2011-12-25 | 1 | -11/+6 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | ruby 1.9 returns method names as symbols | |||||
| * | | | | | | | | | | ruby 1.9 returns method names as symbols | Sergey Nartimov | 2011-12-25 | 1 | -11/+6 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #4185 from nashby/module-anonymous | Xavier Noria | 2011-12-25 | 2 | -7/+3 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Module#name returns nil for anonymous class in ruby 1.9 | |||||
| * | | | | | | | | | | Module#name returns nil for anonymous class in ruby 1.9 | Vasiliy Ermolovich | 2011-12-25 | 2 | -7/+3 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | add back the version info to the title in guides index page | Vijay Dev | 2011-12-25 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #4184 from lest/remove-1-8-code | José Valim | 2011-12-25 | 1 | -20/+0 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | remove date methods that are present in 1.9 ruby | |||||
| * | | | | | | | | | | remove date methods that are present in 1.9 ruby | Sergey Nartimov | 2011-12-25 | 1 | -20/+0 | |
|/ / / / / / / / / / |