| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | Allow layout to access current object being rendered when using render partia... | Carlos Antonio da Silva | 2012-04-29 | 1 | -0/+4 |
* | | | | | | Allow layout rendering to access current object being rendered when using par... | Carlos Antonio da Silva | 2012-04-29 | 2 | -2/+7 |
|/ / / / / |
|
* | / / / | Add changelog entry for jsonp mimetype change, fix failing test | Carlos Antonio da Silva | 2012-04-29 | 1 | -1/+1 |
| |/ / /
|/| | | |
|
* | | | | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 1 | -2/+40 |
* | | | | Merge pull request #2321 from omjokine/master | José Valim | 2012-04-29 | 1 | -1/+1 |
|\ \ \ \ |
|
| * \ \ \ | Merge remote-tracking branch 'upstream/master' | Olli Jokinen | 2011-12-01 | 74 | -429/+1708 |
| |\ \ \ \ |
|
| * | | | | | fixed test case test_render_json_with_callback to use content_type applicatio... | Olli Jokinen | 2011-07-28 | 1 | -1/+1 |
* | | | | | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 1 | -0/+17 |
* | | | | | | Merge session arg with existing session instead of overwriting | Andrew White | 2012-04-28 | 1 | -0/+20 |
* | | | | | | remove calls to deprecated find(:first) in actionpack test suite | Sergey Nartimov | 2012-04-26 | 1 | -2/+2 |
* | | | | | | Fix the build | Yehuda Katz | 2012-04-25 | 1 | -1/+2 |
* | | | | | | Merge pull request #5980 from gazay/valid_ips | Jeremy Kemper | 2012-04-25 | 1 | -20/+114 |
|\ \ \ \ \ \ |
|
| * | | | | | | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ... | Alexey Gaziev | 2012-04-25 | 1 | -20/+114 |
* | | | | | | | Remove default match without specified method | Jose and Yehuda | 2012-04-24 | 39 | -341/+341 |
* | | | | | | | Use leap years trick in distance_of_time_in_words only for distances between ... | Alexey Vakhov | 2012-04-24 | 1 | -0/+2 |
* | | | | | | | fixed non matching documentation behaviour with method semantics on distance_... | Marcelo Casiraghi | 2012-04-24 | 1 | -2/+19 |
* | | | | | | | Distance of time in words should work correct if from time > to_time | Alexey Vakhov | 2012-04-24 | 1 | -0/+1 |
|/ / / / / / |
|
* | | | | | | Merge pull request #5865 from tiegz/minor_fixes | Aaron Patterson | 2012-04-20 | 1 | -34/+21 |
|\ \ \ \ \ \ |
|
| * | | | | | | converting some tests to assert_raises, and DRY'ing retrieve_variable changes | Tieg Zaharia | 2012-04-16 | 1 | -39/+17 |
| * | | | | | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 1 | -0/+9 |
* | | | | | | | Remove unused test code. | Rafael Mendonça França | 2012-04-16 | 1 | -5/+0 |
|/ / / / / / |
|
* | | | | | | Merge pull request #5746 from jmbejar/index_method_form_builder | Santiago Pastorino | 2012-04-11 | 1 | -0/+50 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add index method to FormBuilder. Useful when you use field_for and need to kn... | Jorge Bejar | 2012-04-11 | 1 | -0/+50 |
* | | | | | | | Adding itemscope to list of boolean attributes. | Frankie Roberto | 2012-04-09 | 1 | -2/+2 |
* | | | | | | | Merge pull request #5783 from rafaelfranca/default_url_options | Santiago Pastorino | 2012-04-08 | 2 | -2/+2 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | default_url_options does not receive one argument anymore | Rafael Mendonça França | 2012-04-08 | 2 | -2/+2 |
* | | | | | | | | Revert "Merge pull request #5750 from ahoward/master" | Santiago Pastorino | 2012-04-08 | 1 | -18/+0 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #5748 from ai/no_type_in_html5 | Jeremy Kemper | 2012-04-08 | 5 | -104/+104 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Remove unnecessary in HTML 5 type attribute with default value | Andrey A.I. Sitnik | 2012-04-05 | 5 | -104/+104 |
* | | | | | | | | Make url_for work when option is nil and default_url_options has | Rafael Mendonça França | 2012-04-05 | 1 | -0/+9 |
* | | | | | | | | Merge pull request #5750 from ahoward/master | Aaron Patterson | 2012-04-05 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | carefully and quickly merge url_for options | ara.t.howard | 2012-04-04 | 1 | -0/+9 |
| |/ / / / / / |
|
* | | | | | | | Merge pull request #4446 from ayamomiji/patch-1 | José Valim | 2012-04-05 | 1 | -0/+7 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | prevent the cache sweeper ignores NoMethodError | ayaya | 2012-03-29 | 1 | -0/+7 |
* | | | | | | | add type option to atom feed entry builder | Sergey Nartimov | 2012-04-01 | 1 | -0/+31 |
* | | | | | | | Merge pull request #5691 from avakhov/form-label-block | José Valim | 2012-04-01 | 1 | -0/+14 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Block version of label should wrapped in field_with_errors in case of error | Alexey Vakhov | 2012-04-01 | 1 | -0/+14 |
* | | | | | | | | Tests :if option of force_ssl method | Alexey Vakhov | 2012-04-01 | 1 | -0/+23 |
|/ / / / / / / |
|
* | | | | | | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 1 | -0/+7 |
* | | | | | | | Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_name... | José Valim | 2012-03-28 | 4 | -10/+63 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Make controller namespace partial prefix optional | Grant Hutchins | 2012-03-28 | 4 | -6/+59 |
| * | | | | | | | Test that render gets correct exact template name | Grant Hutchins | 2012-03-28 | 1 | -4/+4 |
| |/ / / / / / |
|
* | | | | | | | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable | Santiago Pastorino | 2012-03-28 | 2 | -1/+27 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | datetime_select should work with -/+ infinity dates | Joe Van Dyk | 2012-03-28 | 1 | -0/+12 |
| * | | | | | | Add a test case for layout nil. | José Valim | 2012-03-28 | 1 | -1/+15 |
* | | | | | | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 1 | -0/+1 |
|/ / / / / / |
|
* | | | | | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 1 | -0/+7 |
* | | | | | | config.action_view.embed_authenticity_token_in_remote_forms is true by default | Piotr Sarnacki | 2012-03-28 | 1 | -19/+14 |
* | | | | | | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 1 | -2/+48 |
* | | | | | | Add test for default_url_options[:port] | Aaron Suggs | 2012-03-28 | 1 | -0/+12 |