aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow specifying encoding of parameters by actionKerri Miller2016-08-0910-20/+139
* 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
* | explain why aliasing uses explicit selfs [ci skip]Xavier Noria2016-08-081-0/+3
* | code gardening: removes redundant selfsXavier Noria2016-08-0874-122/+121
* | revises most Lint/EndAlignment offensesXavier Noria2016-08-0713-55/+58
* | applies project convention for string literalsXavier Noria2016-08-071-1/+1
* | adds missing comma in assert callXavier Noria2016-08-071-2/+2
* | copy-edits an exception messageXavier Noria2016-08-071-1/+1
* | Assign config on base instead of on `@controller`.Kasper Timm Hansen2016-08-071-1/+1
* | Extract common view cache dependency setup.Kasper Timm Hansen2016-08-071-8/+9
* | Add changelog entry to Action Pack as well.Kasper Timm Hansen2016-08-071-0/+24
* | Move CHANGELOG entry to the top.Kasper Timm Hansen2016-08-071-11/+11
* | Add back unintentionally removed newline.Kasper Timm Hansen2016-08-071-0/+1
* | Merge pull request #25825 from st0012/partial-cacheKasper Timm Hansen2016-08-0711-25/+151
|\ \
| * | Modify LogSubscriber for single partial's cache message.Stan Lo2016-08-0811-25/+151
* | | Merge pull request #26003 from darkbaby123/fix_xhr_overwrite_headers_in_testKasper Timm Hansen2016-08-073-4/+26
|\ \ \ | |/ / |/| |
| * | Fix Accept header overridden when "xhr: true" in integration testDavid Chen2016-08-073-4/+26
* | | Merge pull request #26076 from yui-knk/privatize_expandKasper Timm Hansen2016-08-071-10/+10
|\ \ \
| * | | `ActiveRecord::PredicateBuilder#expand` to be privateyui-knk2016-08-071-10/+10
* | | | Merge pull request #24260 from y-yagi/show_error_message_when_error_raised_in...Kasper Timm Hansen2016-08-072-5/+9
|\ \ \ \
| * | | | show error message when error raised in rails runneryuuji.yaginuma2016-08-032-5/+9
* | | | | Defer requiring Rake until it's needed.Kasper Timm Hansen2016-08-071-1/+8
| |_|/ / |/| | |
* | | | Fix a typoVijay Dev2016-08-071-1/+1
* | | | Merge pull request #26077 from kamipo/add_stype_empty_linesXavier Noria2016-08-0776-90/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty linesRyuta Kamizono2016-08-0776-90/+4
|/ / /
* | | Merge pull request #26073 from kamipo/revert_passing_splat_binds_for_arel_nodeSean Griffin2016-08-064-13/+11
|\ \ \
| * | | Revert passing arel node with splat binds for `where`Ryuta Kamizono2016-08-062-3/+5
| * | | Don't passing a nil value to `case_sensitive_comparison`Ryuta Kamizono2016-08-063-13/+9
* | | | Merge pull request #26060 from siong1987/minor/puma-configGuillermo Iguaran2016-08-061-1/+1
|\ \ \ \
| * | | | .to_i is unnecessary.Teng Siong Ong2016-08-041-1/+1
| | |_|/ | |/| |
* | | | applies remaining conventions across the projectXavier Noria2016-08-06261-664/+434
* | | | normalizes indentation and whitespace across the projectXavier Noria2016-08-06463-11661/+11638
* | | | remove redundant curlies from hash argumentsXavier Noria2016-08-06100-563/+486
* | | | modernizes hash syntax in the rest of the projectXavier Noria2016-08-063-16/+16
* | | | modernizes hash syntax in guidesXavier Noria2016-08-065-11/+11
* | | | modernizes hash syntax in railtiesXavier Noria2016-08-068-29/+29
* | | | modernizes hash syntax in activesupportXavier Noria2016-08-0657-1040/+1040
* | | | modernizes hash syntax in activerecordXavier Noria2016-08-06202-2408/+2404
* | | | modernizes hash syntax in activemodelXavier Noria2016-08-064-7/+7
* | | | modernizes hash syntax in activejobXavier Noria2016-08-063-12/+12
* | | | modernizes hash syntax in actionviewXavier Noria2016-08-0668-1123/+1123
* | | | modernizes hash syntax in actionpackXavier Noria2016-08-0695-2062/+2062
* | | | modernizes hash syntax in actioncableXavier Noria2016-08-061-2/+2
* | | | applies new string literal convention to the rest of the projectXavier Noria2016-08-0615-149/+149