aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #16028 from ↵Rafael Mendonça França2014-07-043-1/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cade/fix_counter_cache_count_with_association_selects Add `:all` argument to `count` in `reset_counters` Conflicts: activerecord/CHANGELOG.md
| * | | | | | Add `:all` argument to `count` in `reset_counters`Cade Truitt2014-07-023-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this fix, if an association had a scope with a `select`, calls to `reset_counters` would generate invalid SQL and throw: ActiveRecord::StatementInvalid: [$DB_ADAPTER]: wrong number of arguments to function COUNT() References #10710, #13648
* | | | | | | Merge pull request #16011 from xjlu/token_and_optionsRafael Mendonça França2014-07-042-3/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve token_and_options regex and test
| * | | | | | | Improve token_and_options regex and testXinjiang Lu2014-07-012-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a test case to test the regex for the helper method raw_params
* | | | | | | | Merge pull request #16040 from seuros/patch-1Matthew Draper2014-07-051-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add arel to the controller template [ci skip]
| * | | | | | | | Add arel to the controller templateAbdelkader Boudih2014-07-031-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #14005 from dmitry/test_coverage_for_actionmailerRafael Mendonça França2014-07-046-38/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add test coverage for the action mailer
| * | | | | | | | | add test coverage for the action mailerDmitry Polushkin2014-07-046-38/+16
| | | | | | | | | |
* | | | | | | | | | Merge pull request #16042 from akshay-vishnoi/doc_changeMatthew Draper2014-07-053-5/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | [ci skip] /javascript/ -> JavaScript - cover whole app
| * | | | | | | | | [ci skip] /javascript/ -> JavaScript - cover whole appAkshay Vishnoi2014-07-043-5/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16049 from matthewd/find-via-reloadMatthew Draper2014-07-053-0/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | After find-via-reload, the record is not new
| * | | | | | | | | After find-via-reload, the record is not newMatthew Draper2014-07-053-0/+19
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16046 from grosser/grosser/cleangenRafael Mendonça França2014-07-041-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Do not load rails without loading bundler
| * | | | | | | | | remove bundler magicgrosser2014-07-031-2/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #16037 from sgrif/sg-money-quotingRafael Mendonça França2014-07-043-11/+28
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Remove unneccessary special case for money in quoting
| * | | | | | | | | Remove unneccessary special case for money in quotingSean Griffin2014-07-033-11/+28
| | | | | | | | | |
* | | | | | | | | | Merge pull request #16048 from arunagw/aa-added-notice-index-pageRafael Mendonça França2014-07-043-1/+11
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Display notice in index.html pages in scaffolded generated views
| * | | | | | | | | Display notice in index.html pages in scaffolded generated viewsArun Agrawal2014-07-043-1/+11
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we are setting notice in destroy action we should display that For more information see https://github.com/rails/rails/pull/14044 And https://github.com/rails/jbuilder/pull/191 closes #14044
* | | / / / / / / :fire: these are lambdas now [ci skip]Godfrey Chan2014-07-031-9/+2
| |_|/ / / / / / |/| | | | | | | | | | | | | | | This has changed since around 2b1500d6
* | | | | | | | Merge pull request #16038 from tbpgr/fix_guide_active_record_validationsRafael Mendonça França2014-07-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix guide. sample code syntax error.[ci skip]
| * | | | | | | | Fix guide. sample code syntax error.[ci skip]tbpgr2014-07-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #16036 from sgrif/sg-datetime-infinityRafael Mendonça França2014-07-033-3/+46
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Do not rely on the column type when quoting infinity
| * | | | | | | | Do not rely on the column type when quoting infinitySean Griffin2014-07-033-3/+46
| |/ / / / / / /
* | | | | | | | Merge pull request #16034 from sgrif/sg-hstore-type-objectRafael Mendonça França2014-07-034-66/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Use the type object for type casting HStore columns
| * | | | | | | Use the type object for type casting HStore columnsSean Griffin2014-07-034-66/+39
|/ / / / / / /
* | | | | | | Merge pull request #15941 from variousred/docrails-changesVijay Dev2014-07-031-8/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Changes some wording to better foreshadow what is coming up later
| * | | | | | | [ci skip] Changes some wording to better foreshadow what is coming up later.Michael Mitchell2014-07-021-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should prevent some anxiety readers may experience when the doc goes into something different than what it just explained. Also clarifies a statement about priority in engines and application environments [ci skip] fixes double `the` [ci skip] more clarifications [ci skip] changes from tics to quotes
* | | | | | | | Merge pull request #16029 from cade/fix_typo_in_commentVijay Dev2014-07-031-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix typo in comment
| * | | | | | | Fix typo in commentCade Truitt2014-07-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fixRafael Mendonça França2014-07-023-1/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change the JSON renderer to enforce the 'JS' Content Type
| * | | | | | | Change the JSON renderer to enforce the 'JS' Content TypeLucas Mazza2014-07-023-1/+24
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The controller can set the response format as 'JSON' before the renderer code be evaluated, so we must replace it when necessary. Fixes #15081
* | | | | | | Add CHANGELOG for c803b90Godfrey Chan2014-07-021-0/+4
| | | | | | |
* | | | | | | The hex escape sequence can be of any lengthGodfrey Chan2014-07-021-1/+1
| | | | | | |
* | | | | | | Fix escape_once double-escaping hex-encoded entitiesJohn F. Douthat2014-07-023-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (This is a manual merge of #9102)
* | | | | | | Only automatically include validations when enabledGodfrey Chan2014-07-022-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #16024.
* | | | | | | Merge pull request #16001 from johnpaulashenfelter/jp_fix_datetime_to_fGodfrey Chan2014-07-023-2/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | `DateTime#to_f` now preserves fractional seconds.
| * | | | | | `DateTime#to_f` now preserves fractional seconds.John Paul Ashenfelter2014-07-023-2/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this method always returns `.0` in the fractional part. This commit changes it to preserve the fractional seconds instead. Fixes #15994.
* | | | | | Merge pull request #16024 from aditya-kapoor/include-validationsRafael Mendonça França2014-07-024-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | automatically include ActiveModel::Validations when include ActiveModel::SecurePassword
| * | | | | | automatically include ActiveModel::Validations when include ↵Aditya Kapoor2014-07-034-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel::SecurePassword
* | | | | | | Merge pull request #16015 from sgrif/sg-ensure-initializedRafael Mendonça França2014-07-022-4/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pk initialization logic onto `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb
| * | | | | | Move pk initialization logic onto `AttributeSet`Sean Griffin2014-07-022-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Better encapsulates its internals from `ActiveRecord::Base`.
* | | | | | | Merge pull request #16022 from sgrif/sg-range-quotingRafael Mendonça França2014-07-023-2/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Quote range strings when quoting PG ranges
| * | | | | | | Quote range strings when quoting PG rangesSean Griffin2014-07-023-2/+19
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test case for CVE-2014-3483 doesn't actually send the generated SQL to the database. The generated SQL is actually invalid for real inputs.
* | / / / / / Fix SQL injection when querying against ranges and bitstringsRafael Mendonça França2014-07-023-4/+16
| |/ / / / / |/| | | | | | | | | | | | | | | | | Fix CVE-2014-3483 and protect against CVE-2014-3482.
* | | | | | Fix typoRafael Mendonça França2014-07-021-1/+1
| | | | | |
* | | | | | Merge pull request #16016 from sgrif/sg-dupRafael Mendonça França2014-07-023-2/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't error when `dup`ing a record with no PK
| * | | | | | Don't error when `dup`ing a record with no PKSean Griffin2014-07-023-2/+19
| |/ / / / /
* | | | | | Merge pull request #16007 from nishantmodak/flash_msg_as_stringRafael Mendonça França2014-07-021-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | flash doesn't pass objects #15522 [ci skip]
| * | | | | flash doesn't pass objects #15522 [ci skip]Nishant Modak2014-07-011-3/+6
| | | | | |
* | | | | | Revert "Merge pull request #15394 from ↵Rafael Mendonça França2014-07-024-105/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format" This reverts commit 46139d33c06715e74ad450428ece3ee84da98579, reversing changes made to 8f247871bb18b2e3036a05df5f62cbfe3b402586. Conflicts: activerecord/CHANGELOG.md
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 11:16:00 +0000