Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22275 from mastahyeti/per-form-csrf | Rafael França | 2016-01-06 | 9 | -18/+253 |
|\ | | | | | Per-form CSRF tokens | ||||
| * | add option for per-form CSRF tokens | Ben Toews | 2016-01-04 | 9 | -18/+253 |
| | | |||||
* | | Merge pull request #22938 from sblackstone/master | Rafael França | 2016-01-06 | 2 | -1/+17 |
|\ \ | | | | | | | Provide a better error message if a user mistypes the name of script … | ||||
| * | | Provide a better error message if a user mistypes the name of script with runner | Stephen Blackstone | 2016-01-05 | 2 | -1/+17 |
|/ / | | | | | | | Add tests for detecting bad options for runner | ||||
* | | Move CHANGELOG entry to Active Record | Rafael Mendonça França | 2016-01-05 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | While the type definition is in Active Model the change of behavior will be only user facing in Active Record so better to put the entry in its changelog. [ci skip] | ||||
* | | Merge pull request #20544 from Envek/fix_utc_offset_for_time_attributes | Rafael França | 2016-01-05 | 3 | -1/+9 |
|\ \ | | | | | | | Take UTC offset into account when assigning string value to time attributes. | ||||
| * | | Take UTC offset into account when assigning string value to time attribute. | Andrey Novikov | 2016-01-05 | 3 | -1/+9 |
| | | | |||||
* | | | Merge pull request #22920 from kamipo/fix_connection_create | Rafael França | 2016-01-05 | 5 | -9/+13 |
|\ \ \ | | | | | | | | | Fix `connection#create` in PG adapter | ||||
| * | | | Fix `connection#create` in PG adapter | Ryuta Kamizono | 2016-01-05 | 5 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | Originally `connection#create` had aliased to `connection#insert` in PG adapter. But it was broken by #7447. Re-alias `create` to `insert` for fixing it. | ||||
* | | | | Prefer inspect over escaping and sorround by quote marks | Santiago Pastorino | 2016-01-05 | 1 | -3/+1 |
| | | | | |||||
* | | | | Add Html template handler that wraps Raw output in an OutputBuffer | Santiago Pastorino | 2016-01-05 | 5 | -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_back | Claudio B | 2016-01-05 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | [ci skip] Update doc/resource link removed by #21211 | ||||
| * | | | [ci skip] Update doc/resource link removed by #21211 | Victor Felder | 2016-01-05 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #22927 from jmgcrespo/jmgcrespo-patch-1 | Claudio B | 2016-01-05 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | [ci skip] Add job suffix to sample's job file name | ||||
| * | | | Add job suffix to sample's job file name | Manu | 2016-01-05 | 1 | -2/+2 |
|/ / / | |||||
* | | | :scissors: Unnecessary spacing in the generated code | Akira Matsuda | 2016-01-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #22896 from kamipo/fix_unsigned_and_blob_or_text_column | Rafael França | 2016-01-04 | 3 | -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 MySQL | Ryuta Kamizono | 2016-01-04 | 3 | -5/+16 |
| | | | | |||||
* | | | | Merge pull request #22906 from bf4/rendering_exceptions | Rafael França | 2016-01-04 | 3 | -88/+163 |
|\ \ \ \ | | | | | | | | | | | Add ActionController:Renderers test | ||||
| * | | | | Group related methods together | Benjamin Fleischer | 2016-01-03 | 1 | -67/+67 |
| | | | | | |||||
| * | | | | Add ActionController:Renderers test | Benjamin Fleischer | 2016-01-03 | 3 | -24/+99 |
| | | | | | | | | | | | | | | | | | | | | To complement actionpack/test/controller/metal/renderers_test.rb | ||||
* | | | | | Merge pull request #22550 from tamird/record-fetch-warning-allocate-less | Sean Griffin | 2016-01-04 | 5 | -20/+24 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | activerecord: allocate fewer objects | ||||
| * | | | | activerecord: reuse immutable objects | Tamir Duberstein | 2016-01-04 | 4 | -14/+20 |
| | | | | | |||||
| * | | | | activerecord: allocate fewer arrays in `RecordFetchWarning` | Tamir Duberstein | 2016-01-04 | 1 | -6/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #22915 from kamipo/fix_user_name_in_doc | Eileen M. Uchitelle | 2016-01-04 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Fix user name in doc [ci skip] | ||||
| * | | | Fix user name in doc [ci skip] | Ryuta Kamizono | 2015-12-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update the maintenance policy for the next release. | Rafael Mendonça França | 2016-01-04 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #22821 from shosti/set-null-transaction | Arthur Nogueira Neves | 2016-01-04 | 2 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | Allow add_to_transaction with null transaction | ||||
| * | | | | Allow add_to_transaction with null transaction | Emanuel Evans | 2015-12-28 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/22819 | ||||
* | | | | | Merge pull request #22764 from ↵ | Rafael França | 2016-01-04 | 3 | -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 name | Steven Spiel | 2016-01-01 | 3 | -3/+43 |
| | | | | | |||||
* | | | | | Merge pull request #22890 from DNNX/times-map | Santiago Pastorino | 2016-01-03 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Replace x.times.map{} with Array.new(x){} in AD::Journey::Path::Pattern | ||||
| * | | | | | Replace x.times.map{} with Array.new(x){} | Viktar Basharymau | 2016-01-02 | 1 | -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-name | Zachary Scott | 2016-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fix typo in test description | ||||
| * | | | | | Fix typo in test desctiption [skip ci] | Anton Davydov | 2016-01-04 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #22901 from prathamesh-sonpatki/fix-gemfile-lock | Kasper Timm Hansen | 2016-01-03 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Updated Gemfile.lock with latest change related to sucker_punch dependency | ||||
| * | | | | | Updated Gemfile.lock with latest change related to sucker_punch dependency | Prathamesh Sonpatki | 2016-01-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/commit/bc194937ad6c1fa12bca73cfc05de39a97ba783d. | ||||
* | | | | | | Merge pull request #22899 from y-yagi/move_changelog_entry | Kasper Timm Hansen | 2016-01-03 | 1 | -3/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | move CHANGELOG entry to the appropriate position [ci skip] | ||||
| * | | | | | move CHANGELOG entry to the appropriate position [ci skip] | yuuji.yaginuma | 2016-01-03 | 1 | -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_comments | Claudio B | 2016-01-02 | 1 | -3/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip] | ||||
| * | | | | | Remove FIXME comments about the `Arel::Nodes::Quoted` [ci skip] | Ryuta Kamizono | 2016-01-03 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Arel::Nodes::Quoted` was removed already. Follow up to f916aa247bddba0c58c50822886bc29e8556df76. | ||||
* | | | | | | Merge pull request #22891 from ↵ | Claudio B | 2016-01-02 | 1 | -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 Sonpatki | 2016-01-02 | 1 | -3/+0 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | release notes [ci skip] | ||||
* | | | | | | Merge pull request #22895 from brandonhilkert/api-refactor | Matthew Draper | 2016-01-03 | 1 | -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 API | Brandon Hilkert | 2016-01-02 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #22887 from y-yagi/application_record_in_plugin | Kasper Timm Hansen | 2016-01-02 | 2 | -4/+23 |
|\ \ \ \ \ | |/ / / / |/| | | | | correctly presence check of `application_record.rb` in plugin | ||||
| * | | | | correctly presence check of `application_record.rb` in plugin | yuuji.yaginuma | 2016-01-02 | 2 | -1/+16 |
| | | | | | |||||
| * | | | | add test of that `application_record.rb` is generated in plugin | yuuji.yaginuma | 2016-01-02 | 1 | -3/+7 |
|/ / / / | |||||
* | | | | Merge pull request #22487 from joshsoftware/issue_22413 | Santiago Pastorino | 2016-01-01 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Added support for bigdecimals in perform_later | ||||
| * | | | | Added support for bigdecimals in perform later | Siva Gollapalli | 2015-12-03 | 2 | -3/+3 |
| | | | | |