aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix failing test on Oracle. Having a duplicated column specified in aMarcelo Silveira2012-05-071-1/+1
* Merge pull request #6191 from arunagw/ruby_prof_lockPiotr Sarnacki2012-05-071-1/+1
|\
| * Locking ruby-prof for now. Arun Agrawal2012-05-071-1/+1
* | Merge pull request #5368 from andhapp/remove-max-staleJosé Valim2012-05-071-4/+4
|\ \
| * | Removed max-stale from the tests since it's a request cache-control directive...Anuj Dutta2012-03-101-4/+4
* | | Merge pull request #6182 from shaliko/change_unless_else_into_if_elseJosé Valim2012-05-071-3/+3
|\ \ \ | |_|/ |/| |
| * | Change unless + else into if + elseShaliko Usubov2012-05-061-3/+3
* | | note that WIP guides are not in the index menu [ci skip]Vijay Dev2012-05-071-1/+1
* | | Fix buildPiotr Sarnacki2012-05-061-7/+10
* | | Ensure that Rails.env is equal to "test" by default when running tests.Piotr Sarnacki2012-05-061-0/+2
* | | [guides] Add comments to deep_dup example, fix second example [ci skip]Piotr Sarnacki2012-05-061-1/+3
* | | Merge pull request #5910 from route/rails-dbconsoleJeremy Kemper2012-05-063-40/+86
|\ \ \
| * | | More faster rails dbconsoleDmitry Vorotilin2012-05-063-40/+86
* | | | Fix that optimized named routes should also work as singleton methods on the ...Jeremy Kemper2012-05-062-1/+26
* | | | Remove obsolete deep_dup requiresPiotr Sarnacki2012-05-061-2/+0
* | | | Use deep_dup in aciverecord default columns assignmentPiotr Sarnacki2012-05-061-4/+2
* | | | Keep all methods in object/deep_dupPiotr Sarnacki2012-05-066-18/+17
* | | | Updated CHANGELOG entry for `deep_dup`Piotr Sarnacki2012-05-061-0/+2
* | | | Reword guide entry for `deep_dup` method.Piotr Sarnacki2012-05-061-14/+23
* | | | Guides for deep_dupAlexey Gaziev2012-05-061-0/+64
* | | | Nice logic for deep_dup in railsAlexey Gaziev2012-05-068-19/+72
|/ / /
* | | doc edits [ci skip]Vijay Dev2012-05-061-3/+2
* | | Merge pull request #5924 from cjolly/signed-cookies-docsVijay Dev2012-05-061-3/+5
|\ \ \ | |/ / |/| |
| * | Improve signed cookies documentationChad Jolly2012-04-211-3/+5
* | | Merge pull request #6180 from soulim/fix_submit_tag_docVijay Dev2012-05-061-1/+1
|\ \ \
| * | | Fix typo in submit_tag helper documentationAlex Soulim2012-05-061-1/+1
|/ / /
* | | Update actionpack/CHANGELOG.mdJosé Valim2012-05-061-1/+5
* | | Merge pull request #2313 from ssoroka/masterJosé Valim2012-05-065-15/+33
|\ \ \
| * | | remove .new from raise ActionController::UnknownFormatSteven Soroka2012-05-061-1/+1
| * | | added an integration test that checks ActionController::UnknownFormat renders...Steven Soroka2012-05-061-0/+9
| * | | Raise a rescuable exception when Rails doesn't know what to do with the forma...Steven Soroka2012-05-064-15/+24
|/ / /
* | | Merge pull request #6173 from mhfs/takes_instead_firstJeremy Kemper2012-05-053-5/+17
|\ \ \
| * | | Use `take` instead of `first` to avoid unwanted implicit ordering (fixes #6147)Marcelo Silveira2012-05-053-5/+17
* | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysqlJeremy Kemper2012-05-056-1/+54
|\ \ \ \
| * | | | Changelog entry regarding mysql(2) STRICT_ALL_TABLESMichael Pearson2012-05-051-0/+6
| * | | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode.Michael Pearson2012-05-054-4/+38
| * | | | Default to 'strict mode' in MySQLMichael Pearson2012-05-052-0/+11
| * | | | Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is r...Michael Pearson2012-05-051-1/+3
* | | | | Merge pull request #6054 from flexoid/column-fixJon Leighton2012-05-052-3/+31
|\ \ \ \ \
| * | | | | Prevent creating valid time-like objects from blank string from dbEgor Lynko2012-05-052-3/+31
* | | | | | Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-054-43/+6
|/ / / / /
* | | | | Merge pull request #5494 from armstrjare/active_record_relation_keep_associat...Jon Leighton2012-05-054-6/+43
|\ \ \ \ \
| * | | | | Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-044-6/+43
* | | | | | Make RedCloth not convert double hyphens to emdashes. Closes #5292Vijay Dev2012-05-061-0/+6
* | | | | | Merge pull request #6176 from nashby/checkboxesJosé Valim2012-05-052-1/+10
|\ \ \ \ \ \
| * | | | | | check checkboxes with array of strings as :checked optionVasiliy Ermolovich2012-05-052-1/+10
| | |_|/ / / | |/| | | |
* | | | | | some corrections in the AR query guide [ci skip]Vijay Dev2012-05-051-13/+15
* | | | | | Merge pull request #6175 from mhfs/guide_take_first_lastVijay Dev2012-05-051-8/+42
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update `first`, `last` and `take` in guidesMarcelo Silveira2012-05-051-8/+42
|/ / / / /
* | | | | Try to convert object passed to debug_hash to hashPiotr Sarnacki2012-05-051-2/+2