Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Preparing for 4.2.0.beta2 release | Rafael Mendonça França | 2014-09-26 | 1 | -1/+1 | |
| | | ||||||
* | | Don’t require already required modules | claudiofullscreen | 2014-09-26 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | abstract_unit.rb requires `action_controller` which [already includes the following lines of code](https://github.com/rails/rails/blob/64fcdce1d3a6a8768ab17f3be144270456814f82/actionpack/lib/action_controller.rb#L2L3): ```ruby require 'abstract_controller' require 'action_dispatch' ``` | |||||
* | | Add +variants to ActionView::FileSystemResolver documentation. | Felipe Oliveira | 2014-09-26 | 1 | -3/+4 | |
|/ | ||||||
* | Merge pull request #17058 from eval/issue-17057 | Rafael Mendonça França | 2014-09-25 | 1 | -0/+9 | |
|\ | | | | | | | Remove internal options from query string of paths | |||||
| * | Remove internal options from query string of paths | Gert Goet | 2014-09-25 | 1 | -0/+9 | |
| | | | | | | | | Fixes #17057 | |||||
* | | Revert "Revert "Merge pull request #16888 from jejacks0n/render_template"" | Godfrey Chan | 2014-09-26 | 3 | -20/+16 | |
| | | | | | | | | This reverts commit 585e75696b31395aee895e5366e331c07c3f5ee1. | |||||
* | | Use released rails-html-sanitizer and rails-deprecated_sanitizer | Godfrey Chan | 2014-09-26 | 1 | -1/+1 | |
| | | ||||||
* | | Use released rails-dom-testing | Rafael Mendonça França | 2014-09-25 | 1 | -1/+1 | |
|/ | ||||||
* | Revert "Merge pull request #16888 from jejacks0n/render_template" | Godfrey Chan | 2014-09-23 | 3 | -16/+20 | |
| | | | | | | | This reverts commit 07635a74b5ee08dcba3f6617def6230d8f114fe5, reversing changes made to 1b5f61a025b6ce1ee52b7148e3ed2a9acbde28b9. Reason: it's not ready :bomb:, see https://github.com/rails/rails/pull/16888#issuecomment-56400816 | |||||
* | CHANGELOG for 07635a7 | Godfrey Chan | 2014-09-23 | 1 | -0/+9 | |
| | ||||||
* | Merge pull request #16888 from jejacks0n/render_template | Godfrey Chan | 2014-09-23 | 2 | -20/+7 | |
|\ | | | | | | | Changes default render behavior from file to template. | |||||
| * | Changes default render behavior from file to template. | jejacks0n | 2014-09-11 | 2 | -20/+7 | |
| | | ||||||
* | | Remove wrapping <div> in form helpers from doc | claudiob | 2014-09-22 | 2 | -35/+19 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] 89ff1f8 and 1de258e6 removed from the HTML generated by the form helpers the <div> that was wrapping the field elements inside the <form>. This commit updates the documentation of the methods to reflect the two commits above. | |||||
* | | [ci skip] ActionView and ActionMailer CHANGELOG docs fixes | Akshay Vishnoi | 2014-09-18 | 1 | -4/+4 | |
| | | ||||||
* | | Merge pull request #16790 from cirosantilli/explain-erb-space-removal | Rafael Mendonça França | 2014-09-16 | 1 | -1/+3 | |
|\ \ | | | | | | | | | | | | | Explain ERB space removal. [ci skip] | |||||
| * | | Explain ERB space removal. [ci skip] | Ciro Santilli | 2014-09-11 | 1 | -1/+3 | |
| | | | ||||||
* | | | handle <%== nil %> cases | Aaron Patterson | 2014-09-14 | 4 | -2/+12 | |
| | | | | | | | | | | | | | | | This is much less common than string literal appends, so add a special case method for it. Maybe fixes bug reported by @jeremy on 97ef636191933f1d4abc92fc10871e6d1195285c | |||||
* | | | Stop nil checking on safe_append= | Aaron Patterson | 2014-09-14 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | ERB compiler guarantees safe_append= will be called with a string, so nil checks don't make sense. Anything else calling this method should check for nil themselves before calling | |||||
* | | | Revert "Merge pull request #15312 from JuanitoFatas/action_view/asset_path" | Matthew Draper | 2014-09-14 | 2 | -1/+12 | |
| |/ |/| | | | | | | | | | | | This reverts commit 21ec7fefea5a1b823cb88733b019b3d52240801d. Per #16911, there's actually a good reason for a "blank" value to have a useful `to_s` here. So let's also add some tests to prove that. | |||||
* | | Merge pull request #16839 from chancancode/default_test_order | Rafael Mendonça França | 2014-09-10 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | Default to sorting user's test cases for now | |||||
| * | | Default to sorting user's test cases for now | Godfrey Chan | 2014-09-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goals: 1. Default to :random for newly generated applications 2. Default to :sorted for existing applications with a warning 3. Only show the warning once 4. Only show the warning if the app actually uses AS::TestCase Fixes #16769 | |||||
* | | | Do not memoize document_root_element in view tests | Rafael Mendonça França | 2014-09-08 | 2 | -2/+12 | |
|/ / | | | | | | | | | | | | | Memoizing will not make possible to assert the output of the view if it is changed after the first assert_select call Related with plataformatec/simple_form#1130 and rails/rails-dom-testing#15 | |||||
* | | fix the undefined method content_tag #15245 | Rajarshi Das | 2014-09-06 | 2 | -1/+1 | |
| | | | | | | | | not required include ActionView::Helpers::TagHelper in test as well | |||||
* | | For now, we will keep sorting the tests. | Matthew Draper | 2014-09-05 | 1 | -1/+1 | |
| | | | | | | | | | | This reverts commits e969c928463e329fd6529ac59cad96385c538ffb and bd2b3fbe54e750ba97469a7896e8d143d6dfd465. | |||||
* | | Extract data/aria attribute prefixes to a constant | Rafael Mendonça França | 2014-09-03 | 1 | -1/+3 | |
| | | ||||||
* | | Add support for ARIA attributes in tags | PaoMar | 2014-09-03 | 3 | -4/+23 | |
| | | ||||||
* | | Ship with rails-html-sanitizer instead. | Kasper Timm Hansen | 2014-09-03 | 3 | -10/+5 | |
|/ | ||||||
* | Shorten ActionView::Base doc summary line. [ci skip] | Ciro Santilli | 2014-09-02 | 1 | -3/+4 | |
| | ||||||
* | Clarify Rails uses erubis not stdlin ERB. [ci skip] | Ciro Santilli | 2014-09-02 | 1 | -1/+2 | |
| | ||||||
* | Leave all our tests as order_dependent! for now | Matthew Draper | 2014-09-02 | 1 | -0/+5 | |
| | | | | | | | | | We're seeing too many failures to believe otherwise. This reverts commits bc116a55ca3dd9f63a1f1ca7ade3623885adcc57, cbde413df3839e06dd14e3c220e9800af91e83ab, bf0a67931dd8e58f6f878b9510ae818ae1f29a3a, and 2440933fe2c27b27bcafcd9019717800db2641aa. | |||||
* | Move implementation to the gems | Rafael Mendonça França | 2014-09-01 | 1 | -22/+10 | |
| | | | | Now we keep only the common code and move the specific code to the gems | |||||
* | Remove warning | Rafael Mendonça França | 2014-09-01 | 1 | -2/+2 | |
| | ||||||
* | Allow polymorphic routes with nil when a route can still be drawn | Sammy Larbi | 2014-08-31 | 1 | -2/+34 | |
| | | | | | | | | | | | | | | | | Suppose you have two resources routed in the following manner: ```ruby resources :blogs do resources :posts end resources :posts ``` When using polymorphic resource routing like `url_for([@blog, @post])`, and `@blog` is `nil` Rails should still try to match the route to the top-level posts resource. Fixes #16754 | |||||
* | Refer to the library name instead of the constant | Robin Dupret | 2014-08-30 | 1 | -1/+1 | |
| | | | | | | | | | When we are loading a component and we want to know its version, we are actually not speaking about the constant but the library itself. [ci skip] [Godfrey Chan & Xavier Noria] | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-29 | 7 | -46/+93 | |
|\ | ||||||
| * | No need to sort tests | Akira Matsuda | 2014-08-28 | 1 | -1/+1 | |
| | | | | | | | | Dir.glob result must be already sorted anyway | |||||
| * | remove useless parameter | Aaron Patterson | 2014-08-27 | 1 | -2/+2 | |
| | | ||||||
| * | remove dead code | Aaron Patterson | 2014-08-27 | 1 | -12/+2 | |
| | | | | | | | | | | | | the ERB has already been compiled to Ruby code by the time we're calling module_eval. Nothing that module eval raises will be caught by a blank `rescue`, so I think we can remove this | |||||
| * | minor changelog formatting changes. | Yves Senn | 2014-08-27 | 1 | -3/+3 | |
| | | ||||||
| * | Merge pull request #16488 from agrobbin/form-label-builder | Jeremy Kemper | 2014-08-25 | 3 | -22/+62 | |
| |\ | | | | | | | Provide a builder for form labels to customize wrapping around I18n content | |||||
| | * | provide a builder for form labels to customize wrapping around I18n content | Alex Robbin | 2014-08-20 | 3 | -22/+62 | |
| | | | ||||||
| * | | Merge pull request #16639 from agrobbin/input-placeholder-i18n | Jeremy Kemper | 2014-08-24 | 5 | -0/+231 | |
| |\ \ | | | | | | | | | Add I18n support for `:placeholder` HTML option is passed to form fields | |||||
| | * | | just use the placeholder tag value if it is passed as a String | Alex Robbin | 2014-08-22 | 2 | -5/+22 | |
| | | | | ||||||
| | * | | add I18n support for `:placeholder` HTML option is passed to form fields | Alex Robbin | 2014-08-22 | 5 | -0/+214 | |
| | | | | ||||||
| * | | | Remove erroneous form_tag option docs | T.J. Schuck | 2014-08-22 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is true of the first param (url_for_options), not of the second options param which is being documented here. [ci skip] | |||||
| * | | | Clarify that unknown keys will become HTML attrs | T.J. Schuck | 2014-08-22 | 1 | -0/+1 | |
| |/ / | | | | | | | | | | | | | | | | Docs for all the other form tag helpers in this file already clarify this. [ci skip] | |||||
| * / | Revert "Add I18n support for `:placeholder` HTML option is passed to form ↵ | Jeremy Kemper | 2014-08-21 | 5 | -214/+0 | |
| |/ | | | | | | | fields" | |||||
* / | Preparing for 4.2.0.beta1 release | David Heinemeier Hansson | 2014-08-19 | 1 | -1/+1 | |
|/ | ||||||
* | Use released rails-deprecated_sanitizer | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 | |
| | ||||||
* | Fix the rails-dom-testing dependecy | Rafael Mendonça França | 2014-08-19 | 1 | -0/+1 | |
| |