aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | pass app config to controller helper proxyTima Maslyuchenko2013-10-242-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this fix application config become available when calling helper outisde of view config/application.rb #... config.asset_host = 'http://mycdn.com' #... Somewhere else ActionController::Base.helpers.asset_path('fallback.png') # => http://mycdn.com/assets/fallback.png
* | | | Correct error in Utils.normalize_path that changed paths improperlyJosh Symonds2013-10-232-1/+9
| | | |
* | | | Removing unused fake models from actionpack testsThiago Pradi2013-10-161-95/+0
| | | |
* | | | Respect `SCRIPT_NAME` when using `redirect` with a relative pathAndrew White2013-10-103-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: # application routes.rb mount BlogEngine => '/blog' # engine routes.rb get '/admin' => redirect('admin/dashboard') This now redirects to the path `/blog/admin/dashboard`, whereas before it would've generated an invalid url because there would be no slash between the host name and the path. It also allows redirects to work where the application is deployed to a subdirectory of a website. Fixes #7977
* | | | Typo fix [ci skip]Arun Agrawal2013-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the typo which is formed a not required link. Check here http://api.rubyonrails.org/classes/ActionController/Base.html under paramters section keeping it under tt tag gets reverted here ec8ef1e1055c4e1598da13f49d30261f07f4a9b4
* | | | add dots after `Fixes #YYYYY` in actionpack CHANGELOG. [ci skip]Yves Senn2013-10-091-12/+12
| | | |
* | | | Fixing repond_with working directly on the options hashBlueHotDog2013-10-094-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where the respond_with worked directly with the given options hash, so that if a user relied on it after calling respond_with, the hash wouldn't be the same. Fixes #12029
* | | | Add changlog entry for #10844Andrew White2013-09-301-0/+7
| | | |
* | | | Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into ↵Andrew White2013-09-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | tamird-fix-ip-spoof-errors
| * | | | make sure both headers are set before checking for ip spoofingTamir Duberstein2013-06-041-1/+1
| | | | |
* | | | | Merge pull request #12354 from kennyj/fix_12293Rafael Mendonça França2013-09-283-1/+26
|\ \ \ \ \ | | | | | | | | | | | | Closes #12293. Strong parameters should permit nested number as key.
| * | | | | Strong parameters should permit nested number as key. Closes #12293kennyj2013-09-273-1/+26
| | | | | |
* | | | | | Merge pull request #12398 from thedarkone/thread-safety-stuffRafael Mendonça França2013-09-282-13/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Thread safety fixes
| * | | | | | Make GTG::TransTable thread safe.thedarkone2013-09-281-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | From now on only the `[]=` method is allowed to modify the internal states hashes.
| * | | | | | Replace global Hash with TS::Cache.thedarkone2013-09-281-1/+4
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-281-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix link_to return valueEarl J St Sauver2013-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation is showing the link_to method as just returning the contents of the url_for method. It should be returning an "<a>" tag with the correct href set.
* | | | | | | Merge pull request #12233 from claudiob/delete-actionpack-unused-fixtureYves Senn2013-09-271-5/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Remove HelperyTestHelper not used in any test
| * | | | | | Remove HelperyTestHelper not used in any testclaudiob2013-09-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HelperyTestHelper was introduced in 66ef922 by @josevalim to pair with HelperyTestController. This test controller was later removed in e10a253 by @strzalek, leaving HelperyTestHelper unused
* | | | | | | [ci skip] escape unintended url in docsChris Ciollaro2013-09-261-1/+1
| | | | | | |
* | | | | | | No need the else clauseRafael Mendonça França2013-09-241-2/+0
| | | | | | |
* | | | | | | Use join to concat the both side of the ASTRafael Mendonça França2013-09-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Onf of the sides can be nil and it will raise a Conversion error
* | | | | | | add test_scoped_root_as_nameSam Ruby2013-09-241-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | test for regression introduced by https://github.com/rails/rails/pull/9155
* | | | | | | Merge pull request #10773 from wangjohn/link_and_routing_optionsRafael Mendonça França2013-09-231-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adding documentation and tests to ``polymorphic_url`` and ``link_to``
| * | | | | | | Adding documentation to +polymorphic_url+wangjohn2013-06-132-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concerning the options that it inherits from +url_for+. The way that +polymorhpic_url+ is built allows it to have options like +:anchor+, +:script_name+, etc. but this is currently not documented.
* | | | | | | | Merge pull request #9155 from bogdan/route-formatterAndrew White2013-09-221-23/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Rewrite Journey::Visitors::Formatter for performance
| * | | | | | | | Rewrite journey routes formatter for performanceBogdan Gusiev2013-08-281-23/+23
| | | | | | | | |
* | | | | | | | | [ci skip] Add some comment about downcase url encoded string.kennyj2013-09-221-0/+2
| | | | | | | | |
* | | | | | | | | Fix regex used to find URI schemes in redirect_toDerek Prior2013-09-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous regex was allowing `_` in the URI scheme, which is not allowed by RFC 3986. This change brings the regex in line with the RFC.
* | | | | | | | | Fix incorrect assert_redirected_to failure messageDerek Prior2013-09-194-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some instances, `assert_redirected_to` assertion was returning an incorrect and misleading failure message when the assertion failed. This was due to a disconnect in how the assertion computes the redirect string for the failure message and how `redirect_to` computes the string that is actually used for redirection. I made the `_compute_redirect_to_loaction` method used by `redirect_to` public and call that from the method `assert_redirect_to` uses to calculate the URL. The reveals a new test failure due to the regex used by `_compute_redirect_to_location` allow `_` in the URL scheme.
* | | | | | | | | Merge pull request #12280 from kennyj/remove_1_8_compatJosé Valim2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove 1.8 compatible code
| * | | | | | | | | Remove 1.8 compatible codekennyj2013-09-191-1/+1
| | | | | | | | | |
* | | | | | | | | | NullSessionHash#destroy should be a no-opJonathan Baudanza2013-09-182-0/+13
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was raising a NilException
* | | | | | | | | Fix an issue where router can't recognize downcased url encoding path.kennyj2013-09-193-0/+11
| | | | | | | | |
* | | | | | | | | Remove tzinfo dependency from Action PackErik Michaels-Ober2013-09-171-5/+4
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gem is used by Active Support but it should not be a dependency of Action Pack.
* | | | | | | | Removing ActiveSupport::Concern, it's not neededAttila Domokos2013-09-131-2/+0
| | | | | | | |
* | | | | | | | Fixing comment typo in ActionController::BaseAttila Domokos2013-09-131-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #12222 from rcillo/fix-custom-flashRafael Mendonça França2013-09-133-1/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom flash should be defined only for the class that defines it and it's subclasses Fixes #12057
| * | | | | | | | Custom flash should be defined only for the class that defines it and it's ↵Ricardo de Cillo2013-09-133-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subclasses.
* | | | | | | | | Merge pull request #12216 from suginoy/a-anRafael Mendonça França2013-09-132-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix typos: the indefinite articles(a -> an).
| * | | | | | | | Fix typos: the indefinite articles(a -> an)SUGINO Yasuhiro2013-09-132-2/+2
| | | | | | | | |
* | | | | | | | | Add CHANGELOG entry for #12149Rafael Mendonça França2013-09-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #12159 from nashby/issue-12149Rafael Mendonça França2013-09-122-1/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | do not break params filtering on nil values
| * | | | | | | | | do not break params filtering on nil valuesVasiliy Ermolovich2013-09-072-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #12149
* | | | | | | | | | Removed semicolon and added spaceAnupam Choudhury2013-09-131-2/+2
| | | | | | | | | |
* | | | | | | | | | Revert "Merge pull request #12208 from mjhoy/patch-1"Rafael Mendonça França2013-09-121-0/+4
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ab5cd54b7e791f8419f689d1bef5394890268a6f, reversing changes made to cdc10c898d4865302740340eedec4f5f4ca76565. Reason: This way of defining root path is still supported. See https://github.com/rails/rails/blob/d262773ab7f0aae5de2d354ac2eca168e95b653d/actionpack/test/controller/routing_test.rb#L450-457
* | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-131-10/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change documentation to consistently refer to the same objectEarl J St Sauver2013-09-081-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation in this section is referring to a profile, so the resource that's created should probably also be a profile of some sort.
| * | | | | | | | | Blacklist refferenced in docs is actually whitelistEarl J St Sauver2013-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs refference a blacklist, but really what's being described is a whitelist. Anything that matches the constraint gets through to the path.
* | | | | | | | | | remove outdated docsMichael Hoy2013-09-121-4/+0
| | | | | | | | | |