aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
* | Handle files from ActionDispatch::Static with Rack::Sendfile (fixes #5225)Piotr Sarnacki2012-03-033-5/+18
|/
* Merge pull request #5255 from carlosantoniodasilva/active-record-reviewPiotr Sarnacki2012-03-038-68/+77
|\
| * Refactor and cleanup in some ActiveRecord modulesCarlos Antonio da Silva2012-03-038-68/+77
* | Merge pull request #5246 from lest/patch-2José Valim2012-03-031-1/+1
|\ \
| * | simplify namespace assignment in fields_forSergey Nartimov2012-03-021-1/+1
* | | Merge pull request #5260 from castlerock/remove_ordered_hash_usagesSantiago Pastorino2012-03-035-6/+6
|\ \ \
| * | | remove usages of AS::OrderedHashVishnu Atrai2012-03-035-6/+6
|/ / /
* | | Merge pull request #4984 from raghunadhd/change_orderhashVijay Dev2012-03-033-3/+3
|\ \ \
| * | | Refactored codeRaghunadh2012-02-103-3/+3
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-036-19/+65
|\ \ \ \
| * | | | copy edits [ci skip]Vijay Dev2012-03-031-1/+1
| * | | | Made documentation of config.assets.precompile slightly more explicit.Guy Bolton King2012-03-021-1/+3
| * | | | Removed max-stale from the setting the cache-headers in the response as max-s...Anuj Dutta2012-03-021-1/+1
| * | | | Add documentation for IndexDefinition.Waseem Ahmad2012-03-021-0/+3
| * | | | Improve header hierarchy.Joost Baaij2012-02-291-1/+3
| * | | | Include a comment as to why ETag header should be removed from the response.Joost Baaij2012-02-291-0/+1
| * | | | Changed asset_host config to more specificRahul P. Chaudhari2012-02-291-2/+2
| * | | | Some cleanup on the upgrading guideMike Gunderloy2012-02-281-14/+40
| * | | | Merge pull request #85 from whilefalse/rails_32_engine_upgradeVijay Dev2012-02-281-0/+12
| |\ \ \ \
| | * | | | Added guide to updating engines built in previous versions of RailsSteven Anderson2012-02-241-0/+12
* | | | | | Merge pull request #5258 from guilleiguaran/amo-modelJon Leighton2012-03-031-1/+1
|\ \ \ \ \ \
| * | | | | | Use public_send instead of send in ActiveModel::Model initializeGuillermo Iguaran2012-03-031-1/+1
|/ / / / / /
* | | | | | Merge pull request #5256 from carlosantoniodasilva/active-model-modelJosé Valim2012-03-033-1/+81
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add docs with usage examples for ActiveModel::ModelCarlos Antonio da Silva2012-03-033-1/+81
|/ / / / /
* | | | | Merge pull request #5253 from guilleiguaran/amo-modelJeremy Kemper2012-03-024-0/+44
|\ \ \ \ \
| * | | | | Add ActiveModel::Model, a mixin to make Ruby objects to work with AP inmediatlyGuillermo Iguaran2012-03-024-0/+44
|/ / / / /
* | | | / Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that...Santiago Pastorino2012-03-031-1/+1
| |_|_|/ |/| | |