| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #5746 from jmbejar/index_method_form_builder | Santiago Pastorino | 2012-04-11 | 1 | -0/+50 |
| |\ | | | | | Add method FormBuilder#index | ||||
| | * | Add index method to FormBuilder. Useful when you use field_for and need to ↵ | Jorge Bejar | 2012-04-11 | 1 | -0/+50 |
| | | | | | | | | | know the index number into the iteration. | ||||
| * | | Adding itemscope to list of boolean attributes. | Frankie Roberto | 2012-04-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | 'itemscope' is defined within HTML5 for use in microdata markup. See http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.ht ml#attr-itemscope | ||||
| * | | Merge pull request #5783 from rafaelfranca/default_url_options | Santiago Pastorino | 2012-04-08 | 2 | -2/+2 |
| |\ \ | | | | | | | Document that default_url_options must return a hash with symbolized keys | ||||
| | * | | 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 |
| |/ / | | | | | | | | | | | | | This reverts commit 174cf8b22064c3999dfa685014d5b31ac993bb54, reversing changes made to 7ecd6a731bd60665bc6de94095137f0b2c4ada2a. The reverted commit improved the performance in the wrong place, now we have added this 6ddbd1844a6fd6aca2992f5f75c9f605cf89808f improvement. | ||||
| * | | 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 | ||||
| | * | | 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 |
| | | | | | | | | | | | | | stringified keys | ||||
| * | | | Merge pull request #5750 from ahoward/master | Aaron Patterson | 2012-04-05 | 1 | -0/+9 |
| |\ \ \ | |_|/ |/| | | mo fasta and mo betta the url_for | ||||
| | * | | 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 | ||||
| | * | 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 |
| | | | | | | | | | closes #5672 | ||||
| * | | 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 | ||||
| | * | | 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 ↵ | José Valim | 2012-03-28 | 4 | -10/+63 |
| |\ \ | | | | | | | | | | | | | nertzy/prefix_partial_path_with_controller_namespace Add config option to turn off prefixing partial path with controller namespace | ||||
| | * | | Make controller namespace partial prefix optional | Grant Hutchins | 2012-03-28 | 4 | -6/+59 |
| | | | | | | | | | | | | | | | | | | | | | | config.action_view.prefix_partial_path_with_controller_namespace This allows you to choose to render @post using /posts/_post.erb instead of /admin/posts/_post.erb inside Admin::PostsController. | ||||
| | * | | 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 |
| |\ \ | |/ |/| | Missed commits from 3-2-stable | ||||
| | * | 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 |
| |/ | | | | Closes #5632 | ||||
| * | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 1 | -0/+7 |
| | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | ||||
| * | config.action_view.embed_authenticity_token_in_remote_forms is true by default | Piotr Sarnacki | 2012-03-28 | 1 | -19/+14 |
| | | | | | | | | Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms` to `false`. This change breaks remote forms that need to work also without javascript, so if you need such behavior, you can either set it to `true` or explicitly pass `:authenticity_token => true` in form options | ||||
| * | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 1 | -2/+48 |
| | | | | | | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default) Conflicts: actionpack/CHANGELOG.md | ||||
| * | Add test for default_url_options[:port] | Aaron Suggs | 2012-03-28 | 1 | -0/+12 |
| | | |||||
| * | Merge pull request #5621 from rafaelfranca/fix-2492-master | Jeremy Kemper | 2012-03-27 | 1 | -0/+34 |
| |\ | | | | | Fix label_tag to merge the options hash with the object hash | ||||
| | * | Check if the options hash already exists and merge it with the another | Rafael Mendonça França | 2012-03-27 | 1 | -6/+18 |
| | | | | | | | | | | | | | hash. Closes #2492 and #5615 | ||||
| | * | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc ↵ | Andrey Samsonov | 2012-03-27 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | doesn't call for label. objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example | ||||
| * | | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master | Santiago Pastorino | 2012-03-27 | 1 | -6/+6 |
| |\ \ | | | | | | | Don't break Haml with textarea newline fix. (master) | ||||
| | * | | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 1 | -6/+6 |
| | |/ | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation. | ||||
| * / | adds delegetion for eof? to AD::Http::UploadedFile | Jens Fahnenbruck | 2012-03-27 | 1 | -0/+6 |
| |/ | | | | | if you want to read the file you may need to ask if there is something to read from | ||||
| * | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 2 | -0/+14 |
| | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | ||||
| * | change number_with_precision to not return negative zeros | Tim McEwan | 2012-03-27 | 1 | -0/+1 |
| | | |||||
| * | Don't ignore non Enumerable values passed to sanitize (closes #5585) | Piotr Sarnacki | 2012-03-27 | 1 | -0/+18 |
| | | | | | | | | | | When someone accidentally passes a string to sanitize like: sanitize("<span>foo</span>", :tags => "b") there is no indication that it's the wrong way and span will not be removed. | ||||
| * | Remove warning added by my own commit :fire: | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+1 |
| | | | | | Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4 | ||||
| * | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-arg | Aaron Patterson | 2012-03-26 | 1 | -0/+12 |
| |\ | | | | | Properly deprecate the block argument in AV FormBuilder | ||||
| | * | Properly deprecate the block argument in AV FormBuilder | Carlos Antonio da Silva | 2012-03-23 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward incompatible change by changing the method signature of the FormBuilder. This brings back the same method signature warning in case someone gives a block to the builder. More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166 | ||||
| * | | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 1 | -0/+8 |
| | | | |||||
| * | | Allow a defining custom member field on resources | Jamie Macey | 2012-03-25 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | By default, resources routes are created with :resource/:id. A model defining to_param can make prettier urls by using something more readable than an integer ID, but since the route picks it up as :id you wind up with awkward User.find_by_username(params[:id]) calls. By overriding the key to be used in @request.params you can be more obvious in your intent. | ||||
| * | | Use the new scope syntax | Rafael Mendonça França | 2012-03-23 | 1 | -1/+1 |
| |/ | |||||
| * | Fix secure cookies when there are more than one space before the secure | Rafael Mendonça França | 2012-03-19 | 1 | -0/+28 |
| | | | | | keyword | ||||
| * | Remove exclude option from ActionDispatch::SSL | Rafael Mendonça França | 2012-03-19 | 1 | -6/+0 |
| | | |||||
| * | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when ↵ | Jey Balachandran | 2012-03-18 | 2 | -7/+21 |
| | | | | | discarding both day and month. | ||||
| * | time_tag support for blocks | Antonio Tapiador del Dujo | 2012-03-18 | 1 | -0/+4 |
| | | |||||
| * | Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.x | Rafael Mendonça França | 2012-03-17 | 1 | -14/+0 |
| | | |||||
| * | Rack::SSL -> ActionDispatch::SSL | Rafael Mendonça França | 2012-03-17 | 1 | -0/+149 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |