aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #13309 from arunagw/warning-fix-argumnetRafael Mendonça França2013-12-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | argument prefix warning removed
| * | | | | | | | argument prefix warning removedArun Agrawal2013-12-131-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * interpreted as a argument prefix
* | | | | | | | Merge pull request #13306 from kassio/masterRafael Mendonça França2013-12-132-4/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix mysql to support duplicated column names
| * | | | | | | | Fix mysql to support duplicated column namesKassio Borges2013-12-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix the [broken test](https://github.com/rails/rails/commit/4a2650836680f51490e999c3c8441a2f9adff96e) `test_with_limiting_with_custom_select`. The query's result was built in a hash with column name as key, if the result have a duplicated column name the last value was overriding the first one.
* | | | | | | | | refactor, reuse assertions in range_test.rb.Yves Senn2013-12-131-186/+111
| | | | | | | | |
* | | | | | | | | extract PG range tests from datatype_test.rb into range_test.rbYves Senn2013-12-133-296/+321
|/ / / / / / / /
* | | | | | | | Merge pull request #13305 from psahni/form_tag_with_parametersYves Senn2013-12-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | form_tag with parameters fixed [ci skip]
| * | | | | | | | form_tag with parameters fixed [ ci skip ]Prashant Sahni2013-12-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #13303 from dvsuresh/typo_postgresqlymlArun Agrawal2013-12-121-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Correct comment in databases/postgresql.yml [ci skip]
| * | | | | | | | | Correct comment in databases/postgresql.ymlDV Suresh2013-12-121-1/+1
| | | | | | | | | |
* | | | | | | | | | Add a bunch of Relation -> Array delegate methods to the whitelist. This ↵Jeremy Kemper2013-12-122-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | won't last - aim to switch back to a blacklist for mutator methods.
* | | | | | | | | | Perf: save ~9% of object allocations on heavy requests.Jeremy Kemper2013-12-121-2/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The per-thread registry is keyed on the class name, and each request for the class name returns a new string. This is in the hot path for a lot of Active Record behavior, so we easily accumulate thousands of repeated strings. To fix, we simply cache the key when the class is first extended with the module. TODO: Eliminate this module. The per-thread instance concept is common, but this technique confuses and obfuscates.
* | | | | | | | | Merge pull request #13302 from afshinator/masterLauro Caetano2013-12-121-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix grammatical error
| * | | | | | | | | fix grammatical errorAfshin Mokhtari2013-12-121-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12590 from laurocaetano/whitelist-to-delegate-array-methodsRafael Mendonça França2013-12-124-104/+105
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Create a whitelist of methods to be delegated to Array.
| * | | | | | | | | | Use `public_send` instead of just use `send`.Lauro Caetano2013-12-122-9/+9
| | | | | | | | | | |
| * | | | | | | | | | Use a whitelist to delegate methods to arrayLauro Caetano2013-12-122-75/+38
| | | | | | | | | | |
| * | | | | | | | | | Add changeloglaurocaetano2013-12-121-6/+15
| | | | | | | | | | |
| * | | | | | | | | | Remove delegation test.laurocaetano2013-12-121-17/+46
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was removed, since Relation will not delegate class methods to Array.
* | | | | | | | | | extract cache counter logic to one methodAaron Patterson2013-12-121-11/+10
| | | | | | | | | |
* | | | | | | | | | remove duplicate codeAaron Patterson2013-12-121-15/+6
| | | | | | | | | |
* | | | | | | | | | extract a method for updating without a record objectAaron Patterson2013-12-121-6/+10
| | | | | | | | | |
* | | | | | | | | | extract methods out of the cache update methodAaron Patterson2013-12-121-14/+22
| | | | | | | | | |
* | | | | | | | | | pull a nil check up one frameAaron Patterson2013-12-121-6/+10
|/ / / / / / / / /
* | | | | | | | | docs guidelines: recommends wording in a way that avoids "you"s and "your"sXavier Noria2013-12-121-1/+15
| | | | | | | | |
* | | | | | | | | copy-edits 68abbac [ci skip]Xavier Noria2013-12-121-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rewording to avoid "you"s. * Suggest as first natural alternative to refactor the block to evaluate to the returned value. * Removes the quotes around "filters", since that is a common work in our jargon.
* | | | | | | | | Merge pull request #13255 from strzalek/bump-builderRafael Mendonça França2013-12-122-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump up builder
| * | | | | | | | | More liberal builder dependencyŁukasz Strzałkowski2013-12-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allowing us to get 3.2.x versions if needed.
* | | | | | | | | | Merge pull request #13300 from chancancode/add_nodoc_am_dirty_methodsAaron Patterson2013-12-121-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip]
| * | | | | | | | | Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip]Godfrey Chan2013-12-121-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods were made "public" in 47617ecd so that `method_missing` can invoke them without going through `send`, but they aren't meant for consumption from outside of Rails.
* | | | | | | | | remove more nil checksAaron Patterson2013-12-121-6/+5
| | | | | | | | |
* | | | | | | | | remove nil checkAaron Patterson2013-12-122-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calling replace_keys could possibly do a nil check twice, this commit reduces it to once.
* | | | | | | | | remove the nil check from set_inverse_instanceAaron Patterson2013-12-124-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods that call set_inverse_instance with a record will not have to pay the cost of a nil check on every call
* | | | | | | | | make sure cached table name is a string. fixes #12582Aaron Patterson2013-12-123-1/+12
| | | | | | | | |
* | | | | | | | | Merge pull request #13229 from vipulnsward/fix-10635-testsRafael Mendonça França2013-12-122-2/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix test-error introduced by #10635.
| * | | | | | | | | PR #10635 introduces rescue from ArgumentError thrown by ↵Vipul A M2013-12-122-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Base64.strict_decode64`. This broke natural order of things for `StaleSessionCheck#stale_session_check!` which tried auto_loading a class based on `ArgumentError` message , and later retrying the `Marshal#load` of class, successfully allowing auto_loading. This PR tries to fix this behavior by forwarding `ArgumentError` 's not raised by `Base64.strict_decode64` , as is, ahead to `StaleSessionCheck#stale_session_check!`
* | | | | | | | | | Merge pull request #13293 from akshay-vishnoi/typoCarlos Antonio da Silva2013-12-128-12/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | Spelling and Grammar checks [ci skip]
| * | | | | | | | | Spelling and Grammar checksAkshay Vishnoi2013-12-128-12/+12
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13271 from ↵Rafael Mendonça França2013-12-121-0/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chancancode/warn_about_using_return_in_as_callbacks Warn about using `return` inside inline callback blocks [ci skip]
| * | | | | | | | | Warn about using `return` inside inline callback blocks [ci skip]Godfrey Chan2013-12-111-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12981
* | | | | | | | | | Copy-edit the parent commitRafael Mendonça França2013-12-121-6/+8
| | | | | | | | | |
* | | | | | | | | | Merge pull request #13268 from aayushkhandelwal11/masterRafael Mendonça França2013-12-121-22/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the common code of increment and decrement of cache file store in...
| * | | | | | | | | | Moving the common code of increment and decrement of cache file store into ↵Aayush khandelwal2013-12-121-22/+16
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seprate function Removing the double checking for the value of id simplifying code for checking conditional code for key Removing the default values for parameters removing reduntant code and asiigning value of id in local variable removing wrongly added line break[ci ckip] reverting code
* | | | | | | | | | Merge pull request #13290 from strzalek/inline-syntax-docsRafael Mendonça França2013-12-123-0/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Variants inline syntax documentation
| * | | | | | | | | | Variants inline syntax documentation [ci skip]Łukasz Strzałkowski2013-12-123-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extend method documentation * Mention it in actionpack/CHANGELOG * Update release notes
* | | | | | | | | | | Merge pull request #13291 from strzibny/new_unique_constraintYves Senn2013-12-121-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Translate new unique constraint error message for sqlite >= 3.8.2
| * | | | | | | | | | Translate new unique constraint for sqlite >= 3.8.2Josef Stribny2013-12-121-1/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #13032 from kuldeepaggarwal/after_touch_documentationYves Senn2013-12-121-0/+49
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] added after_touch callback documentation [ci skip]
| * | | | | | | | | | | [ci skip] added after_touch callback documentationKuldeep Aggarwal2013-12-121-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] added more explanation for `after_touch` callback
* | | | | | | | | | | | Get rid of hack for freezing time on AR testsCarlos Antonio da Silva2013-12-122-23/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now make use of the existent #travel/#travel_to helper methods added to AS test case and available in all tests.