aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cable: Generate .js or .coffee files while generating channel as per the java...Prathamesh Sonpatki2016-05-174-5/+44
* 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
| * | | | | | | More missing true literal quotingsVipul A M2016-05-111-12/+12
| * | | | | | | Lets be consistent in the usage of true/false across this guide. It should be...Vipul A M2016-05-111-26/+26
| * | | | | | | Document missing smtp config over at configuring guide. [ci skip]Vipul A M2016-05-111-0/+3
| * | | | | | | This config still applies for Rails 4 Apps and we need to mention it, what wa...Vipul A M2016-05-111-2/+2
| * | | | | | | Asset Pipeline: Remove outdated comment about `config.assets.digest` [ci skip]Prathamesh Sonpatki2016-05-081-1/+1
| * | | | | | | Asset pipeline: Remove documentation about outdated `config.assets.compress` ...Prathamesh Sonpatki2016-05-082-14/+7
| * | | | | | | s/words_connnector/words_connector/Vipul A M2016-05-031-1/+1
| * | | | | | | Fix code formatting in docsJay Hayes2016-05-031-2/+2
| * | | | | | | Add example for UnknownAttributeErrorVipul A M2016-05-021-0/+9
| * | | | | | | Active Model: Messages for strict validation always convert attributes to hum...Prathamesh Sonpatki2016-05-011-2/+2
| * | | | | | | Move comment up to the class, for both of the methods, and document on class ...Vipul A M2016-05-011-1/+4
* | | | | | | | Merge pull request #25008 from lvl0nax/as_enumarable_index_by_refactoringRafael França2016-05-141-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Perfomance fix for Enumerable#index_bylvl0nax2016-05-141-1/+3
* | | | | | | | | Merge pull request #25003 from kangkyu/missing_lineRafael França2016-05-141-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add missing space and newline for clarityKang-Kyu Lee2016-05-121-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #25015 from joemasilotti/patch-1Eileen M. Uchitelle2016-05-131-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add notes on cosmetic patchesJoe Masilotti2016-05-131-0/+4
|/ / / / / / /