aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Add Logger option to disable message broadcasts"schneems2016-01-053-45/+22
| | | | This reverts related commits due to #22917.
* Prefer inspect over escaping and sorround by quote marksSantiago Pastorino2016-01-051-3/+1
|
* Add Html template handler that wraps Raw output in an OutputBufferSantiago Pastorino2016-01-055-2/+21
| | | | | | | This fixes the case when you try to render an html you know safe and the file is named something.html. With this commit the content of the html won't be escaped anymore because AV won't use Raw handler and choose Html handler instead.
* Merge pull request #22922 from vhf/add_fpb_backClaudio B2016-01-051-0/+1
|\ | | | | [ci skip] Update doc/resource link removed by #21211
| * [ci skip] Update doc/resource link removed by #21211Victor Felder2016-01-051-0/+1
| |
* | Merge pull request #22927 from jmgcrespo/jmgcrespo-patch-1Claudio B2016-01-051-2/+2
|\ \ | |/ |/| [ci skip] Add job suffix to sample's job file name
| * Add job suffix to sample's job file nameManu2016-01-051-2/+2
|/
* :scissors: Unnecessary spacing in the generated codeAkira Matsuda2016-01-051-1/+1
|
* Merge pull request #22896 from kamipo/fix_unsigned_and_blob_or_text_columnRafael França2016-01-043-5/+16
|\ | | | | Fix `unsigned?` and `blob_or_text_column` for Enum columns in MySQL
| * Fix `unsigned?` and `blob_or_text_column?` for Enum columns in MySQLRyuta Kamizono2016-01-043-5/+16
| |
* | Merge pull request #22906 from bf4/rendering_exceptionsRafael França2016-01-043-88/+163
|\ \ | | | | | | Add ActionController:Renderers test
| * | Group related methods togetherBenjamin Fleischer2016-01-031-67/+67
| | |
| * | Add ActionController:Renderers testBenjamin Fleischer2016-01-033-24/+99
| | | | | | | | | | | | To complement actionpack/test/controller/metal/renderers_test.rb
* | | Merge pull request #22550 from tamird/record-fetch-warning-allocate-lessSean Griffin2016-01-045-20/+24
|\ \ \ | | | | | | | | activerecord: allocate fewer objects
| * | | activerecord: reuse immutable objectsTamir Duberstein2016-01-044-14/+20
| | | |
| * | | activerecord: allocate fewer arrays in `RecordFetchWarning`Tamir Duberstein2016-01-041-6/+4
| | |/ | |/|
* | | Merge pull request #22915 from kamipo/fix_user_name_in_docEileen M. Uchitelle2016-01-041-1/+1
|\ \ \ | | | | | | | | Fix user name in doc [ci skip]
| * | | Fix user name in doc [ci skip]Ryuta Kamizono2015-12-311-1/+1
| | | |
* | | | Update the maintenance policy for the next release.Rafael Mendonça França2016-01-041-3/+3
| | | |
* | | | Merge pull request #22821 from shosti/set-null-transactionArthur Nogueira Neves2016-01-042-0/+6
|\ \ \ \ | | | | | | | | | | Allow add_to_transaction with null transaction
| * | | | Allow add_to_transaction with null transactionEmanuel Evans2015-12-282-0/+6
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22819
* | | | | Merge pull request #22764 from ↵Rafael França2016-01-043-3/+43
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | stevenspiel/titleize_model_name_for_default_submit_button_value titleize the model name on default submit buttons
| * | | | downcase default submit button value's model nameSteven Spiel2016-01-013-3/+43
| | | | |
* | | | | Merge pull request #22890 from DNNX/times-mapSantiago Pastorino2016-01-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Replace x.times.map{} with Array.new(x){} in AD::Journey::Path::Pattern
| * | | | | Replace x.times.map{} with Array.new(x){}Viktar Basharymau2016-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former is slightly more readable, performant and has fewer method calls. ```ruby Benchmark.ips do |x| x.report('times.map') { 5.times.map{} } x.report('Array.new') { Array.new(5){} } x.compare! end __END__ Calculating ------------------------------------- times.map 21.188k i/100ms Array.new 30.449k i/100ms ------------------------------------------------- times.map 311.613k (± 3.5%) i/s - 1.568M Array.new 590.374k (± 1.2%) i/s - 2.954M Comparison: Array.new: 590373.6 i/s times.map: 311612.8 i/s - 1.89x slower ```
* | | | | | Merge pull request #22904 from davydovanton/doc-typo-test-nameZachary Scott2016-01-041-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix typo in test description
| * | | | | Fix typo in test desctiption [skip ci]Anton Davydov2016-01-041-1/+1
|/ / / / /
* | | | | Merge pull request #22901 from prathamesh-sonpatki/fix-gemfile-lockKasper Timm Hansen2016-01-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Updated Gemfile.lock with latest change related to sucker_punch dependency
| * | | | | Updated Gemfile.lock with latest change related to sucker_punch dependencyPrathamesh Sonpatki2016-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/commit/bc194937ad6c1fa12bca73cfc05de39a97ba783d.
* | | | | | Merge pull request #22899 from y-yagi/move_changelog_entryKasper Timm Hansen2016-01-031-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | move CHANGELOG entry to the appropriate position [ci skip]
| * | | | | move CHANGELOG entry to the appropriate position [ci skip]yuuji.yaginuma2016-01-031-3/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | petabyte and exabyte numeric conversion has been added after the 5.0.0.beta1 release. ref: 85048e90ab6ff6963919a9d10493b3910cd67b68
* | | | | Merge pull request #22889 from kamipo/remove_fixme_commentsClaudio B2016-01-021-3/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]
| * | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip]Ryuta Kamizono2016-01-031-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Arel::Nodes::Quoted` was removed already. Follow up to f916aa247bddba0c58c50822886bc29e8556df76.
* | | | | | Merge pull request #22891 from ↵Claudio B2016-01-021-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/rm-duplicate-entry-for-cache-key Remove duplicate entry for ActiveRecord::Relation#cache_key from Rails 5 release notes [ci skip]
| * | | | | | Remove duplicate entry for ActiveRecord::Relation#cache_key from Rails 5 ↵Prathamesh Sonpatki2016-01-021-3/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | release notes [ci skip]
* | | | | | Merge pull request #22895 from brandonhilkert/api-refactorMatthew Draper2016-01-031-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Ensure sucker_punch < v2 is installed due to the change in public API
| * | | | | Ensure sucker_punch < v2 is installed due to the change in public APIBrandon Hilkert2016-01-021-1/+1
|/ / / / /
* | | | | Merge pull request #22887 from y-yagi/application_record_in_pluginKasper Timm Hansen2016-01-022-4/+23
|\ \ \ \ \ | |/ / / / |/| | | | correctly presence check of `application_record.rb` in plugin
| * | | | correctly presence check of `application_record.rb` in pluginyuuji.yaginuma2016-01-022-1/+16
| | | | |
| * | | | add test of that `application_record.rb` is generated in pluginyuuji.yaginuma2016-01-021-3/+7
|/ / / /
* | | | Merge pull request #22487 from joshsoftware/issue_22413Santiago Pastorino2016-01-012-3/+3
|\ \ \ \ | | | | | | | | | | Added support for bigdecimals in perform_later
| * | | | Added support for bigdecimals in perform laterSiva Gollapalli2015-12-032-3/+3
| | | | |
* | | | | Merge pull request #22877 from kamipo/refactor_case_sensitive_comparisonRafael França2016-01-014-20/+17
|\ \ \ \ \ | | | | | | | | | | | | Refactor `case_{sensitive|insensitive}_comparison`
| * | | | | Refactor `case_{sensitive|insensitive}_comparison`Ryuta Kamizono2016-01-014-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ``` SELECT 1 AS one FROM "topics" WHERE "topics"."title" = 'abc' LIMIT $1 [["LIMIT", 1]] ``` After: ``` SELECT 1 AS one FROM "topics" WHERE "topics"."title" = $1 LIMIT $2 [["title", "abc"], ["LIMIT", 1]] ```
* | | | | | New changelog entries are added to the top.Rafael Mendonça França2016-01-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #22856 from ↵Rafael França2016-01-013-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | rthbound/adds-exception-object-to-instrumenter-payload Adds exception object to instrumenter's payload
| * | | | | | Adds exception object to instrumenter's payloadRyan T. Hosford2015-12-313-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds new key/value pair to payload when an exception is raised e.g. `:exception_object=> #<RuntimeError: FAIL>` - Updates relevant test - Adds CHANGELOG entry
* | | | | | | Update copyright notice for 2016Guillermo Iguaran2016-01-011-1/+1
| | | | | | |
* | | | | | | Merge pull request #22874 from ↵Rafael França2016-01-012-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/create-application-model-under-namespaced-dir-in-plugin Create application_record.rb under namespaced directory in plugin
| * | | | | | | Create application_record under namespaced directory in pluginPrathamesh Sonpatki2016-01-012-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Earlier it was creating application_record.rb under `app/models`, after this change, it will create application_record.rb under `app/models/plugin_name` similar to other application classes.