aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* warning fix : mismatched indentations at 'end' with 'case'Arun Agrawal2012-03-061-1/+1
* Use latest rack-cache.José Valim2012-03-061-1/+1
* Increasing minimum version of mail due to security vulnerability found in Mai...Mikel Lindsaar2012-03-061-1/+1
* Merge pull request #5298 from sikachu/master-fix-responderJosé Valim2012-03-063-12/+49
|\
| * Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| * 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 ENV["RAILS_RELATIVE_URL_ROOT"] is not...Dwayne Litzenberger2012-03-053-1/+104
|/
* Merge pull request #5290 from steveklabnik/masterJosé Valim2012-03-052-3/+9
|\
| * Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-052-3/+9
* | 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_templateSergey Nartimov2012-03-052-0/+17
|/ /
* | Fix #5069 - Protect foreign key from mass assignment throught association bui...Jean Boussier2012-03-053-1/+40
* | Merge pull request #5274 from tigrish/masterJosé Valim2012-03-052-1/+20
|\ \
| * | Tweak activerecord/test/cases/validations/i18n_generate_message_validation_te...Christopher Dell2012-03-051-1/+2
| * | Test that RecordInvalid exception's translation falls back to the :errors nam...Christopher Dell2012-03-051-0/+18
| * | Allow translations of activerecord.errors.messages.record_invalid to be looke...Christopher Dell2012-03-051-1/+1
* | | Merge pull request #5281 from filipeamoreira/patch-1Vijay Dev2012-03-051-1/+1
|\ \ \
| * | | 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
| |_|/ |/| |
* | | Fix typoSantiago Pastorino2012-03-051-1/+1
|/ /
* | Add a new guide for API-only applicationsJose and Yehuda2012-03-041-0/+277
* | Merge pull request #5277 from rafaelfranca/fix-buildMichael Koziarski2012-03-041-0/+1
|\ \
| * | 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 presentRafael Mendonça França2012-03-043-2/+11
|/ /
* | Whitelist all attribute assignment by default.Michael Koziarski2012-03-054-1/+20
* | 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 mysqlCarlos Antonio da Silva2012-03-042-2/+2
|/
* Merge pull request #5268 from carlosantoniodasilva/ar-new-record-warningJon Leighton2012-03-043-1/+10
|\
| * Initialize @stale_state to nil in associationCarlos Antonio da Silva2012-03-043-6/+1
| * 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
|\ \
| * | 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 table_n...kennyj2012-03-042-4/+24
* | | wow how come I commit in master? O_ohoma2012-03-041-0/+3
* | | Merge pull request #5269 from castlerock/remove_unwanted_require_karnel_repor...Piotr Sarnacki2012-03-041-1/+0
|\ \ \
| * | | 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 shortcutBrian Cardarella2012-03-032-0/+14
* | | | Merge pull request #5270 from kennyj/fix_3163Piotr Sarnacki2012-03-043-1/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|/ /
* | [engines guide] Add more concrete example of conflicts when not using isolate...Piotr Sarnacki2012-03-031-1/+1