aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25070 from josedonizetti/fix_example_routes_docArthur Nogueira Neves2016-05-191-3/+3
|\
| * fix named route example [ci skip]Jose Donizetti2016-05-191-3/+3
* | Support for unified Integer class in Ruby 2.4+Jeremy Daer2016-05-1843-119/+116
|/
* Merge pull request #19428 from bdmac/fix_safe_buffer_titleizeRafael Mendonça França2016-05-181-1/+2
|\
| * Fixes Inflector#titleize to work with SafeBufferBrian McManus2015-03-203-2/+10
* | Merge pull request #25067 from ro31337/patch-2Rafael França2016-05-181-0/+1
|\ \
| * | Improve method descriptionRoman Pushkin2016-05-181-0/+1
|/ /
* | Merge pull request #25066 from mohitnatoo/rails-validation-happensRafael França2016-05-181-4/+2
|\ \
| * | - removing redundant 'happens' in documentation [ci skip]Mohit Natoo2016-05-191-4/+2
|/ /
* | Merge pull request #25059 from maclover7/jm-capitalize-md5Rafael França2016-05-172-4/+4
|\ \
| * | `md5` --> `MD5`Jon Moss2016-05-172-4/+4
|/ /
* | Merge pull request #25052 from matkoniecz/2008_is_not_recentJon Moss2016-05-171-3/+1
|\ \
| * | update to make it less obvious that this guide is from 2008/2009Mateusz Konieczny2016-05-171-3/+1
* | | keep layouts + locals from bloating the cacheAaron Patterson2016-05-173-3/+39
* | | Safari 4 supports http only cookie (#25053)Mateusz Konieczny2016-05-171-1/+1
* | | locals can be accessed from templates rendered in the controllerAaron Patterson2016-05-171-0/+16
* | | Merge pull request #25039 from maclover7/jm-capitalization-2Jon Moss2016-05-171-15/+15
|\ \ \ | |/ / |/| |
| * | Fix security guide capitalization errorsJon Moss2016-05-161-15/+15
* | | Add Attributes API to release notes [ci skip]Vipul A M2016-05-171-1/+68
|\ \ \
| * | | Add Attributes API to release notesVipul A M2016-04-141-1/+68
* | | | Merge pull request #25036 from maclover7/jm-capitalizationJon Moss2016-05-161-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | `md5` --> `MD5`Jon Moss2016-05-161-3/+3
* | | | Update the Rails security guide [ci skip]Vipul A M2016-05-171-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Update the Rails security guideRalin Chimev2016-05-161-2/+2
* | | | Remove extranous spaces from assignment.Kasper Timm Hansen2016-05-161-1/+1
* | | | Replace middleware with executor callback.Kasper Timm Hansen2016-05-162-8/+1
* | | | Merge pull request #24203 from sferik/count_with_blockKasper Timm Hansen2016-05-165-6/+28
|\ \ \ \
| * | | | Forward ActiveRecord::Relation#count to Enumerable#count if block givenErik Michaels-Ober2016-03-195-6/+28
* | | | | Merge pull request #24930 from henrik/date-all-daySean Griffin2016-05-163-5/+22
|\ \ \ \ \
| * | | | | Introduce Date#all_dayHenrik Nyh2016-05-113-5/+22
* | | | | | Merge pull request #25009 from jahfer/suppressor-keep-stateSean Griffin2016-05-162-1/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Keep state around for nested calls to #suppressJahfer Husain2016-05-162-1/+14
* | | | | | Merge pull request #23810 from xijo/fix_json_coder_when_mysql_strict_is_disabledSean Griffin2016-05-163-1/+20
|\ \ \ \ \ \
| * | | | | | Fix bug in JSON deserialization when column default is an empty stringJohannes Opper2016-02-223-1/+21
* | | | | | | Merge pull request #25023 from slbug/patch-1Sean Griffin2016-05-162-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Rails 5.1 point type should not raise exception if empty string is provided a...bUg2016-05-152-0/+9
* | | | | | | | Action Mailer: Declarative exception handling with `rescue_from`.Jeremy Daer2016-05-1513-123/+274
* | | | | | | | Merge pull request #25022 from ysksn/masterRafael França2016-05-152-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove unnecessary constantYosuke Kabuto2016-05-151-4/+2
| * | | | | | | Add some assertions for BigDecimal#to_sYosuke Kabuto2016-05-151-0/+2
|/ / / / / / /
* | | | | | | reorder env keys in the generated config/cable.ymlXavier Noria2016-05-151-5/+4
* | | | | | | Merge pull request #25002 from maclover7/jm-add-actioncable-guideXavier Noria2016-05-141-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Add Action Cable guide to listJon Moss2016-05-131-0/+4
| | |/ / / / / | |/| | | | |
* | | | | | | edit pass over the cable guide [ci skip]Xavier Noria2016-05-141-143/+181
* | | | | | | Merge pull request #24992 from tomkadwill/test_and_comment_server_port_rebasedEileen M. Uchitelle2016-05-142-0/+22
|\ \ \ \ \ \ \
| * | | | | | | Document and test ActionDispatch server_portTom Kadwill2016-05-122-0/+22
* | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-05-147-53/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | Add output snippet from `ActionController::API.ancestors - ActionController::...Vipul A M2016-05-131-0/+7
| * | | | | | | | Remove ambiquity in what we are referring to in the documentation of config v...Vipul A M2016-05-111-1/+1
| * | | | | | | | Document config.action_dispatch.ignore_accept_header and config.action_dispat...Vipul A M2016-05-111-0/+4