Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into require_relative_2017 | Xavier Noria | 2017-07-02 | 24 | -236/+257 |
|\ | |||||
| * | Expectation first | Akira Matsuda | 2017-07-02 | 2 | -8/+8 |
| | | |||||
| * | Avoid shadowed variable | Matthew Draper | 2017-07-02 | 1 | -2/+2 |
| | | |||||
| * | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string" | Matthew Draper | 2017-07-02 | 191 | -191/+1 |
| | | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa. | ||||
| * | Merge pull request #29540 from kirs/rubocop-frozen-string | Matthew Draper | 2017-07-02 | 191 | -1/+191 |
| |\ | | | | | | | | | | Enforce frozen string in Rubocop | ||||
| | * | Enforce frozen string in Rubocop | Kir Shatrov | 2017-07-01 | 191 | -1/+191 |
| | | | |||||
| * | | Merge pull request #29506 from pat/frozen-string-literals | Matthew Draper | 2017-07-02 | 21 | -225/+225 |
| |\ \ | | | | | | | | | | | | | Make ActiveSupport frozen-string-literal friendly. | ||||
| | * | | Make ActionView frozen string literal friendly. | Pat Allan | 2017-06-20 | 19 | -220/+220 |
| | | | | | | | | | | | | | | | | Plus a couple of related ActionPack patches. | ||||
| | * | | Make ActionMailer frozen string literal friendly. | Pat Allan | 2017-06-20 | 2 | -3/+3 |
| | | | | |||||
| | * | | Make ActiveModel frozen string literal friendly. | Pat Allan | 2017-06-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Includes two external changes because they're referenced within the ActiveModel test suite. | ||||
| * | | | Merge pull request #29349 from robertomiranda/responsive-images | Matthew Draper | 2017-07-02 | 3 | -3/+24 |
| |\ \ \ | | | | | | | | | | | | | | | | Add srcset option to image_tag helper | ||||
| | * | | | Add `srcset` option to `image_tag` helper | Roberto Miranda | 2017-06-29 | 3 | -2/+23 |
| | | |/ | | |/| | |||||
* | / | | [Action View] require => require_relative | Akira Matsuda | 2017-07-01 | 25 | -35/+35 |
|/ / / | |||||
* / / | Fallback Parameters#to_s to Hash#to_s | Kir Shatrov | 2017-06-30 | 1 | -0/+6 |
|/ / | | | | | Fixes https://github.com/rails/rails/issues/29617 | ||||
* | | Merge pull request #29588 from greysteil/add-gemspec-links | Rafael França | 2017-06-28 | 1 | -0/+5 |
|\ \ | | | | | | | Add source code and changelog links to gemspecs | ||||
| * | | Add source code and changelog links to gemspecs | Grey Baker | 2017-06-28 | 1 | -0/+5 |
| | | | |||||
* | | | :scissors: | Ryuta Kamizono | 2017-06-28 | 1 | -4/+4 |
|/ / | | | | | | | [ci skip] | ||||
* | | Add changes to CHANGELOG | savroff | 2017-06-19 | 1 | -0/+6 |
| | | | | | | | | | | | | fix fix | ||||
* | | Fix current_page? helper issue with engine root path | savroff | 2017-06-19 | 2 | -4/+17 |
|/ | |||||
* | Use `require_relative` instead of `require` with full path | bogdanvlviv | 2017-06-14 | 1 | -1/+1 |
| | |||||
* | Generate field ids in `collection_check_boxes` and `collection_radio_buttons` | yuuji.yaginuma | 2017-06-11 | 4 | -18/+28 |
| | | | | | This makes sure that the labels are linked up with the fields. Fixes #29014 | ||||
* | Don't rely on the @view_renderer being defined. | Kasper Timm Hansen | 2017-06-08 | 1 | -2/+2 |
| | | | | That won't be true for Action Pack and Action Mailer. | ||||
* | Merge pull request https://github.com/rails/rails/pull/28637 from ↵ | Kasper Timm Hansen | 2017-06-08 | 6 | -33/+42 |
| | | | | st0012/fix-partial-cache-logging | ||||
* | Use a hash to record every partial's cache hit status instead of sharing a ↵ | Stan Lo | 2017-06-08 | 7 | -3/+51 |
| | | | | boolean. | ||||
* | Don't support namespace in form_with. | Kasper Timm Hansen | 2017-06-07 | 1 | -18/+0 |
| | | | | | form_with requires people to pass an id manually, so users can just prefix their namespace right there. | ||||
* | Move slicing to initializer. | Kasper Timm Hansen | 2017-06-07 | 2 | -2/+2 |
| | | | | | | Forgot all about https://github.com/rails/rails/pull/28844/files#r113780934 cc @rafaelfranca | ||||
* | Use mattr_accessor default: option throughout the project | Genadi Samokovarov | 2017-06-03 | 7 | -25/+13 |
| | |||||
* | Merge pull request #29187 from robin850/remove-mathn | Rafael França | 2017-05-30 | 1 | -3/+11 |
|\ | | | | | Remove requirement on mathn | ||||
| * | Remove requirement on mathn | Robin Dupret | 2017-05-30 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test using mathn was first introduced in f1d9179 to check that the `distance_of_time_in_words` properly doesn't use the `Fixnum#/` method by explicitly requiring this library as it redefines this method. Given that `mathn` has been gemified in Ruby 2.5 and is deprecated since version 2.2, we can certainly safely assume that people will most-likely not require this library in their application. However, to make sure that we don't regress, let's add a test similar to the one before f1d9179. | ||||
* | | Grammar fixes | Jon Moss | 2017-05-29 | 1 | -2/+3 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #29191 from ↵ | Kasper Timm Hansen | 2017-05-29 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | bogdanvlviv/pass_params_filename_lineno_to_class_eval Pass params __FILE__ and __LINE__ + 1 if class_eval with << | ||||
| * | | Pass params __FILE__ and __LINE__ + 1 if class_eval with << | bogdanvlviv | 2017-05-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #29151 from onemanstartup/jquery_slim_fix | Guillermo Iguaran | 2017-05-29 | 1 | -1/+1 |
|\ \ | | | | | | | Check for jQuery ajax | ||||
| * | | Check for jQuery ajax | Dmitriy Plekhanov | 2017-05-19 | 1 | -1/+1 |
| | | | | | | | | | jQuery slim version doesn't have ajax, so if a person include this version ajaxFilter raises error. | ||||
* | | | Add option for class_attribute default (#29270) | David Heinemeier Hansson | 2017-05-29 | 5 | -24/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation | ||||
* | | | Merge pull request #29108 from inopinatus/ujs-sgjs-ie9-support | Kasper Timm Hansen | 2017-05-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix server-generated JS response processing on IE9 | ||||
| * | | | Fix server-generated JS response processing on IE9 when using rails-ujs and ↵ | Josh Goodall | 2017-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | remote: true | ||||
* | | | | Update to rails-ujs documentation for yarn install | Adrian Stainforth | 2017-05-26 | 1 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__ | Matthew Draper | 2017-05-26 | 14 | -37/+35 |
|\ \ \ \ | | | | | | | | | | | Define path with __dir__ | ||||
| * | | | | Define path with __dir__ | bogdanvlviv | 2017-05-23 | 14 | -37/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ".. with __dir__ we can restore order in the Universe." - by @fxn Related to 5b8738c2df003a96f0e490c43559747618d10f5f | ||||
* | | | | | Merge pull request #29119 from spohlenz/fix-select-with-enumerable | Matthew Draper | 2017-05-24 | 2 | -1/+18 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix select tag helper used with Enumerable choices | ||||
| * | | | | Fix select tag helper used with Enumerable choices | Sam Pohlenz | 2017-05-17 | 2 | -1/+18 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | Allows a custom object implementing Enumerable to be used as the choices parameter for a select tag, which previously wasn't possible due to the call to `empty?` on the choices (which isn't implemented on Enumerable). | ||||
* | | | | Update test link in ActionView javascripts README.md. | Josef Šimánek | 2017-05-22 | 1 | -1/+1 |
| |/ / |/| | | | | | [ci skip] | ||||
* | | | Add :json type to auto_discovery_link_tag | Mike Gunderloy | 2017-05-20 | 3 | -5/+12 |
| |/ |/| | | | | | | | This allows auto_discovery_link_tag to support the JSON Feed standard. See https://jsonfeed.org/version/1 for more information. | ||||
* | | Merge pull request #29057 from ↵ | Akira Matsuda | 2017-05-19 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | koic/suppress_warning_assigned_but_unused_variable Suppress `warning: assigned but unused variable - stdout` | ||||
| * | | Suppress `warning: assigned but unused variable - stdout` | Koichi ITO | 2017-05-12 | 1 | -1/+1 |
| |/ | |||||
* | | ERB::Util.url_encode no longer escapes ~ since ruby 2.5 | Akira Matsuda | 2017-05-19 | 1 | -2/+2 |
| | | | | | | | | see: https://bugs.ruby-lang.org/issues/6696 | ||||
* | | Use recyclable cache keys (#29092) | David Heinemeier Hansson | 2017-05-18 | 5 | -15/+23 |
|/ | |||||
* | Should escape meta characters in regexp | Ryuta Kamizono | 2017-05-07 | 4 | -10/+10 |
| | |||||
* | Merge pull request #28753 from st0012/add-render-with-variants-test | Kasper Timm Hansen | 2017-05-01 | 3 | -0/+10 |
|\ | | | | | Add tests for rendering with variants |