Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12354 from kennyj/fix_12293 | Rafael Mendonça França | 2013-09-28 | 1 | -1/+5 |
|\ | | | | | Closes #12293. Strong parameters should permit nested number as key. | ||||
| * | Strong parameters should permit nested number as key. Closes #12293 | kennyj | 2013-09-27 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #12398 from thedarkone/thread-safety-stuff | Rafael Mendonça França | 2013-09-28 | 2 | -13/+27 |
|\ \ | | | | | | | Thread safety fixes | ||||
| * | | Make GTG::TransTable thread safe. | thedarkone | 2013-09-28 | 1 | -12/+23 |
| | | | | | | | | | | | | From now on only the `[]=` method is allowed to modify the internal states hashes. | ||||
| * | | Replace global Hash with TS::Cache. | thedarkone | 2013-09-28 | 1 | -1/+4 |
| |/ | |||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-09-28 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Fix link_to return value | Earl J St Sauver | 2013-09-22 | 1 | -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. | ||||
* | | [ci skip] escape unintended url in docs | Chris Ciollaro | 2013-09-26 | 1 | -1/+1 |
| | | |||||
* | | No need the else clause | Rafael Mendonça França | 2013-09-24 | 1 | -2/+0 |
| | | |||||
* | | Use join to concat the both side of the AST | Rafael Mendonça França | 2013-09-24 | 1 | -1/+2 |
| | | | | | | | | Onf of the sides can be nil and it will raise a Conversion error | ||||
* | | Merge pull request #10773 from wangjohn/link_and_routing_options | Rafael Mendonça França | 2013-09-23 | 1 | -0/+13 |
|\ \ | | | | | | | | | | Adding documentation and tests to ``polymorphic_url`` and ``link_to`` | ||||
| * | | Adding documentation to +polymorphic_url+ | wangjohn | 2013-06-13 | 2 | -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-formatter | Andrew White | 2013-09-22 | 1 | -23/+23 |
|\ \ \ | | | | | | | | | Rewrite Journey::Visitors::Formatter for performance | ||||
| * | | | Rewrite journey routes formatter for performance | Bogdan Gusiev | 2013-08-28 | 1 | -23/+23 |
| | | | | |||||
* | | | | [ci skip] Add some comment about downcase url encoded string. | kennyj | 2013-09-22 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix regex used to find URI schemes in redirect_to | Derek Prior | 2013-09-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | 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 message | Derek Prior | 2013-09-19 | 2 | -34/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_compat | José Valim | 2013-09-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Remove 1.8 compatible code | ||||
| * | | | | Remove 1.8 compatible code | kennyj | 2013-09-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | NullSessionHash#destroy should be a no-op | Jonathan Baudanza | 2013-09-18 | 1 | -0/+3 |
|/ / / / | | | | | | | | | | | | | Previously it was raising a NilException | ||||
* | | | | Fix an issue where router can't recognize downcased url encoding path. | kennyj | 2013-09-19 | 1 | -0/+1 |
| | | | | |||||
* | | | | Removing ActiveSupport::Concern, it's not needed | Attila Domokos | 2013-09-13 | 1 | -2/+0 |
| | | | | |||||
* | | | | Fixing comment typo in ActionController::Base | Attila Domokos | 2013-09-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #12222 from rcillo/fix-custom-flash | Rafael Mendonça França | 2013-09-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 Cillo | 2013-09-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | subclasses. | ||||
* | | | | | Merge pull request #12216 from suginoy/a-an | Rafael Mendonça França | 2013-09-13 | 2 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix typos: the indefinite articles(a -> an). | ||||
| * | | | | Fix typos: the indefinite articles(a -> an) | SUGINO Yasuhiro | 2013-09-13 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #12159 from nashby/issue-12149 | Rafael Mendonça França | 2013-09-12 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | do not break params filtering on nil values | ||||
| * | | | | | do not break params filtering on nil values | Vasiliy Ermolovich | 2013-09-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | closes #12149 | ||||
* | | | | | | Revert "Merge pull request #12208 from mjhoy/patch-1" | Rafael Mendonça França | 2013-09-12 | 1 | -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/docrails | Vijay Dev | 2013-09-13 | 1 | -10/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Change documentation to consistently refer to the same object | Earl J St Sauver | 2013-09-08 | 1 | -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 whitelist | Earl J St Sauver | 2013-09-08 | 1 | -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 docs | Michael Hoy | 2013-09-12 | 1 | -4/+0 |
| | | | | | | |||||
* | | | | | | Refactor handling of action normalization | Max Shytikov | 2013-09-10 | 1 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: Bloody mess internals http://gusiev.com/slides/rails_contribution/static/#40 | ||||
* | | | | | | Make AC standalone rendering work | Santiago Pastorino | 2013-09-10 | 1 | -2/+5 |
| | | | | | | |||||
* | | | | | | Remove BasicRendering tests | José Valim | 2013-09-09 | 2 | -10/+1 |
| | | | | | | |||||
* | | | | | | Remove remaining coupling with AV in MimeResponds | José Valim | 2013-09-09 | 3 | -5/+13 |
| | | | | | | |||||
* | | | | | | Remove BasicRendering and remove template functionality from AbsC::Rendering | José Valim | 2013-09-09 | 3 | -35/+19 |
| |/ / / / |/| | | | | |||||
* | | | | | Do not use instance variables if they are not reused elsewhere | Carlos Antonio da Silva | 2013-09-06 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | render_to_string shouldn't play with response_body | Santiago Pastorino | 2013-09-04 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | Merge pull request #12077 from estsauver/doc_fix | Steve Klabnik | 2013-09-04 | 1 | -2/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Update mapper documenation for match helper [ci skip] | ||||
| * | | | | Update mapper documenation for match helper [ci skip] | Earl St Sauver | 2013-08-30 | 1 | -2/+3 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This piece of documentation is out of date. The use of match without any via option is prevented, now the HTTP verbs have to be explicitly set. If they're not set then the error message in normalize_conditions! (around line 186) is shown. | ||||
* | | | | Fix a few typos. [ci skip] | namusyaka | 2013-09-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Move BasicRendering to AbstractController | Łukasz Strzałkowski | 2013-09-03 | 3 | -29/+29 |
| | | | | |||||
* | | | | Make Mime::TEXT default format in AbstractController | Łukasz Strzałkowski | 2013-09-03 | 2 | -4/+1 |
| | | | | |||||
* | | | | Move skeleton methods from AV to AbsC | Łukasz Strzałkowski | 2013-09-03 | 1 | -7/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The methods: * #render_to_body * #render_to_string * #_normalize_render Haven't had anything specyfic to ActionView. This was common code which should belong to AbstractController | ||||
* | | | | Return to using protected_instance_variables in AV | Łukasz Strzałkowski | 2013-09-02 | 1 | -5/+6 |
| | | | | |||||
* | | | | Revert "Port all remaining self.protected_instance_variables to class methods" | Łukasz Strzałkowski | 2013-09-02 | 3 | -16/+16 |
| | | | | | | | | | | | | | | | | This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01. | ||||
* | | | | Reuse variable to avoid symbol usage | Carlos Antonio da Silva | 2013-08-31 | 1 | -2/+2 |
| | | | |