aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22829 from jcoyne/test_parametersYves Senn2015-12-303-1/+10
|\
| * TestController#parameters returns AC::ParametersJustin Coyne2015-12-293-1/+10
* | Merge pull request #22844 from prathamesh-sonpatki/issue_22836Yves Senn2015-12-301-2/+2
|\ \
| * | Fix documentation for configuring default_charset [ci skip]Prathamesh Sonpatki2015-12-301-2/+2
* | | Merge pull request #22842 from akshay-vishnoi/typo-fixYves Senn2015-12-301-1/+1
|\ \ \
| * | | Fix typoAkshay Vishnoi2015-12-301-1/+1
* | | | Merge pull request #22843 from akshay-vishnoi/fix-release-5Yves Senn2015-12-301-3/+3
|\ \ \ \
| * | | | [ci skip] Put all removals in its sectionAkshay Vishnoi2015-12-301-3/+3
| |/ / /
* | | | Merge pull request #22845 from yui-knk/remove_not_used_fixtureYves Senn2015-12-301-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove not used test fixtureyui-knk2015-12-301-1/+0
* | | | Merge pull request #22803 from kamipo/improve_select_one_in_mysql2_adapterRafael França2015-12-302-27/+15
|\ \ \ \
| * | | | Remove outdated commentRyuta Kamizono2015-12-271-28/+0
| * | | | Improve `select_one` in `Mysql2Adapter`Ryuta Kamizono2015-12-272-0/+16
* | | | | Merge pull request #22547 from kamipo/fix_create_table_info_cacheRafael França2015-12-291-2/+6
|\ \ \ \ \
| * | | | | Correctly cache create_table_infoRyuta Kamizono2015-12-171-2/+6
* | | | | | Merge pull request #22830 from jcoyne/parameters_includeRichard Schneeman2015-12-293-1/+11
|\ \ \ \ \ \
| * | | | | | Add AC::Parameters#include?Justin Coyne2015-12-293-1/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #22831 from jmbejar/mime-negotiation-format-from-extension...Santiago Pastorino2015-12-292-3/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Format from Accept headers have higher precedence than path extension formatJorge Bejar2015-12-292-2/+11
| * | | | | Rely on default Mime format when MimeNegotiation#format_from_path_extension i...Jorge Bejar2015-12-292-3/+15
|/ / / / /
* | | | | Merge pull request #22622 from akshay-vishnoi/range_format_fixKasper Timm Hansen2015-12-293-1/+31
|\ \ \ \ \
| * | | | | Fix - to_s(:db) on Numeric rangeAkshay Vishnoi2015-12-293-1/+31
|/ / / / /
* | | | | Merge pull request #22824 from maclover7/add-numericwithformat-testsYves Senn2015-12-291-0/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add test coverage for ActiveSupport::NumericWithFormat#to_formatted_sJon Moss2015-12-281-0/+6
* | | | | Merge pull request #22822 from maclover7/fix-22805Richard Schneeman2015-12-281-0/+1
|\ \ \ \ \
| * | | | | Add a missing require to ActiveSupport::NumericWithFormatJon Moss2015-12-281-0/+1
| |/ / / /
* | | | | Merge pull request #22053 from Empact/first-loadedYves Senn2015-12-284-16/+76
|\ \ \ \ \
| * | | | | Fix `first(limit)` to take advantage of `loaded?` records if availableBen Woosley2015-12-243-8/+39
| * | | | | Deprecate passing `offset` to `find_nth`Ben Woosley2015-12-242-8/+21
* | | | | | tests, don't connect to mysql when running sqlite3 tests.Yves Senn2015-12-281-0/+2
* | | | | | Merge pull request #22809 from prathamesh-sonpatki/fix-broadcast-typoMatthew Draper2015-12-281-1/+1
|\ \ \ \ \ \
| * | | | | | Removed extra "the" in the documentation of `broadcast_message` [ci skip]Prathamesh Sonpatki2015-12-281-1/+1
|/ / / / / /
* | | | | | [ci skip] Fix typos in Active Support changelog.Kasper Timm Hansen2015-12-271-2/+2
* | | | | | Merge pull request #22771 from nwjsmith/document-broadcast-messagesEileen M. Uchitelle2015-12-271-1/+9
|\ \ \ \ \ \
| * | | | | | Document `Logger#broadcast_messages` optionNate Smith2015-12-231-1/+9
* | | | | | | Add CHANGELOG entry for #22759eileencodes2015-12-271-0/+4
* | | | | | | Merge pull request #22759 from akshay-vishnoi/human-size-helperEileen M. Uchitelle2015-12-278-9/+43
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add support for Petabyte and Exabyte in number to human sizeAkshay Vishnoi2015-12-228-9/+43
* | | | | | | Merge pull request #22801 from y-yagi/fix_link_to_prRichard Schneeman2015-12-271-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | fix link to pr [ci skip]yuuji.yaginuma2015-12-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #22791 from habermann24/action_cable_stylingRafael França2015-12-252-9/+1
|\ \ \ \ \ \
| * | | | | | [ActionCable] remove not needed protected call and newlinesJan Habermann2015-12-252-9/+1
* | | | | | | Merge pull request #22792 from maclover7/patch-3Rafael França2015-12-251-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add Ruby 2.3.0 to Travis matrixJon Moss2015-12-251-0/+1
|/ / / / / /
* | | | | | Merge pull request #22789 from prathamesh-sonpatki/fix-thor-default-type-errorYves Senn2015-12-251-1/+1
|\ \ \ \ \ \
| * | | | | | Changed default value of `:rc` option to `nil`Prathamesh Sonpatki2015-12-251-1/+1
|/ / / / / /
* | | | | | Merge pull request #22787 from kamipo/fix_varbinary_with_default_empty_stringSean Griffin2015-12-242-13/+10
|\ \ \ \ \ \
| * | | | | | Fix varbinary with default ''Ryuta Kamizono2015-12-242-13/+10
* | | | | | | Merge pull request #22785 from timrogers/masterRichard Schneeman2015-12-242-14/+16
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Improve RDoc documentation of ActionDispatch::SSLTim Rogers2015-12-242-13/+15