| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Use Ruby 1.8 hash syntax | Rafael Mendonça França | 2012-03-13 | 3 | -9/+33 | |
| | | | | ||||||
| | * | | Use the attributes hash explicitly | Rafael Mendonça França | 2012-03-13 | 4 | -12/+44 | |
| | | | | ||||||
| | * | | Do not use the attributes hash in the scaffold functional tests | Rafael Mendonça França | 2012-03-13 | 4 | -4/+20 | |
| |/ / | ||||||
| * | | Merge pull request #5398 from parndt/fix_issue_5193 | José Valim | 2012-03-13 | 1 | -0/+5 | |
| |\ \ | | | | | | | Fix issue 5193 | |||||
| | * | | Fixed problem when fixture_path is not always defined (incidentally, only ↵ | Philip Arndt | 2012-03-13 | 1 | -1/+3 | |
| | | | | | | | | | | | | | when ActiveRecord is according to test_help.rb). | |||||
| | * | | Fixes issue #5193 using the instructions provided in the issue. | Philip Arndt | 2012-03-13 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | Merge pull request #5400 from arunagw/issue_4409 | José Valim | 2012-03-13 | 2 | -1/+5 | |
| |\ \ \ | |/ / |/| | | Issue 4409 | |||||
| | * | | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-13 | 2 | -1/+5 | |
| |/ / | | | | | | | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API | |||||
| * | | make sure connections returned after close are marked as in_use | Aaron Patterson | 2012-03-12 | 2 | -0/+26 | |
| | | | ||||||
| * | | Merge pull request #5391 from jrochkind/connection_pool_doc | Aaron Patterson | 2012-03-12 | 1 | -3/+1 | |
| |\ \ | | | | | | | ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0 | |||||
| | * | | inline docs for clear_active_connections! no longer says it cleans dead ↵ | Jonathan Rochkind | 2012-03-12 | 1 | -3/+1 | |
| | | | | | | | | | | | | | threads, it doesn't since 3.2.0 | |||||
| * | | | Add documentation for find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 2 | -0/+5 | |
| |/ / | ||||||
| * | | Add dynamic find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 7 | -1/+67 | |
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb | |||||
| * | | Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2 | José Valim | 2012-03-08 | 6 | -8/+43 | |
| |\ \ | | | | | | | [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict | |||||
| | * | | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-08 | 5 | -16/+21 | |
| | | | | ||||||
| | * | | Add test case to has_many through association when mass_assignment_sanitizer is | Rafael Mendonça França | 2012-03-08 | 4 | -4/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | :strict Conflicts: activerecord/test/models/person.rb | |||||
| * | | | Merge pull request #5350 from rafaelfranca/changelog-fix-3-2 | Vijay Dev | 2012-03-08 | 7 | -17/+42 | |
| |\ \ \ | |/ / |/| | | Changelog fix 3 2 | |||||
| | * | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 7 | -17/+42 | |
| |/ / | | | | | | | Also add missing entries and use the formating convention | |||||
| * | | ensure that released connections move between threads | Aaron Patterson | 2012-03-08 | 1 | -0/+18 | |
| | | | ||||||
| * | | make active_connection? return true only if there is an open connection in ↵ | Aaron Patterson | 2012-03-08 | 2 | -3/+46 | |
| | | | | | | | | | use for the current thread. fixes #5330 | |||||
| * | | update changelogs for gems without changes too [ci skip] | Vijay Dev | 2012-03-09 | 5 | -2/+36 | |
| | | | ||||||
| * | | changelog updates [ci skip] | Vijay Dev | 2012-03-09 | 3 | -0/+29 | |
| | | | ||||||
| * | | In a nested resource route, the parent resource param is <resource_name>_id | Vijay Dev | 2012-03-09 | 1 | -8/+8 | |
| | | | | | | | | | | | This fix was made by @coreyhaines on docrails and merged in master. Cleanly cherry picking into 3-2-stable wasn't possible. | |||||
| * | | Left off a : when specifying the :namespace option for a :controller | coreyhaines | 2012-03-09 | 1 | -1/+1 | |
| | | | | | | | | | path segment | |||||
| * | | Fix typo in isolated engine docs | Caius Durling | 2012-03-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix typo in asset pipeline guide | Matthew Conway | 2012-03-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix doc examples for has_and_belongs_to_many association | Braden Schaeffer | 2012-03-09 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fixed a slightly misleading equivalent SQL code on the 3.2 query interface. | Swanand Pagnis | 2012-03-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | typo | Mikhail Dieterle | 2012-03-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Improve docs for attr_accessible|protected related to Hash#except|slice | Carlos Antonio da Silva | 2012-03-09 | 1 | -8/+10 | |
| |/ | ||||||
| * | Add tests to test that through associations are not readonly, and we can ↵ | kuahyeow | 2012-03-08 | 1 | -0/+11 | |
| | | | | | update the records we retrive from the association | |||||
| * | Merge pull request #5316 from Jacobkg/master | José Valim | 2012-03-07 | 2 | -1/+4 | |
| | | | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings | |||||
| * | Remove usage of deprecated module. | José Valim | 2012-03-07 | 1 | -1/+0 | |
| | | ||||||
| * | Add test case for #5307 | Carlos Antonio da Silva | 2012-03-07 | 1 | -2/+6 | |
| | | ||||||
| * | Set the rendered_format on respond_to. | José Valim | 2012-03-07 | 1 | -0/+1 | |
| | | ||||||
| * | Just change the formats on first render, closes #5307, closes #5308. | José Valim | 2012-03-07 | 1 | -2/+7 | |
| | | ||||||
| * | Deprecate ActionController::SessionManagement | Santiago Pastorino | 2012-03-06 | 1 | -0/+5 | |
| | | ||||||
| * | Use latest rack-cache. | José Valim | 2012-03-06 | 1 | -1/+1 | |
| | | ||||||
| * | Increasing minimum version of mail due to security vulnerability found in ↵ | Mikel Lindsaar | 2012-03-06 | 1 | -1/+1 | |
| | | | | | Mail 2.4.1 for sendmail or exim | |||||
| * | Merge pull request #5299 from sikachu/3-2-stable-fix-responder | José Valim | 2012-03-06 | 3 | -12/+49 | |
| |\ | | | | | Always passing a respond block from to responder | |||||
| | * | Always passing a respond block from to responder | Prem Sichanugrist | 2012-03-05 | 2 | -12/+13 | |
| | | | | | | | | | | | | | | | We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes #5280 | |||||
| | * | Failing test for mime responder respond_with using a block. | Mario Visic | 2012-03-05 | 1 | -0/+36 | |
| |/ | ||||||
| * | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 3 | -1/+40 | |
| | | | | | builder | |||||
| * | Merge pull request #5278 from rafaelfranca/fix-build-3-2 | Michael Koziarski | 2012-03-04 | 4 | -2/+9 | |
| |\ | | | | | [3-2-stable] Fix build | |||||
| | * | Now all the models need to explicitly declare the accessible attributes | Rafael Mendonça França | 2012-03-04 | 1 | -0/+1 | |
| | | | ||||||
| | * | Only add the whitelist_attributes option if ActiveRecord is present | Rafael Mendonça França | 2012-03-04 | 3 | -2/+8 | |
| |/ | | | | | | | Conflicts: railties/test/generators/app_generator_test.rb railties/test/isolation/abstract_unit.rb | |||||
| * | Whitelist all attribute assignment by default. | Michael Koziarski | 2012-03-05 | 4 | -1/+20 | |
| | | | | | Change the default for newly generated applications to whitelist all attribute assignment. Also update the generated model classes so users are reminded of the importance of attr_accessible. | |||||
| * | Only run binary type cast test with encode! on Ruby 1.9 | Carlos Antonio da Silva | 2012-03-04 | 1 | -6/+8 | |
| | | ||||||
| * | fix associations when using per class databases | Lars Kanis | 2012-03-04 | 3 | -8/+5 | |
| | | | | | | | would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in | |||||
| * | CSS fix for guides. Closing #5028 [ci skip] | Vijay Dev | 2012-03-03 | 1 | -1/+1 | |
| | | | | | | | | In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't visible. Increasing the line height slightly seems to fix this. This problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in any other OS-browser combo :) | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |