aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | Improve documentation of config.force_ssl in guidesTim Rogers2015-12-241-2/+2
| |/ / / / /
* | | | | | Merge pull request #22786 from jonatack/remove-whitespaceClaudio B2015-12-242-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | :scissors: whitespace in generated config files [skip ci]Jon Atack2015-12-242-2/+2
|/ / / / /
* | | | | Merge pull request #22778 from y-yagi/fix_submit_tag_with_symbol_valueYves Senn2015-12-243-1/+13
|\ \ \ \ \
| * | | | | fix TypeError when using submit_tag with Symbol valueyuuji.yaginuma2015-12-242-1/+8
* | | | | | Merge pull request #22780 from pauloancheta/masterRichard Schneeman2015-12-231-1/+1
|\ \ \ \ \ \
| * | | | | | fix typo on commentsPaulo Ancheta2015-12-231-1/+1
|/ / / / / /
* | | | | | Merge pull request #22750 from nettofarah/patch-1Sean Griffin2015-12-231-1/+26
|\ \ \ \ \ \
| * | | | | | Plugin Usage and Installation instructionsNetto Farah2015-12-231-1/+26
* | | | | | | Move test coloring closer to where it's used.Kasper Timm Hansen2015-12-231-15/+9
* | | | | | | Remove local variable color.Kasper Timm Hansen2015-12-231-5/+5
* | | | | | | Rename color to color_output.Kasper Timm Hansen2015-12-231-6/+5
* | | | | | | Remove unused blue color.Kasper Timm Hansen2015-12-231-2/+1