aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14816 from jonatack/patch-2Robin Dupret2014-04-201-1/+1
|\ | | | | Grammar fix in Getting Started Guide [ci skip]
| * Grammar fix in Getting Started GuideJon Atack2014-04-201-1/+1
|/
* Make URL escaping more consistentAndrew White2014-04-208-10/+89
| | | | | | | | | | | | | | | | | | | | | | 1. Escape '%' characters in URLs - only unescaped data should be passed to URL helpers 2. Add an `escape_segment` helper to `Router::Utils` that escapes '/' characters 3. Use `escape_segment` rather than `escape_fragment` in optimized URL generation 4. Use `escape_segment` rather than `escape_path` in URL generation For point 4 there are two exceptions. Firstly, when a route uses wildcard segments (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This means that wildcard routes can't be optimized. Secondly, if a `:controller` segment is used in the path then this uses `escape_path` as the controller may be namespaced. Fixes #14629, #14636 and #14070.
* Optimize URI escapingAndrew White2014-04-201-17/+42
| | | | | | | | | | | | | The URI::Parser#escape method is a general use method that has to deal with a variety of input however our use of it is limited in scope so we can increase the performance by implementing our specific needs within ActionDispatch::Journey::Router::Utils directly. If there is no encoding required then there is no change in performance or number of objects allocated, but for each character that needs to be encoded we save five object allocations and gain a performance boost. The performance boost seen varies from 20% when there is one character to over 50% when encoding ten characters.
* Always escape string passed to url helper.edogawaconan2014-04-202-3/+3
| | | | | | | | | | Makes it clear that anything passed with the helper must not be percent encoded. Fixes previous behavior which tricks people into believing passing non-percent-encoded will generate a proper percent-encoded path while in reality it doesn't ('%' isn't escaped). The intention is nice but the heuristic is broken.
* Merge pull request #14811 from qrush/masterGuillermo Iguaran2014-04-191-1/+1
|\ | | | | Remove statement assuming coffee shop/public space wifi is inherently insecure
| * Remove statement assuming coffee shop/public space wifi is inherently insecureNick Quaranto2014-04-191-1/+1
|/
* Merge pull request #14810 from robin850/patch-18Godfrey Chan2014-04-191-1/+0
|\ | | | | Don't rely on Arel master in bug report template
| * Don't rely on Arel master in bug report template [ci skip]Robin Dupret2014-04-191-1/+0
|/ | | | | | We should rely instead on the version supported by Active Record Closes #14809
* Merge pull request #14805 from akshay-vishnoi/structure-changeAndrew White2014-04-191-0/+0
|\ | | | | multibyte_conformance.rb --> multibyte_conformance_test.rb
| * multibyte_conformance.rb --> multibyte_conformance_test.rbAkshay Vishnoi2014-04-191-0/+0
| |
* | Merge pull request #14804 from akshay-vishnoi/doc_changesArthur Nogueira Neves2014-04-193-4/+4
|\ \ | | | | | | "subhash" --> "sub-hash"
| * | "subhash" --> "sub-hash"Akshay Vishnoi2014-04-193-4/+4
| |/
* | Merge pull request #14808 from ↵Xavier Noria2014-04-191-2/+2
|\ \ | |/ |/| | | | | akalyaev/few-corrections-in-rails-initialization-guides Few corrections in Rails Initialization Guides
| * wrap methods in backticks [ci skip]Anton Kalyaev2014-04-191-2/+2
|/
* Merge pull request #14799 from ernie/string-first-last-fixRafael Mendonça França2014-04-182-4/+16
|\ | | | | Fix inconsistent behavior from String#first/#last
| * Fix inconsistent behavior from String#first/#lastErnie Miller2014-04-182-4/+16
|/ | | | | | | While calling String#first or String#last with zero or a Fixnum < the string's length returns a new string, a Fixnum >= the string's length returns the string itself. This inconsistency can lead to inadvertent mutation of a string.
* Merge pull request #14796 from kuldeepaggarwal/fix-save-issueYves Senn2014-04-183-0/+21
|\ | | | | when a destroyed record is duped, it is no longer ´destroyed?`.
| * `@destroyed` should always be set to `false` when an object is duped.Kuldeep Aggarwal2014-04-193-0/+21
|/
* Merge pull request #14798 from kuldeepaggarwal/fix-warningYves Senn2014-04-181-1/+1
|\ | | | | remove warning while running TEST CASES
| * remove warningKuldeep Aggarwal2014-04-181-1/+1
|/ | | | `warning: ambiguous first argument; put parentheses or even spaces`
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-04-1810-123/+161
|\
| * Fix spelling and proper nounsSteven Harman2014-04-172-5/+5
| | | | | | | | [ci skip]
| * [ci skip] document `statement_limit` schneems2014-04-151-1/+11
| | | | | | | | | | Per discussion at https://github.com/rails/rails/issues/14645#issuecomment-40499409
| * [ci skip] PP does not generate pass by defaultschneems2014-04-151-2/+0
| | | | | | | | This was changed in https://github.com/rails/rails/pull/13415/files
| * re-phrase how to run a testWaynn Lue2014-04-151-2/+2
| |
| * [ci skip] Use valid current config in exampleschneems2014-04-151-2/+2
| | | | | | `reaping_frequency` is used in Active Record `reap_frequency` is not
| * Fix spelling errors and grammar issuesSteven Harman2014-04-131-8/+11
| | | | | | | | | | | | Including replacing a few "smart quotes" with regular quotes (' and "), for consistency. [ci skip]
| * Correct docs as singlton true is not returned hereSteven Harman2014-04-111-1/+1
| | | | | | | | [ci skip]
| * Fix a few grammar issues. [ci skip]Steven Harman2014-04-111-5/+4
| |
| * Document LoadError core extensionsSteven Harman2014-04-111-1/+4
| | | | | | | | [ci skip]
| * Use path where extensions are defined, not usedSteven Harman2014-04-111-3/+3
| | | | | | | | | | | | | | For consistency with all other documentation, point to where these core extensions are defined, not where the example code comes from. [ci skip]
| * Instead boat load of libraries, simply say StdLibGaurish Sharma2014-04-091-1/+1
| |
| * Add documentation for Thread#freezeSteven Harman2014-04-061-0/+7
| |
| * Improve Contributing to Rails GuideGaurish Sharma2014-04-061-104/+122
| | | | | | Logically group the content, so it makes more sense if someone tries to read from start of page to end of page. [ci skip]
* | Merge pull request #14795 from braddunbar/uglifierRafael Mendonça França2014-04-181-1/+1
|\ \ | | | | | | :uglify -> :uglifier
| * | :uglify -> :uglifierBrad Dunbar2014-04-181-1/+1
|/ / | | | | | | | | The name of the gem is `uglifier` and all other references use `uglifier`, not `uglify`.
* | Merge pull request #14790 from krisselden/optimize-postgres-selectsRafael Mendonça França2014-04-182-19/+41
|\ \ | | | | | | Optimize select_value, select_values, select_rows in Postgresql adapter.
| * | Optimize select_value, select_values, select_rows and dry up checking ↵Kris Selden2014-04-172-19/+41
| | | | | | | | | | | | | | | whether to exec with cache for Postgresql adapter Reduces creating unused objects, with the most dramatic reduction in select_values which used to map(&:first) an array of single element arrays.
* | | Merge pull request #14793 from arthurnn/fixes_8928Rafael Mendonça França2014-04-183-2/+16
|\ \ \ | | | | | | | | Fixed has_many association to make it support irregular inflections.
| * | | Regression test for irregular inflection on has_manyArthur Neves2014-04-182-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a Changelog entry [related #9702] [fixes #8928]
| * | | Singularize association names before camelizationJavier Goizueta2014-04-181-2/+2
| | | | | | | | | | | | | | | | So that irregular multi-word pluralization rules have to be defined only for snake-case strings.
* | | | Merge pull request #14786 from PaulL1/patch-1Rafael Mendonça França2014-04-171-7/+6
|\ \ \ \ | |_|/ / |/| | | CSRF protection should rescue exception not extend
| * | | Include default rails protect_from_forgery with: :exceptionPaulL12014-04-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Extend previous changes, include the default line from the application controller that new rails applications are created with: protect_from_forgery with: :exception Minor wording changes to align.
| * | | CSRF protection should rescue exception not extendPaulL12014-04-171-3/+2
| |/ / | | | | | | | | | | | | I think the changes to the default behaviour mean that rails will throw an exception when an invalid authenticity token is found. The previous proposed code of calling super then sign_out meant that sign_out was never reached - the exception handler never returned. I think the best approach now is to catch the exception, although I'm not 100% certain on that.
* | | Remove wrapper div for inputs in button_toRafael Mendonça França2014-04-173-22/+22
| | | | | | | | | | | | Related with cbb917455f306cf5818644b162f22be09f77d4b2
* | | Update Request forgery tests to remove input wrappign divRafael Mendonça França2014-04-171-5/+5
| | | | | | | | | | | | This was changed at cbb917455f306cf5818644b162f22be09f77d4b2
* | | Merge pull request #14738 from tilsammans/pull/11407Rafael Mendonça França2014-04-175-15/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove wrapping div with inline styles for hidden form fields. Conflicts: actionview/CHANGELOG.md
| * | | Remove wrapping div with inline styles for hidden form fields.Joost Baaij2014-04-145-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | We are dropping HTML 4.01 and XHTML strict compliance since input tags directly inside a form are valid HTML5, and the absense of inline styles help in validating for Content Security Policy.
* | | | Add CHANGELOG entry for #14755 [ci skip]Rafael Mendonça França2014-04-171-0/+5
| | | |