Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change check_box to work inverting the checked and unchecked value | Rafael Mendonça França | 2012-04-29 | 1 | -4/+2 |
| | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995 | ||||
* | Don't convert params if the request isn't HTML - fixes #5341 | Andrew White | 2012-04-29 | 1 | -6/+18 |
| | |||||
* | Avoid calling content type multiple times | José Valim | 2012-04-29 | 1 | -4/+6 |
| | |||||
* | Merge pull request #2321 from omjokine/master | José Valim | 2012-04-29 | 1 | -1/+4 |
|\ | | | | | JSONP should use mimetype application/javascript | ||||
| * | Merge remote-tracking branch 'upstream/master' | Olli Jokinen | 2011-12-01 | 100 | -961/+1695 |
| |\ | |||||
| * | | Change mimetype to Mime::JS if JSONP is used | Olli Jokinen | 2011-07-28 | 1 | -1/+4 |
| | | | |||||
* | | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 1 | -1/+7 |
| | | | | | | | | | | | | closes #3341 | ||||
* | | | Merge session arg with existing session instead of overwriting | Andrew White | 2012-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-28 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+ | Mark Rushakof | 2012-04-27 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+) | ||||
* | | | | Merge pull request #5989 from arunagw/warning_removed_master_ap | Jon Leighton | 2012-04-27 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Shadowing variable warning removed | ||||
| * | | | | Shadowing variable warning removed | Arun Agrawal | 2012-04-26 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | refactor content_tag_for helper | Sergey Nartimov | 2012-04-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - do not use merge! just for 2 values - there is no need to check block arity | ||||
* | | | | | use safe_join in number helper | Sergey Nartimov | 2012-04-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | remove unnecessary else statement | Vasiliy Ermolovich | 2012-04-26 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | fix number_to_human docs [ci skip] | Vijay Dev | 2012-04-26 | 1 | -2/+2 |
|/ / / / | |||||
* / / / | Allow loading external route files from the router | Jose and Yehuda | 2012-04-25 | 2 | -0/+18 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | This feature enables the ability to load an external routes file from the router via: draw :filename External routes files go in +config/routes+. This feature works in both engines and applications. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-25 | 2 | -1/+4 |
|\ \ \ | |||||
| * | | | Missed checked in Form Helper example | Alexey Vakhov | 2012-04-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add distance_of_time_in_words example for seconds | Alexey Vakhov | 2012-04-22 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #5980 from gazay/valid_ips | Jeremy Kemper | 2012-04-25 | 1 | -22/+68 |
|\ \ \ \ | | | | | | | | | | | 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 | -22/+68 |
| |/ / / | | | | | | | | | | | | | tests. | ||||
* | | | | Remove unnecessary empty line | José Valim | 2012-04-25 | 1 | -1/+0 |
| | | | | |||||
* | | | | Remove default match without specified method | Jose and Yehuda | 2012-04-24 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | Merge pull request #5961 from bogdan/routes | Jeremy Kemper | 2012-04-24 | 1 | -20/+26 |
|\ \ \ \ | | | | | | | | | | | Refactor ActionDispatch::HTTP::Url#url_for | ||||
| * | | | | ActionDispatch::HTTP::Url#url_for refactor method | Bogdan Gusiev | 2012-04-24 | 1 | -20/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Separated right side url generation(before query string) from left side url generation(after query string) | ||||
* | | | | | Merge pull request #5927 from avakhov/distance_of_time_in_words-swap | Jeremy Kemper | 2012-04-24 | 1 | -14/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Distance of time in words should work correctly if from_time > to_time | ||||
| * | | | | | Use leap years trick in distance_of_time_in_words only for distances between ↵ | Alexey Vakhov | 2012-04-24 | 1 | -12/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | real date points | ||||
| * | | | | | fixed non matching documentation behaviour with method semantics on ↵ | Marcelo Casiraghi | 2012-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | distance_of_time_in_words | ||||
| * | | | | | Distance of time in words should work correct if from time > to_time | Alexey Vakhov | 2012-04-24 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Refactor hash creation in routeset | Carlos Antonio da Silva | 2012-04-24 | 1 | -3/+4 |
| |/ / / / |/| | | | | |||||
* | | | | | RouteSet: decomplecting a way to handle positional args | Bogdan Gusiev | 2012-04-24 | 1 | -26/+20 |
|/ / / / | |||||
* | | | | RouteSet: simplify routes helpers generation code | Bogdan Gusiev | 2012-04-24 | 1 | -13/+21 |
| | | | | |||||
* | | | | Add missing requires in routes | Bogdan Gusiev | 2012-04-23 | 2 | -0/+3 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-21 | 3 | -4/+4 |
|\ \ \ | |||||
| * | | | Comma missed | Alexey Vakhov | 2012-04-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix example in ActionView::Helpers::FormHelper | Thibaut Courouble | 2012-04-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix formatting | Oscar Del Ben | 2012-04-18 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #5865 from tiegz/minor_fixes | Aaron Patterson | 2012-04-20 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | 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 | -1/+1 |
| | | | | | |||||
| * | | | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Freeze the middleware stack after it's built | Jeremy Kemper | 2012-04-20 | 1 | -1/+1 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | So apps that accidentally add middlewares later aren't unwittingly dumping them in a black hole. Closes #5911 | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-18 | 4 | -6/+9 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | let's keep the slash in the return value instead of the path variable [ci skip] | Vijay Dev | 2012-04-18 | 1 | -2/+2 |
| | | | | |||||
| * | | | Warn about do end syntax in redirect option | Oscar Del Ben | 2012-04-17 | 1 | -0/+3 |
| | | | | |||||
| * | | | Fix redirect with block example | Alexey Vakhov | 2012-04-17 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fix example in flash middleware | Alexey Vakhov | 2012-04-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix comment in AD http response | Alexey Vakhov | 2012-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | response in integration test accessible without @ via attr_reader | ||||
| * | | | Fix HTML sanitizer allowed_css_properties comment | Alexey Vakhov | 2012-04-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5814 from lest/patch-4 | Piotr Sarnacki | 2012-04-13 | 1 | -12/+13 |
|\ \ \ \ | | | | | | | | | | | don't duplicate default values in text helper |