| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | remove conflict marker | Vijay Dev | 2011-12-23 | 1 | -1/+0 | |
| | | | ||||||
| * | | Make ActiveRecord::Relation#pluck work with serialized attributes | Jon Leighton | 2011-12-22 | 2 | -5/+12 | |
| | | | ||||||
| * | | Make read_attribute code path accessible at the class level | Jon Leighton | 2011-12-22 | 5 | -56/+48 | |
| | | | ||||||
| * | | Revert "Added Enumerable#pluck to wrap the common pattern of ↵ | Aaron Patterson | 2011-12-22 | 3 | -14/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | collect(&:method) *DHH*" This reverts commit 4d20de8a50d889a09e6f5642984775fe796ca943. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/core_ext/enumerable.rb activesupport/test/core_ext/enumerable_test.rb | |||||
| * | | Depend on 4.0.0.beta gems. Use https for github urls. | Jeremy Kemper | 2011-12-22 | 2 | -11/+11 | |
| | | | ||||||
| * | | Merge pull request #4135 from nashby/deprecate-uniq-by | José Valim | 2011-12-22 | 2 | -12/+22 | |
| |\ \ | | | | | | | deprecate Array#uniq_by and Array#uniq_by! | |||||
| | * | | deprecate Array#uniq_by and Array#uniq_by! in favor of Array#uniq and ↵ | Vasiliy Ermolovich | 2011-12-22 | 2 | -12/+22 | |
| | | | | | | | | | | | | | Array#uniq! from ruby 1.9 | |||||
| * | | | Merge pull request #4133 from lest/remove-1-8-code | José Valim | 2011-12-22 | 4 | -13/+0 | |
| |\ \ \ | | | | | | | | | no more need to make Time#to_date and Time#to_datetime public | |||||
| | * | | | no more need to make Time#to_date and Time#to_datetime public | Sergey Nartimov | 2011-12-22 | 4 | -13/+0 | |
| | |/ / | | | | | | | | | | they are public in actual 1.9 ruby version (tested at least in 1.9.2-p180) | |||||
| * | | | Revert "Merge pull request #4114 from ↵ | Jon Leighton | 2011-12-22 | 2 | -78/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test" This reverts commit f8e484d0f71114675ed04e987914d3f2815cb868, reversing changes made to fa5adfb1e884bf21a7071ade634a820e37ac4db4. Reason: broke the postgres tests. | |||||
| * | | | Merge pull request #4114 from ↵ | Jon Leighton | 2011-12-22 | 2 | -23/+78 | |
| |\ \ \ | |/ / |/| | | | | | | | | alexeymuranov/my_fix_for_prefix_suffix_fixtures_test Fix a fixtures test case with table prefix/suffix | |||||
| | * | | Fix a fixtures test case with table prefix/suffix | Alexey Muranov | 2011-12-22 | 2 | -23/+78 | |
| | | | | | | | | | | 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. This was somebody else's test case, so an independent opinion on the change can be helpful. | |||||
| * | | | Update activesupport/lib/active_support.rb | José Valim | 2011-12-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #4121 from lest/remove-whiny-nils | José Valim | 2011-12-21 | 6 | -46/+6 | |
| |\ \ \ | | | | | | | | | remove AS whiny nil extension and deprecate config.whiny_nils | |||||
| | * | | | remove AS whiny nil extension and deprecate config.whiny_nils | Sergey Nartimov | 2011-12-22 | 6 | -46/+6 | |
| |/ / / | ||||||
| * | | | Merge pull request #4125 from nashby/remove-process-daemon | José Valim | 2011-12-21 | 4 | -32/+0 | |
| |\ \ \ | | | | | | | | | remove Proces.daemon from core_ext | |||||
| | * | | | remove Proces.daemon from core_ext | Vasiliy Ermolovich | 2011-12-22 | 4 | -32/+0 | |
| |/ / / | ||||||
| * | | | just require things once | Aaron Patterson | 2011-12-21 | 1 | -4/+2 | |
| | | | | ||||||
| * | | | append puts the routes after the default, which causes a 404. instead use ↵ | Aaron Patterson | 2011-12-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | prepend | |||||
| * | | | just use def setup | Aaron Patterson | 2011-12-21 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | DeprecatedUnderscoreRead does not exist anymore | Aaron Patterson | 2011-12-21 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | adding integration test for journey #7 | Aaron Patterson | 2011-12-21 | 1 | -0/+22 | |
| | | | | ||||||
| * | | | switch to git journey | Aaron Patterson | 2011-12-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #4122 from qoobaa/mass_assignment_with_associated_object | José Valim | 2011-12-21 | 4 | -13/+66 | |
| |\ \ \ | | | | | | | | | added failing tests for has_many, has_one and belongs_to associations wi... | |||||
| | * | | | added failing tests for has_many, has_one and belongs_to associations with ↵ | Jakub Kuźma | 2011-12-21 | 4 | -13/+66 | |
| | | | | | | | | | | | | | | | | | strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051 | |||||
| * | | | | Move SubTestTask. Soften up tests. | Jeremy Kemper | 2011-12-21 | 3 | -48/+44 | |
| | | | | | ||||||
| * | | | | Merge pull request #4119 from lucasmazza/render_without_options | José Valim | 2011-12-21 | 2 | -4/+13 | |
| |\ \ \ \ | | | | | | | | | | | raises an ArgumentError on TemplateRenderer#determine_template | |||||
| | * | | | | raises an ArgumentError if no valid options are given to ↵ | Lucas Mazza | 2011-12-21 | 2 | -4/+13 | |
| | | | | | | | | | | | | | | | | | | | | | TemplateRenderer#determine_template | |||||
| * | | | | | Merge pull request #4104 from lest/remove-1-8-code | José Valim | 2011-12-21 | 4 | -59/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | remove Enumerable#each_with_object from core_ext as it is present in ruby 1.9 | |||||
| | * | | | | | remove Enumerable#each_with_object from core_ext as it is present in ruby 1.9 | lest | 2011-12-21 | 4 | -59/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #4109 from Karunakar/test1 | José Valim | 2011-12-21 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Changed the old logger to new active support logger | |||||
| | * | | | | | Changed the old logger to new active support logger | Karunakar (Ruby) | 2011-12-21 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #4116 from lest/remove-deprecated | José Valim | 2011-12-21 | 5 | -276/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | remove deprecated set and original methods for table_name, primary_key, etc | |||||
| | * | | | | | | remove deprecated set and original methods for table_name, primary_key, etc | Sergey Nartimov | 2011-12-21 | 5 | -276/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #4115 from Karunakar/action_pack | Aaron Patterson | 2011-12-21 | 2 | -2/+2 | |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Action pack logger methods changed to active supoort Logger methods | |||||
| | * | | | | | Action pack logger methodschanged to active supoort Logger methods | Karunakar (Ruby) | 2011-12-22 | 2 | -2/+2 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #4110 from lest/remove-deprecated-underscore-read | Jon Leighton | 2011-12-21 | 3 | -41/+0 | |
| |\ \ \ \ \ | | | | | | | | | | | | | remove deprecated underscore versions of attribute methods | |||||
| | * | | | | | remove deprecated underscore versions of attribute methods | Sergey Nartimov | 2011-12-21 | 3 | -41/+0 | |
| |/ / / / / | ||||||
| * | | | | | caches should not be global, so no need to clear in the teardown | Aaron Patterson | 2011-12-21 | 1 | -4/+0 | |
| | | | | | | ||||||
| * | | | | | removing deprecated methods | Aaron Patterson | 2011-12-21 | 1 | -28/+0 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #4097 from guilleiguaran/safebuffer-html-escape | Aaron Patterson | 2011-12-21 | 1 | -27/+15 | |
| |\ \ \ \ \ | | | | | | | | | | | | | We don't need a special html_escape for 1.8 anymore | |||||
| | * | | | | | We don't need a special html_escape for 1.8 anymore | Guillermo Iguaran | 2011-12-21 | 1 | -27/+15 | |
| | | |_|/ / | |/| | | | ||||||
| * | | | | | Restore `rake TEST=test/unit/foo_test.rb` support. | Jeremy Kemper | 2011-12-21 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add your own test tasks as dependencies on the `test:run` task instead of `test` itself. namespace :test do task run: 'test:acceptance' Rails::SubTestTask.new acceptance: 'test:prepare' do |t| t.libs << 'test' t.pattern = 'test/acceptance/**/*_test.rb' end end | |||||
| * | | | | | Rails::SubTestTask warns on test failure and moves on. Renamed from ↵ | Jeremy Kemper | 2011-12-21 | 1 | -45/+38 | |
| | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TestTaskWithoutDescription. This makes it easier to add your own tests to the default suite: task test: 'test:acceptance' namespace :test do Rails::SubTestTask.new acceptance: 'test:prepare' do |t| t.libs << 'test' t.pattern = 'test/acceptance/**/*_test.rb' end end Now `rake` runs unit, functional, integration, and acceptance tests. | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-21 | 2 | -10/+10 | |
| |\ \ \ \ | ||||||
| | * | | | | Doc fixes on Rails::Generators::Base.hook_for. | Hendy Tanata | 2011-12-21 | 1 | -3/+3 | |
| | | | | | | ||||||
| | * | | | | [docs] Ruby upgrade | Arun Agrawal | 2011-12-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | 4.0.0.beta now :-) | Arun Agrawal | 2011-12-20 | 1 | -6/+6 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #4102 from arunagw/warning_removed_actionpack | Vijay Dev | 2011-12-21 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | warning removed | |||||
| | * | | | | | removed warning "warning: ambiguous first argument; put parentheses or even ↵ | Arun Agrawal | 2011-12-21 | 1 | -1/+1 | |
| | | |/ / / | |/| | | | | | | | | | | | | | spaces" | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |