aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25435 from y-yagi/make_as_option_work_with_get_parametersKasper Timm Hansen2016-06-252-2/+18
|\
| * make `as` option work with get parametersyuuji.yaginuma2016-06-252-2/+18
* | Merge pull request #23011 from arnvald/bugfix/correctly_parse_dateGodfrey Chan2016-06-253-7/+25
|\ \
| * | Use correct timezone when parsing date in jsonGrzegorz Witek2016-01-223-7/+25
* | | Merge pull request #25287 from marekkirejczyk/fix_25267Godfrey Chan2016-06-252-1/+8
|\ \ \
| * | | Make select_year work with include_position: true option, fix #25267Marek2016-06-052-1/+8
* | | | Merge pull request #25476 from maclover7/jm-docs-dep-loadingJon Moss2016-06-241-1/+1
|\ \ \ \
| * | | | Update grammar for `config.enable_dependency_loading` docsJon Moss2016-06-241-1/+1
* | | | | Merge pull request #25517 from alexcameron89/per_thread_registryJon Moss2016-06-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ci skip] Add link to method referenced in ActiveSupport::PerThreadRegistryAlex Kitchens2016-06-241-1/+1
|/ / / /
* | | | Merge pull request #25514 from maclover7/jm-ar-nodocKasper Timm Hansen2016-06-241-1/+1
|\ \ \ \
| * | | | nodoc `ActiveRecord::AttributeSet::YAMLEncoder`Jon Moss2016-06-241-1/+1
|/ / / /
* | | | Revert "[ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#dec...Jon Moss2016-06-241-17/+0
* | | | Merge pull request #25506 from y-yagi/return_correct_from_enum_typeSean Griffin2016-06-242-0/+6
|\ \ \ \
| * | | | return correct type from `EnumType`yuuji.yaginuma2016-06-242-0/+6
* | | | | Merge pull request #25470 from alexcameron89/masterVipul A M2016-06-241-1/+12
|\ \ \ \ \
| * | | | | [ci skip] Add additional documentation to ActiveModel::ErrorsAlex Kitchens2016-06-221-1/+12
* | | | | | Merge pull request #25502 from Edouard-chin/exclusive-scope-test-residueRafael França2016-06-241-6/+0
|\ \ \ \ \ \
| * | | | | | Removed a forgotten `with_exclusive_scope` test:Edouard CHIN2016-06-241-6/+0
|/ / / / / /
* | | | | | Merge pull request #25478 from maclover7/jm-permitted-falseRafael França2016-06-232-0/+8
|\ \ \ \ \ \
| * | | | | | `params.permitted?` is false by defaultJon Moss2016-06-232-0/+8
* | | | | | | Merge pull request #25486 from alexcameron89/inheritanceJon Moss2016-06-231-1/+2
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Update Documentation on ActiveRecord::InheritanceAlex Kitchens2016-06-231-1/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #25485 from georgemillo/patch-1Jon Moss2016-06-231-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | English fixGeorge Millo2016-06-231-1/+1
|/ / / / / /
* | | | | | Merge pull request #25480 from kmcphillips/masterRafael França2016-06-222-0/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update changelog for #25351Kevin McPhillips2016-06-221-0/+5
| * | | | | Update changelog for #25341Kevin McPhillips2016-06-221-0/+6
|/ / / / /
* | | | | Initialize the configuration with a valueRafael Mendonça França2016-06-224-10/+2
* | | | | Merge pull request #25473 from bquorning/update-documentation-for-strong_para...Jon Moss2016-06-221-19/+18
|\ \ \ \ \
| * | | | | Update ActionController::Parameters documentation [ci skip]Benjamin Quorning2016-06-221-19/+18
|/ / / / /
* | | | | Fix failing railties testseileencodes2016-06-223-0/+9
* | | | | Add option to enable dependency loading in productionRafael Mendonça França2016-06-222-1/+3
* | | | | Merge pull request #25469 from herminiotorres/update-datetime-to-datetime-loc...Rafael Mendonça França2016-06-226-139/+39
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change datetime to datetime-local helper tagHerminio Torres2016-06-216-139/+39
* | | | | Merge pull request #25467 from aarongray/tweak_time_helpers_docs_for_time_zonesVipul A M2016-06-221-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Create times in rails timezone not system timezone [ci skip]aarongray2016-06-211-3/+3
|/ / / /
* | | | Merge pull request #25464 from prathamesh-sonpatki/fix-http-requestRafael França2016-06-211-1/+1
|\ \ \ \
| * | | | update_url is not `get` most of the times [ci skip]Prathamesh Sonpatki2016-06-221-1/+1
|/ / / /
* | | / Revert "Merge pull request #17973 from maurogeorge/file_field_hidden_field"eileencodes2016-06-213-53/+5
| |_|/ |/| |
* | | Change the raw template handler to render html-safe stringseileencodes2016-06-213-1/+19
* | | Merge pull request #25458 from taboularasa/taboularasa/update-docs-ActiveReco...Jon Moss2016-06-211-0/+17
|\ \ \
| * | | [ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#decodeDavid Elliott2016-06-211-0/+17
* | | | Merge pull request #25415 from maclover7/jm-fix-25410Rafael França2016-06-211-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Add test to better demonstrate `ActiveModel::Errors#added?` behaviorJon Moss2016-06-211-0/+6
* | | | Merge pull request #25450 from prathamesh-sonpatki/fix-testing-guideKasper Timm Hansen2016-06-211-7/+11
|\ \ \ \
| * | | | Fix the docs for supported keyword args for Rails 5 style integration control...Prathamesh Sonpatki2016-06-211-7/+11
* | | | | Merge pull request #25452 from taboularasa/taboularasa/update-docs-api_docume...Kasper Timm Hansen2016-06-201-1/+1
|\ \ \ \ \
| * | | | | [ci skip] correction in command for generating api documentationDavid Elliott2016-06-201-1/+1
|/ / / / /
* | | | | Merge pull request #25430 from nfm/fix-rails-info-routes-for-apps-with-globbi...Richard Schneeman2016-06-203-1/+27
|\ \ \ \ \