aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2321 from omjokine/masterJosé Valim2012-04-291-1/+4
|\ | | | | JSONP should use mimetype application/javascript
| * Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-01100-961/+1695
| |\
| * | Change mimetype to Mime::JS if JSONP is usedOlli Jokinen2011-07-281-1/+4
| | |
* | | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-281-1/+7
| | | | | | | | | | | | closes #3341
* | | Merge session arg with existing session instead of overwritingAndrew White2012-04-281-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/docrailsVijay Dev2012-04-282-4/+4
|\ \ \
| * | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-272-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_apJon Leighton2012-04-271-3/+3
|\ \ \ \ | | | | | | | | | | Shadowing variable warning removed
| * | | | Shadowing variable warning removedArun Agrawal2012-04-261-3/+3
| | | | |
* | | | | refactor content_tag_for helperSergey Nartimov2012-04-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | - do not use merge! just for 2 values - there is no need to check block arity
* | | | | use safe_join in number helperSergey Nartimov2012-04-261-1/+1
| | | | |
* | | | | remove unnecessary else statementVasiliy Ermolovich2012-04-261-3/+3
| | | | |
* | | | | fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
|/ / / /
* / / / Allow loading external route files from the routerJose and Yehuda2012-04-252-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/docrailsVijay Dev2012-04-252-1/+4
|\ \ \
| * | | Missed checked in Form Helper exampleAlexey Vakhov2012-04-241-1/+1
| | | |
| * | | Add distance_of_time_in_words example for secondsAlexey Vakhov2012-04-221-0/+3
| | | |
* | | | Merge pull request #5980 from gazay/valid_ipsJeremy Kemper2012-04-251-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 Gaziev2012-04-251-22/+68
| |/ / / | | | | | | | | | | | | tests.
* | | | Remove unnecessary empty line José Valim2012-04-251-1/+0
| | | |
* | | | Remove default match without specified methodJose and Yehuda2012-04-241-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/routesJeremy Kemper2012-04-241-20/+26
|\ \ \ \ | | | | | | | | | | Refactor ActionDispatch::HTTP::Url#url_for
| * | | | ActionDispatch::HTTP::Url#url_for refactor methodBogdan Gusiev2012-04-241-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-swapJeremy Kemper2012-04-241-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 Vakhov2012-04-241-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | real date points
| * | | | | fixed non matching documentation behaviour with method semantics on ↵Marcelo Casiraghi2012-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | distance_of_time_in_words
| * | | | | Distance of time in words should work correct if from time > to_timeAlexey Vakhov2012-04-241-2/+3
| | | | | |
* | | | | | Refactor hash creation in routesetCarlos Antonio da Silva2012-04-241-3/+4
| |/ / / / |/| | | |
* | | | | RouteSet: decomplecting a way to handle positional argsBogdan Gusiev2012-04-241-26/+20
|/ / / /
* | | | RouteSet: simplify routes helpers generation codeBogdan Gusiev2012-04-241-13/+21
| | | |
* | | | Add missing requires in routesBogdan Gusiev2012-04-232-0/+3
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-213-4/+4
|\ \ \
| * | | Comma missedAlexey Vakhov2012-04-211-1/+1
| | | |
| * | | Fix example in ActionView::Helpers::FormHelperThibaut Courouble2012-04-201-1/+1
| | | |
| * | | Fix formattingOscar Del Ben2012-04-181-2/+2
| | | |
* | | | Merge pull request #5865 from tiegz/minor_fixesAaron Patterson2012-04-201-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 changesTieg Zaharia2012-04-161-1/+1
| | | | |
| * | | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-161-1/+1
| | | | |
* | | | | Freeze the middleware stack after it's builtJeremy Kemper2012-04-201-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/docrailsVijay Dev2012-04-184-6/+9
|\ \ \ \ | |/ / / |/| | |
| * | | let's keep the slash in the return value instead of the path variable [ci skip]Vijay Dev2012-04-181-2/+2
| | | |
| * | | Warn about do end syntax in redirect optionOscar Del Ben2012-04-171-0/+3
| | | |
| * | | Fix redirect with block exampleAlexey Vakhov2012-04-171-3/+3
| | | |
| * | | Fix example in flash middlewareAlexey Vakhov2012-04-171-1/+1
| | | |
| * | | Fix comment in AD http responseAlexey Vakhov2012-04-131-1/+1
| | | | | | | | | | | | | | | | response in integration test accessible without @ via attr_reader
| * | | Fix HTML sanitizer allowed_css_properties commentAlexey Vakhov2012-04-131-1/+1
| | | |
* | | | Merge pull request #5814 from lest/patch-4Piotr Sarnacki2012-04-131-12/+13
|\ \ \ \ | | | | | | | | | | don't duplicate default values in text helper
| * | | | don't duplicate default values in text helperSergey Nartimov2012-04-111-12/+13
| | | | |
* | | | | Remove obsolete codeAlexey Vakhov2012-04-121-3/+0
| | | | |
* | | | | #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so ↵Jeremy Kemper2012-04-121-1/+21
| |/ / / |/| | | | | | | | | | | opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:22:11 +0000