aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove redundant code.Guo Xiang Tan2014-05-201-3/+2
* Merge pull request #15151 from sgrif/sg-add-type-to-columnYves Senn2014-05-1814-57/+86
|\
| * Add a type object to Column constructorSean Griffin2014-05-1714-57/+86
|/
* Merge pull request #15137 from sgrif/sg-remove-dead-codeRafael Mendonça França2014-05-1719-183/+82
|\
| * Remove dead test code for unsupported adaptersSean Griffin2014-05-1719-183/+82
|/
* Merge pull request #14428 from jnormore/reset_counters_aliasRafael Mendonça França2014-05-173-8/+27
|\
| * Updates reset_counters to allow counter name in paramsJason Normore2014-05-163-8/+27
* | Document method visibility for designing API docs. [ci skip]Zachary Scott2014-05-171-0/+34
* | Merge pull request #15152 from printercu/patch-5Rafael Mendonça França2014-05-171-70/+69
|\ \
| * | Collected TimeZone's class methods togetherprintercu2014-05-171-70/+69
* | | Merge pull request #15149 from sgrif/sg-missing-testsRafael Mendonça França2014-05-171-0/+36
|\ \ \
| * | | Add missing tests for column type cast behaviorSean Griffin2014-05-171-0/+36
| |/ /
* / / New applications should be created with json serializerRafael Mendonça França2014-05-172-0/+41
|/ /
* | Merge pull request #15150 from xtian/fix-railties-testsGuillermo Iguaran2014-05-172-6/+2
|\ \
| * | Fix app generator test hanging.Christian Wesselhoeft2014-05-172-6/+2
|/ /
* | Merge pull request #15147 from regonn/fix-symbolRichard Schneeman2014-05-171-1/+1
|\ \
| * | fix symbolregonn2014-05-171-1/+1
|/ /
* | Merge pull request #15132 from zuhao/refactor_actionpack_abstract_collector_testYves Senn2014-05-171-5/+11
|\ \
| * | Ensure :js is defined regardless of the outcome of the test.Zuhao Wan2014-05-171-5/+11
* | | prefer file name instead of filename [ci skip]Vijay Dev2014-05-171-2/+2
* | | fix typo [ci skip]Vijay Dev2014-05-171-1/+1
* | | Merge pull request #15145 from ShunsukeAida/capitalizationVijay Dev2014-05-171-3/+3
|\ \ \
| * | | fixed capitalizations [ci skip]SA2014-05-171-3/+3
|/ / /
* | | Merge pull request #15144 from leafac/fix-changelog-#15071Godfrey Chan2014-05-161-1/+3
|\ \ \ | |_|/ |/| |
| * | Fix typo in CHANGELOG entry for #15071Leandro Facchinetti2014-05-171-1/+3
|/ /
* | Merge pull request #15143 from htanata/first_person_pronounsRafael Mendonça França2014-05-163-11/+11
|\ \
| * | Replace first person point of view on guides.Hendy Tanata2014-05-163-11/+11
|/ /
* | Merge pull request #15037 from roccoblues/fix_duplicate_activesupport_subscri...Rafael Mendonça França2014-05-163-7/+34
|\ \
| * | Fixed duplicate subscribers in ActiveSupport::SubscriberDennis Schoen2014-05-093-7/+34
* | | Add CHANGELOG entry for #15071 [ci skip]Rafael Mendonça França2014-05-161-0/+8
* | | Merge pull request #15071 from leafac/issues/11985Rafael Mendonça França2014-05-162-4/+18
|\ \ \
| * | | Fix `Relation#delete_all` inconsistencyLeandro Facchinetti2014-05-162-4/+18
* | | | foo :bomb:Rafael Mendonça França2014-05-161-2/+5
* | | | Generate the cookies_serializer configuration with :marshal when upgradingRafael Mendonça França2014-05-162-1/+12
* | | | doc, pg `hstore` and `json` columns are mapped as `Hash`. [ci skip]Yves Senn2014-05-171-0/+8
* | | | remove trailing whitespace. [ci skip]Yves Senn2014-05-172-4/+4
* | | | Merge pull request #15140 from arthurnn/small_cleanupRafael Mendonça França2014-05-161-2/+0
|\ \ \ \
| * | | | Remove unecessary requireArthur Neves2014-05-161-2/+0
|/ / / /
* | | | Merge pull request #15139 from zzak/habtm_build_model_nameRafael Mendonça França2014-05-161-2/+2
|\ \ \ \
| * | | | Remove the assignment for real this time.Zachary Scott2014-05-161-2/+2
|/ / / /
* | | | prepend mutates the string so we can remove the assignmentRafael Mendonça França2014-05-161-1/+1
* | | | Reuse the force_clear_transaction_record_stateRafael Mendonça França2014-05-161-1/+1
* | | | Missed if :bomb:Rafael Mendonça França2014-05-161-1/+1
* | | | Add a specific method to force the transaction record state clearRafael Mendonça França2014-05-161-5/+8
* | | | Merge pull request #15125 from arthurnn/small_refactoring_transaction_clearGodfrey Chan2014-05-162-4/+19
|\ \ \ \
| * | | | Clear transaction state if callback raise rollbackArthur Neves2014-05-152-1/+14
| * | | | Small refactoring on clear_transaction_record_stateArthur Neves2014-05-151-3/+5
* | | | | Merge pull request #15131 from arunagw/aa-cleanup-rakefileRafael Mendonça França2014-05-162-31/+1
|\ \ \ \ \
| * | | | | Remove code related to adapter which are no longer in repoArun Agrawal2014-05-162-31/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15021 from hubertlepicki/allow_custom_host_in_asset_urlRafael Mendonça França2014-05-164-3/+38
|\ \ \ \ \