aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26143 from nathanl/self-explanatory-cache-durationsRafael França2016-08-122-2/+2
|\
| * Make cache max-age durations self-explanatoryNathan Long2016-08-122-2/+2
* | Merge pull request #26100 from vipulnsward/changelogsRafael França2016-08-126-13/+16
|\ \
| * | Pass over changelogs [ci skip]Vipul A M2016-08-106-13/+16
* | | Make private method privateRafael Mendonça França2016-08-121-11/+11
* | | Mark method as nodocRafael Mendonça França2016-08-121-3/+3
* | | Merge pull request #26144 from javierjulio/patch-1Jon Moss2016-08-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Given a hash (Rails 5) .from_hash must be usedJavier Julio2016-08-121-1/+1
|/ /
* | Merge pull request #26133 from smellsblue/dont-fail-on-non-stringRafael França2016-08-122-1/+9
|\ \
| * | Ensure values are strings before calling gsubMike Virata-Stone2016-08-122-1/+9
|/ /
* | Merge pull request #26125 from qinix/fix-docJon Moss2016-08-111-3/+3
|\ \
| * | [ci skip] Fix documentation wrong for ActionCableEric Zhang2016-08-121-1/+1
| * | [ci skip] Fix documentation for ActionCable::Channel#broadcast_toEric Zhang2016-08-121-2/+2
* | | Merge pull request #26118 from alexcameron89/param-encoding-documentationJon Moss2016-08-111-0/+1
|\ \ \
| * | | [ci skip] Add documentation to Parameter EncodingAlex Kitchens2016-08-111-0/+1
| |/ /
* | | Integration test to prevent regression for the 5th timeAaron Patterson2016-08-111-0/+47
* | | Merge pull request #26124 from yahonda/diag26099Sean Griffin2016-08-111-4/+2
|\ \ \
| * | | Creating a new Topic class instead of class_eval for the existing oneYasuo Honda2016-08-111-4/+2
| |/ /
* | | Merge pull request #26090 from kamipo/fix_warning_ambiguous_first_argumentSean Griffin2016-08-111-1/+1
|\ \ \
| * | | Fix warning: ambiguous first argumentRyuta Kamizono2016-08-121-1/+1
|/ / /
* / / ensure tag/content_tag escapes " in attribute valsAndrew Carpenter2016-08-112-1/+11
|/ /
* | Merge pull request #26116 from y-yagi/fix_name_error_in_engine_commands_tasksKasper Timm Hansen2016-08-112-0/+26
|\ \
| * | add missing require rakeyuuji.yaginuma2016-08-112-0/+26
* | | Merge pull request #26114 from kamipo/fix_test_failureKasper Timm Hansen2016-08-112-3/+3
|\ \ \ | |/ / |/| |
| * | Fix actionview test failureRyuta Kamizono2016-08-112-3/+3
|/ /
* | Merge pull request #26110 from aditya-kapoor/minor-doc-fixGuillermo Iguaran2016-08-101-2/+5
|\ \
| * | Minor doc fix related to ActiveModel::SecurePassword [ci skip]Aditya Kapoor2016-08-111-2/+5
* | | prefer __dir__ over __FILE__ in File.expand_pathXavier Noria2016-08-116-6/+18
* | | Merge pull request #25930 from mechanicles/doc-http-cache-foreverVipul A M2016-08-101-0/+24
|\ \ \
| * | | Add documentation for `http_cache_forever`. [ci skip]Santosh Wadghule2016-08-101-0/+24
* | | | Merge pull request #26092 from kerrizor/kerrizor/force-param-encodingAaron Patterson2016-08-1010-20/+139
|\ \ \ \
| * | | | Allow specifying encoding of parameters by actionKerri Miller2016-08-0910-20/+139
* | | | | Merge pull request #26102 from gsamokovarov/schema-statements-typoYves Senn2016-08-102-1/+7
|\ \ \ \ \
| * | | | | Fix a NoMethodError schema_statements.rbGenadi Samokovarov2016-08-102-1/+7
| | |/ / / | |/| | |
* / | | | Remove unused methodAndrew White2016-08-101-5/+0
|/ / / /
* | | | Merge pull request #26095 from kamipo/fix_broken_alignment_by_auto_correctXavier Noria2016-08-0920-39/+77
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix broken alignments caused by auto-correct commit 411ccbdRyuta Kamizono2016-08-1020-39/+77
|/ / /
* | | Merge pull request #24476 from vipulnsward/24314-eagerloading-doc-updateVipul A M2016-08-091-2/+3
|\ \ \
| * | | Document know limitation about using `references` in conjunction with eager l...Vipul A M2016-08-091-2/+3
| | |/ | |/|
* | | Merge pull request #26042 from bogdanvlviv/debugging_guideVipul A M2016-08-091-0/+1
|\ \ \ | |/ / |/| |
| * | Add link to 'Pry' in debugging guide [ci skip]bogdanvlviv2016-08-071-0/+1
* | | Merge pull request #26086 from y-yagi/update_rescue_responses_defaultJon Moss2016-08-081-0/+2
|\ \ \ | |_|/ |/| |
| * | update list of rescue_responses default [ci skip]yuuji.yaginuma2016-08-091-0/+2
|/ /
* | revises more Lint/EndAlignment offensesXavier Noria2016-08-088-30/+30
* | Merge pull request #26067 from yahonda/oracle_can_use_fetch_firstYves Senn2016-08-082-4/+4
|\ \
| * | Use `FETCH FIRST` for Oracle12 database and Arel Oracle12 visitorYasuo Honda2016-08-082-4/+4
|/ /
* | let instance thread_mattr_* methods delegate to the class-level onesXavier Noria2016-08-081-4/+10
* | Merge pull request #25681 from willnet/fix-thread_mattr_accessorYves Senn2016-08-083-4/+48
|\ \
| * | Fix `thread_mattr_accessor` share variable superclass with subclasswillnet2016-08-043-8/+35
* | | damn typos [ci skip]Xavier Noria2016-08-081-1/+1