aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Remove mocking on save, when not necessaryArthur Neves2014-03-111-3/+1
|/ / / /
* | | | Merge pull request #14345 from arthurnn/revert_14052Godfrey Chan2014-03-112-3/+16
|\ \ \ \
| * | | | Fixes STI when 2+ levels deep.Arthur Neves2014-03-102-3/+16
* | | | | comment why we are modifying global state. [ci skip]Yves Senn2014-03-111-0/+1
* | | | | `change_table` supports `citext`. Follow up to #12523.Yves Senn2014-03-112-8/+31
* | | | | Merge pull request #12523 from lsylvester/pg_citextYves Senn2014-03-116-2/+89
|\ \ \ \ \
| * | | | | register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]lsylvester2014-03-116-2/+89
* | | | | | Merge pull request #14342 from zuhao/eliminate_global_state_leak_in_activemod...Jeremy Kemper2014-03-107-110/+136
|\ \ \ \ \ \
| * | | | | | Completely remove potential global state leaks in ActiveModel tests.Zuhao Wan2014-03-117-110/+136
* | | | | | | Merge pull request #11616 from arunagw/removed-application-command-railsCarlos Antonio da Silva2014-03-102-6/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Removed unnecessary command "application"Arun Agrawal2014-03-102-6/+5
|/ / / / / /
* | | | | | Merge pull request #14343 from garysweaver/masterVijay Dev2014-03-101-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | minor fix to 4.1 rel notes for begin_transaction joinable option [CI skip]Gary S. Weaver2014-03-101-1/+1
|/ / / / /
* | | | | Merge pull request #8313 from alan/only_save_changed_has_one_objectsRafael Mendonça França2014-03-103-2/+24
|\ \ \ \ \
| * | | | | Save has_one associations only if record has changesAlan Kennedy2013-10-313-2/+24
* | | | | | current_adapter? accepts multiple argumentsRafael Mendonça França2014-03-101-2/+2
* | | | | | mysql adapter also fails with a number bigger than intRafael Mendonça França2014-03-101-2/+5
* | | | | | The 4.1 release notes is already a thing so lets show in the guidesRafael Mendonça França2014-03-101-1/+0
* | | | | | Change the assertions depending in the database adapterRafael Mendonça França2014-03-101-14/+9
* | | | | | Do proper adapter checkRafael Mendonça França2014-03-101-2/+2
* | | | | | WhitespacesRafael Mendonça França2014-03-101-2/+2
* | | | | | Merge pull request #14341 from keikun17/masterYves Senn2014-03-101-2/+2
|\ \ \ \ \ \
| * | | | | | Fix 'fields_for' doc typo.Cakey | Buddy Magsipoc2014-03-101-2/+2
|/ / / / / /
* | | | | | Merge pull request #14332 from tgxworld/autosave_association_testYves Senn2014-03-101-7/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Cleanup Parrot after each test.Guo Xiang Tan2014-03-091-7/+3
|/ / / / /
* | | | | Merge pull request #14334 from kennym/masterGodfrey Chan2014-03-091-4/+8
|\ \ \ \ \
| * | | | | Enhance readability of ActionView DateHelper#distance_of_time_in_wordsKenny Meyer2014-03-091-4/+8
|/ / / / /
* | | | | Merge pull request #14315 from zuhao/activemodel_tests_in_random_orderYves Senn2014-03-094-13/+39
|\ \ \ \ \
| * | | | | Run ActiveModel test suites in random order.Zuhao Wan2014-03-104-13/+39
* | | | | | Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-0916-30/+30
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Replace map.flatten with flat_map in railtiesErik Michaels-Ober2014-03-044-4/+4
| * | | | | Replace map.flatten with flat_map in activerecordErik Michaels-Ober2014-03-035-8/+8
| * | | | | Replace map.flatten with flat_map in actionpackErik Michaels-Ober2014-03-037-18/+18
* | | | | | Move changelog entry to the top, highlight module name [ci skip]Carlos Antonio da Silva2014-03-081-5/+6
* | | | | | Copy shallow options from normal options when using scopeAndrew White2014-03-082-1/+50
* | | | | | Pull namespace defaults out of the options hashAndrew White2014-03-082-3/+140
* | | | | | Only use shallow nested scope when depth is > 1Andrew White2014-03-082-20/+83
* | | | | | Move setting :scope_level_resource to resource_scopeAndrew White2014-03-081-7/+7
* | | | | | Merge pull request #14313 from m-Peter/active_model_doc_fixesYves Senn2014-03-081-30/+49
|\ \ \ \ \ \
| * | | | | | Fix errors for four of the code samplesPeter Markou2014-03-081-30/+49
|/ / / / / /
* | | | | | Merge pull request #14325 from robin850/issue-12133Santiago Pastorino2014-03-083-1/+18
|\ \ \ \ \ \
| * | | | | | Make the rails:template rake task load initializersRobin Dupret2014-03-083-1/+18
* | | | | | | Merge pull request #14244 from arthurnn/orderd_hash_select_fixSantiago Pastorino2014-03-082-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix OrderedHash.select to return self instance.Arthur Neves2014-03-072-1/+8
* | | | | | | | Merge pull request #14280 from joho/make_csrf_failure_logging_optionalSantiago Pastorino2014-03-083-1/+28
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-053-1/+28
* | | | | | | | docs, shorten CsrfHelper description and refer to security guide. [ci skip]Yves Senn2014-03-081-8/+3
* | | | | | | | added CSRF helper to rails guide documentation. Closes #11615. [ci skip]Yves Senn2014-03-081-3/+19
* | | | | | | | Tests for indifferent access using full_messages_for. Closes #11916Pavel Penkov2014-03-081-0/+7
* | | | | | | | Merge pull request #14318 from arthurnn/clean_preview_interceptorsAndrew White2014-03-071-0/+1
|\ \ \ \ \ \ \ \