aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Return an Enumerator if no block is givenErik Michaels-Ober2014-07-124-1/+49
|
* Don't construct a Proc if no block is givenErik Michaels-Ober2014-07-121-1/+1
|
* Merge pull request #16147 from seuros/templatesMatthew Draper2014-07-122-0/+2
|\ | | | | [Bug report templates] Added rack master to the Gemfile [ci skip]
| * [Bug report templates] Added rack master to the GemfileAbdelkader Boudih2014-07-122-0/+2
|/
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-07-121-113/+93
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb
| * fix mismatched example call [ci skip]Vijay Dev2014-07-121-2/+2
| |
| * Revert "[ci skip] Fix doc for except"Vijay Dev2014-07-121-4/+5
| | | | | | | | | | | | | | This reverts commit 0f6b101e09d210cea2494c5d4225760f1951ea67. Reason: It's better to let `unscope` be documented. We can add a separate section for `except`.
| * Prefer find_by over where.first for recordGaurish Sharma2014-07-071-1/+1
| |
| * [ci skip] remove invalid code from docsschneems2014-06-281-2/+0
| |
| * [ci skip] Fix doc for exceptschneems2014-06-281-5/+4
| | | | | | | | The example showed is `except`, however the method "documented" is `unstop`. Fix to align the docs to the example.
| * [ci skip] Doc ability to chain in `find_each`schneems2014-06-281-1/+9
| | | | | | | | Also use appropriate mailer syntax in the `find_each` block.
| * [ci skip] Consolidate docs for `find`schneems2014-06-281-25/+19
| | | | | | | | Put all options for overloading `find` in one section
| * [ci skip] Consolidate docs for `last`schneems2014-06-281-16/+21
| | | | | | | | | | | | Add docs on what happens when a numerical argument is provided to last. Since `last!` behaves exactly the same way but can raise an argument we can consolidate it in the `last` section.
| * [ci skip] Consolidate docs for `take`schneems2014-06-281-35/+20
| | | | | | | | | | | | Add docs on what happens when a numerical argument is provided to take. Since `take!` behaves exactly the same way but can raise an argument we can consolidate it in the `take` section.
| * [ci skip] Consolidate docs for `find_by`schneems2014-06-281-19/+14
| | | | | | | | Since `find_by!` behaves exactly the same way but can raise an argument we can consolidate it in the `find_by` section.
| * [ci skip] Consolidate docs for `first`schneems2014-06-281-35/+21
| | | | | | | | | | | | Add docs for `first` when provided a numerical argument. Since `first!` behaves exactly the same way but can raise an argument we can consolidate it in the `first` section.
| * [ci skip] Add return values to examplesschneems2014-06-281-1/+10
| |
* | Assert the nature of the original exceptionMatthew Draper2014-07-121-0/+1
| | | | | | | | | | | | Just so it's clearer what's going on in the following assertion. /cc #11993 @robin850
* | Merge pull request #16143 from robin850/silence-downloading-outputRafael Mendonça França2014-07-111-1/+0
|\ \ | | | | | | Silence Downloader's output
| * | Silence the output downloading a fileRobin Dupret2014-07-111-1/+0
| | | | | | | | | | | | | | | This output isn't used anywhere for assertions so we can simply remove it. The introducing commit was f238d495.
* | | Merge pull request #16144 from grekko/patch-1Richard Schneeman2014-07-111-1/+1
|\ \ \ | | | | | | | | Fixing typo in comment
| * | | Fixing typo in commentGregory Igelmund2014-07-121-1/+1
|/ / /
* | | Merge pull request #11993 from razielgn/actionview-use-name-to-inspect-errorGuillermo Iguaran2014-07-111-1/+1
|\ \ \ | |/ / |/| | Use NameError#name to assert raised error.
| * | Use NameError#name to assert raised error.Federico Ravasio2013-11-241-1/+1
| | | | | | | | | | | | | | | This makes the test compatible with other Ruby implementations, which may implement error messages differently.
* | | Merge pull request #16136 from sgrif/sg-pg-bit-stringMatthew Draper2014-07-122-13/+33
|\ \ \ | | | | | | | | Don't rely on the column SQL type for bit string quoting
| * | | Don't rely on the column SQL type for bit string quotingSean Griffin2014-07-112-13/+33
| | | |
* | | | Merge pull request #16055 from sgrif/sg-refactor-sqlite3-stringsMatthew Draper2014-07-122-14/+29
|\ \ \ \ | |/ / / |/| | | Use a type object for type casting behavior on SQLite3
| * | | Use a type object for type casting behavior on SQLite3Sean Griffin2014-07-112-14/+29
| | | |
* | | | Merge pull request #16135 from mgoldWork/validator-guide-sentence-breakXavier Noria2014-07-111-2/+2
|\ \ \ \ | | | | | | | | | | [Guides] Sentence break for clarity [ci-skip]
| * | | | [Guides] Sentence break for clarity [ci-skip]Max Goldstein2014-07-111-2/+2
|/ / / /
* | | | Merge pull request #16132 from tgxworld/fix_test_not_unsubscribingSantiago Pastorino2014-07-111-2/+2
|\ \ \ \ | | | | | | | | | | Fix incorrect unsubscription.
| * | | | Fix incorrect unsubscription.Guo Xiang Tan2014-07-111-2/+2
| | | | |
* | | | | Merge pull request #16133 from Agis-/cookie_overflow_checkSantiago Pastorino2014-07-112-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Use `#bytesize` instead of `#size` when checking for cookie overflow
| * | | | | Use `#bytesize` instead of `#size` when checking for cookie overflowAgis-2014-07-112-2/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the cookie values happens to be ASCII strings because they are Base64 encoded, it is semantically incorrect to check for the number of the characters in the cookie, when we actually want to check for the number of the bytes it consists of. Furthermore it is unecessary coupling with the current implementation that uses Base64 for encoding the values.
* / / / / Synced 4.2 release notes with the latest commits.Godfrey Chan2014-07-115-30/+85
|/ / / / | | | | | | | | | | | | | | | | Also reordered some of the items to put newer ones on top (same order as CHANGELOGs), which makes it easier to diff while we are still working on it.
* | | | Fixed borken tests in AV caused by 013c74dGodfrey Chan2014-07-101-2/+2
| | | |
* | | | Merge pull request #14883 from chancancode/rm-single-spaceGuillermo Iguaran2014-07-106-22/+32
|\ \ \ \ | | | | | | | | | | Removed the single space character for Safari
| * | | | Removed single space padding from empty response body.Godfrey Chan2014-07-106-22/+32
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `render nothing: true` or rendering a `nil` body no longer add a single space to the response body. The old behavior was added as a workaround for a bug in an early version of Safari, where the HTTP headers are not returned correctly if the response body has a 0-length. This is been fixed since and the workaround is no longer necessary. Use `render body: ' '` if the old behavior is desired.
* | | | * gcampbell-rosetta_flash:Aaron Patterson2014-07-104-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | Address CVE-2014-4671 (JSONP Flash exploit)
| * | | | Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into ↵Aaron Patterson2014-07-104-3/+8
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcampbell-rosetta_flash * 'rosetta_flash' of https://github.com/gcampbell/rails: Address CVE-2014-4671 (JSONP Flash exploit) Conflicts: actionpack/CHANGELOG.md
| * | | | Address CVE-2014-4671 (JSONP Flash exploit)Greg Campbell2014-07-094-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a comment before JSONP callbacks. See http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/ for more details on the exploit in question.
* | | | | Merge pull request #16123 from karlentwistle/issues/9299Andrew White2014-07-103-5/+21
|\ \ \ \ \ | | | | | | | | | | | | Force encoding of US-ASCII to UTF-8 in unescape_uri.
| * | | | | Force encoding of US-ASCII to UTF-8 in unescape_uri.Karl Entwistle2014-07-103-5/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because URI paths may contain non US-ASCII characters we need to force the encoding of any unescaped URIs to UTF-8 if they are US-ASCII. This essentially replicates the functionality of the monkey patch to URI.parser.unescape in active_support/core_ext/uri.rb. Fixes #16104.
* | | | | Merge pull request #16118 from JayK31/strong_params_linkZachary Scott2014-07-091-2/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fixed link to strong params in Getting Started section 5.6.
| * | | | | [ci skip] Fixed link to strong params in Getting Started section 5.6.JayK312014-07-091-2/+1
|/ / / / /
* | | | | Merge pull request #16113 from ↵Zachary Scott2014-07-091-2/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | egilburg/rails_4_1_upgrade_guide_json_time_with_zone_precision [ci skip] Document millisecond precision change in ActiveSupport::TimeWithZone#as_json
| * | | | | [ci skip] Document millisecond precision change in ↵Eugene Gilburg2014-07-091-2/+12
| |/ / / / | | | | | | | | | | | | | | | ActiveSupport::TimeWithZone#as_json
* | | | | Merge pull request #16091 from tgxworld/reduce_creation_of_subscribersSantiago Pastorino2014-07-091-17/+13
|\ \ \ \ \ | | | | | | | | | | | | Reduce number of subscriptions created.
| * | | | | Reduce number of subscriptions created.Guo Xiang Tan2014-07-081-17/+13
| | | | | |
* | | | | | Include missing module in tag_helperCarlos Antonio da Silva2014-07-091-0/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 6857415187810f1289068a448268264d0cf0844f we are using #safe_join to join the content when an Array is given, so we must include the dependent module here to make sure it's available when this module is used alone. This was making Simple Form tests to fail with current master due to the missing dependency.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 00:42:36 +0000