| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | warning fix : mismatched indentations at 'end' with 'case' | Arun Agrawal | 2012-03-06 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #5310 from Serabe/layout_for_partials_with_collections | José Valim | 2012-03-06 | 4 | -1/+53 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Adds :layout option to render :partial when a collection is given. | |||||
| | * | | | | | | | Adds line to change log and update documentation. | Sergio Arbeo | 2012-03-07 | 2 | -0/+39 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Adds :layout option to render :partial when a collection is given. | Sergio Arbeo | 2012-03-06 | 3 | -1/+14 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #5309 from carlosantoniodasilva/ad-uploaded-file | Aaron Patterson | 2012-03-06 | 2 | -9/+7 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Refactor ActionDispatch::UploadedFile | |||||
| | * | | | | | | | | Refactor AD::UploadedFile, and raise sooner if tempfile is not present | Carlos Antonio da Silva | 2012-03-06 | 2 | -9/+7 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Ensure load hooks can be called more than once with different contexts. | José Valim | 2012-03-06 | 2 | -6/+35 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove unused ActionController::SessionManagement | Santiago Pastorino | 2012-03-06 | 4 | -12/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Avoid ImplicitRender just call render directly | Santiago Pastorino | 2012-03-06 | 1 | -3/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Clean up module docs [ci skip] | Vijay Dev | 2012-03-07 | 12 | -80/+73 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some useless docstrings and no-doc'ed some. | |||||
| * | | | | | | | | Merge pull request #5304 from kennyj/fix_connection_dependency | Aaron Patterson | 2012-03-06 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Revert table_name= needs connection now, so just stub table_name | |||||
| | * | | | | | | | Revert table_name= needs connection now, so just stub table_name | kennyj | 2012-03-07 | 2 | -2/+2 | |
| |/ / / / / / / | ||||||
| * | | | | | | | 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 #5298 from sikachu/master-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 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #5296 from dlitz/relative_url_root_from_script_name | José Valim | 2012-03-06 | 3 | -1/+104 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Compute asset paths from the request if RAILS_RELATIVE_URL_ROOT not set | |||||
| | * | | | | | | Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is ↵ | Dwayne Litzenberger | 2012-03-05 | 3 | -1/+104 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not set. This should fix the following issue: "Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)" https://github.com/rails/rails/issues/910 | |||||
| * | | | | | | Merge pull request #5290 from steveklabnik/master | José Valim | 2012-03-05 | 2 | -3/+9 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Added parsing of arbitrary media type parameters. | |||||
| | * | | | | | | Added parsing of arbitrary media type parameters. | Steve Klabnik | 2012-03-05 | 2 | -3/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on #4918. Related to #4127. | |||||
| * | | | | | | | Add config.middleware.api_only! | Carlos Antonio da Silva and Santiago Pastorino | 2012-03-05 | 3 | -4/+42 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #5288 from lest/patch-2 | José Valim | 2012-03-05 | 2 | -0/+17 | |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | force response body to be read in assert_template | |||||
| | * | | | | | | force response body to be read in assert_template | Sergey Nartimov | 2012-03-05 | 2 | -0/+17 | |
| |/ / / / / / | ||||||
| * | | | / / | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 3 | -1/+40 | |
| | |_|_|/ / |/| | | | | | | | | | | | | | | builder | |||||
| * | | | | | Merge pull request #5274 from tigrish/master | José Valim | 2012-03-05 | 2 | -1/+20 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Update I18n defaults for activerecord.errors.messages.record_invalid | |||||
| | * | | | | | Tweak ↵ | Christopher Dell | 2012-03-05 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | activerecord/test/cases/validations/i18n_generate_message_validation_test.rb | |||||
| | * | | | | | Test that RecordInvalid exception's translation falls back to the :errors ↵ | Christopher Dell | 2012-03-05 | 1 | -0/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | namespace | |||||
| | * | | | | | Allow translations of activerecord.errors.messages.record_invalid to be ↵ | Christopher Dell | 2012-03-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | looked up in errors.messages.record_invalid | |||||
| * | | | | | | Merge pull request #5281 from filipeamoreira/patch-1 | Vijay Dev | 2012-03-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Small typo fix | |||||
| | * | | | | | | Small typo fix | Filipe Moreira | 2012-03-05 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | minor corrections in AMo::Model docs [ci skip] | Vijay Dev | 2012-03-05 | 2 | -5/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | document the shortcut to the root route helper [ci skip] | Vijay Dev | 2012-03-05 | 2 | -0/+3 | |
| | |_|/ / / / |/| | | | | | | | | | | | | | | | | | This was implemented in 2ee4dd856d47113625589bc5410b5a6669ea02d5 | |||||
| * | | | | | | Fix typo | Santiago Pastorino | 2012-03-05 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Add a new guide for API-only applications | Jose and Yehuda | 2012-03-04 | 1 | -0/+277 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This guide reflects features that have not yet been implemented. | |||||
| * | | | | | Merge pull request #5277 from rafaelfranca/fix-build | Michael Koziarski | 2012-03-04 | 1 | -0/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Now all the models need to explicitly declare the accessible attributes | |||||
| | * | | | | | Now all the models need to explicitly declare the accessible attributes | Rafael Mendonça França | 2012-03-04 | 1 | -0/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #5275 from rafaelfranca/master | Jon Leighton | 2012-03-04 | 3 | -2/+11 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Only add the whitelist_attributes option if ActiveRecord is present | |||||
| | * | | | | | Only add the whitelist_attributes option if ActiveRecord is present | Rafael Mendonça França | 2012-03-04 | 3 | -2/+11 | |
| |/ / / / / | ||||||
| * | | | | | 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. | |||||
| * | | | | | Fix tests, table_name= needs connection now, so just stub table_name | Piotr Sarnacki | 2012-03-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #5271 from carlosantoniodasilva/ar-fix-build | José Valim | 2012-03-04 | 2 | -2/+2 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | Fix message assertions for quoting database name in "show tables" for mysql | |||||
| | * | | | | Fix message assertions for quoting database name in "show tables" for mysql | Carlos Antonio da Silva | 2012-03-04 | 2 | -2/+2 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #5268 from carlosantoniodasilva/ar-new-record-warning | Jon Leighton | 2012-03-04 | 3 | -1/+10 | |
| |\ \ \ \ | | | | | | | | | | | Fix ActiveRecord warning in tests with Marshal | |||||
| | * | | | | Initialize @stale_state to nil in association | Carlos Antonio da Silva | 2012-03-04 | 3 | -6/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This apparently fix the warning related to @new_record variable not being initialized in AR's test suit, when an association is built and the object is marshalled/loaded. See these tests in AR's base_test.rb: test_marshalling_with_associations test_marshalling_new_record_round_trip_with_associations Closes #3720. | |||||
| | * | | | | Added test case for new_record round trip with associations problem | kennyj | 2012-03-04 | 1 | -0/+14 | |
| | | | | | | ||||||
| * | | | | | remove troll | Jon Leighton | 2012-03-04 | 1 | -3/+0 | |
| | | | | | | ||||||
| * | | | | | tidy up formatting | Jon Leighton | 2012-03-04 | 1 | -10/+11 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #5267 from kennyj/fix_4674 | Jon Leighton | 2012-03-04 | 2 | -5/+38 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix GH #4674. Reset column information and sequence name when setting table_name. | |||||
| | * | | | | | Don't clear sequence name when we explicitly assign it. | kennyj | 2012-03-04 | 2 | -2/+15 | |
| | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |