aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5304 from kennyj/fix_connection_dependencyAaron Patterson2012-03-062-2/+2
|\ | | | | Revert table_name= needs connection now, so just stub table_name
| * Revert table_name= needs connection now, so just stub table_namekennyj2012-03-072-2/+2
|/
* Use latest rack-cache.José Valim2012-03-061-1/+1
|
* Increasing minimum version of mail due to security vulnerability found in ↵Mikel Lindsaar2012-03-061-1/+1
| | | | Mail 2.4.1 for sendmail or exim
* Merge pull request #5298 from sikachu/master-fix-responderJosé Valim2012-03-063-12/+49
|\ | | | | Always passing a respond block from to responder
| * Always passing a respond block from to responderPrem Sichanugrist2012-03-052-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 Visic2012-03-051-0/+36
| |
* | Merge pull request #5296 from dlitz/relative_url_root_from_script_nameJosé Valim2012-03-063-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 Litzenberger2012-03-053-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/masterJosé Valim2012-03-052-3/+9
|\ | | | | Added parsing of arbitrary media type parameters.
| * Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-052-3/+9
| | | | | | | | | | | | Based on #4918. Related to #4127.
* | Add config.middleware.api_only!Carlos Antonio da Silva and Santiago Pastorino2012-03-053-4/+42
| |
* | Merge pull request #5288 from lest/patch-2José Valim2012-03-052-0/+17
|\ \ | | | | | | force response body to be read in assert_template
| * | force response body to be read in assert_templateSergey Nartimov2012-03-052-0/+17
|/ /
* | Fix #5069 - Protect foreign key from mass assignment throught association ↵Jean Boussier2012-03-053-1/+40
| | | | | | | | builder
* | Merge pull request #5274 from tigrish/masterJosé Valim2012-03-052-1/+20
|\ \ | | | | | | Update I18n defaults for activerecord.errors.messages.record_invalid
| * | Tweak ↵Christopher Dell2012-03-051-1/+2
| | | | | | | | | | | | activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
| * | Test that RecordInvalid exception's translation falls back to the :errors ↵Christopher Dell2012-03-051-0/+18
| | | | | | | | | | | | namespace
| * | Allow translations of activerecord.errors.messages.record_invalid to be ↵Christopher Dell2012-03-051-1/+1
| | | | | | | | | | | | looked up in errors.messages.record_invalid
* | | Merge pull request #5281 from filipeamoreira/patch-1Vijay Dev2012-03-051-1/+1
|\ \ \ | | | | | | | | Small typo fix
| * | | Small typo fixFilipe Moreira2012-03-051-1/+1
| | | |
* | | | minor corrections in AMo::Model docs [ci skip]Vijay Dev2012-03-052-5/+5
| | | |
* | | | document the shortcut to the root route helper [ci skip]Vijay Dev2012-03-052-0/+3
| |_|/ |/| | | | | | | | This was implemented in 2ee4dd856d47113625589bc5410b5a6669ea02d5
* | | Fix typoSantiago Pastorino2012-03-051-1/+1
|/ /
* | Add a new guide for API-only applicationsJose and Yehuda2012-03-041-0/+277
| | | | | | | | | | This guide reflects features that have not yet been implemented.
* | Merge pull request #5277 from rafaelfranca/fix-buildMichael Koziarski2012-03-041-0/+1
|\ \ | | | | | | Now all the models need to explicitly declare the accessible attributes
| * | Now all the models need to explicitly declare the accessible attributesRafael Mendonça França2012-03-041-0/+1
|/ /
* | Merge pull request #5275 from rafaelfranca/masterJon Leighton2012-03-043-2/+11
|\ \ | | | | | | Only add the whitelist_attributes option if ActiveRecord is present
| * | Only add the whitelist_attributes option if ActiveRecord is presentRafael Mendonça França2012-03-043-2/+11
|/ /
* | Whitelist all attribute assignment by default.Michael Koziarski2012-03-054-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_namePiotr Sarnacki2012-03-041-1/+1
| |
* | Merge pull request #5271 from carlosantoniodasilva/ar-fix-buildJosé Valim2012-03-042-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 mysqlCarlos Antonio da Silva2012-03-042-2/+2
|/
* Merge pull request #5268 from carlosantoniodasilva/ar-new-record-warningJon Leighton2012-03-043-1/+10
|\ | | | | Fix ActiveRecord warning in tests with Marshal
| * Initialize @stale_state to nil in associationCarlos Antonio da Silva2012-03-043-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 problemkennyj2012-03-041-0/+14
| |
* | remove trollJon Leighton2012-03-041-3/+0
| |
* | tidy up formattingJon Leighton2012-03-041-10/+11
| |
* | Merge pull request #5267 from kennyj/fix_4674Jon Leighton2012-03-042-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.kennyj2012-03-042-2/+15
| | |
| * | Fix GH #4674. Reset column information and sequence name when setting ↵kennyj2012-03-042-4/+24
| | | | | | | | | | | | table_name.
* | | wow how come I commit in master? O_ohoma2012-03-041-0/+3
| | |
* | | Merge pull request #5269 from ↵Piotr Sarnacki2012-03-041-1/+0
|\ \ \ | | | | | | | | | | | | | | | | castlerock/remove_unwanted_require_karnel_reporting AS/kernel/reporting no where used in ts_isolated
| * | | AS/kernel/reporting no where used in ts_isolatedVishnu Atrai2012-03-041-1/+0
| |/ /
* | | Merge pull request #5266 from bcardarella/root_with_string_optionsPiotr Sarnacki2012-03-042-0/+14
|\ \ \ | | | | | | | | Route root helper shortcut
| * | | Route root helper shortcutBrian Cardarella2012-03-032-0/+14
| | | | | | | | | | | | | | | | Allow the root route helper to accept just a string
* | | | Merge pull request #5270 from kennyj/fix_3163Piotr Sarnacki2012-03-043-1/+22
|\ \ \ \ | |_|/ / |/| | | Fix GH #3163. Should quote database on mysql/mysql2.
| * | | Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-03-053-1/+22
|/ / /
* | | Fix rake test_sqlite3_memJon Leighton2012-03-041-7/+9
| | |
* | | Remove unusused variablesJon Leighton2012-03-043-14/+9
|/ /