Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow layout rendering to access current object being rendered when using ↵ | Carlos Antonio da Silva | 2012-04-29 | 2 | -2/+7 |
| | | | | partial + collection | ||||
* | Add changelog entry for jsonp mimetype change, fix failing test | Carlos Antonio da Silva | 2012-04-29 | 1 | -1/+1 |
| | | | | Fix failing test: Mime::JS generates "text/javascript" | ||||
* | 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 |
|\ | | | | | JSONP should use mimetype application/javascript | ||||
| * | 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 ↵ | Olli Jokinen | 2011-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | application/javascript | ||||
* | | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 1 | -0/+17 |
| | | | | | | | | | | | | closes #3341 | ||||
* | | | Merge session arg with existing session instead of overwriting | Andrew White | 2012-04-28 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may break existing tests that are asserting the whole session contents but should not break existing tests that are asserting individual keys - e.g: class SomeControllerTest < ActionController::TestCase setup do session['user_id'] = 1 end test "some test" do get :some_action, nil, { 'another_var' => 2 } # This assertion will now fail assert_equal({ 'another_var' => 2 }, session) # This assertion will still pass assert_equal 2, session['another_var] end end Fixes #1529. | ||||
* | | | 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 |
|\ \ \ | | | | | | | | | Remote ip logic and validation. IPv6 support. | ||||
| * | | | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ↵ | Alexey Gaziev | 2012-04-25 | 1 | -20/+114 |
| | | | | | | | | | | | | | | | | tests. | ||||
* | | | | Remove default match without specified method | Jose and Yehuda | 2012-04-24 | 39 | -341/+341 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current router DSL, using the +match+ DSL method will match all verbs for the path to the specified endpoint. In the vast majority of cases, people are currently using +match+ when they actually mean +get+. This introduces security implications. This commit disallows calling +match+ without an HTTP verb constraint by default. To explicitly match all verbs, this commit also adds a :via => :all option to +match+. Closes #5964 | ||||
* | | | | Use leap years trick in distance_of_time_in_words only for distances between ↵ | Alexey Vakhov | 2012-04-24 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | real date points | ||||
* | | | | fixed non matching documentation behaviour with method semantics on ↵ | Marcelo Casiraghi | 2012-04-24 | 1 | -2/+19 |
| | | | | | | | | | | | | | | | | distance_of_time_in_words | ||||
* | | | | 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 |
|\ \ \ | | | | | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | ||||
| * | | | 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 |
|/ / / | | | | | | | | | | | | | ActionController::RoutingError are raised in router execution time and can not be rescued in a controller. | ||||
* | | | 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 |