aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #18451 from jlduran/guides-sql-cachingRafael Mendonça França2015-01-111-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Re-add section in SQL Caching [ci skip]
| * | | | | Re-add section in SQL CachingJose Luis Duran2015-01-111-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This section was accidentally removed in 4b5e424441149cf0f61a8182f4a92999577ce59a, and partially re-added in dc14b893e5904acb37ac327478f3880f33094b7a. [ci skip]
* | | | | Merge pull request #18452 from claudiob/fix-broken-assertionRafael Mendonça França2015-01-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix assertion that was never run
| * | | | Fix assertion that was never runclaudiob2015-01-111-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to run whether the `welcome` method of the ActionMailer::Base subclass raises an error, `message` must be called, otherwise the method is not executed at all. You could just replace with `def welcome; raise StandardError; end` and you would still see a passing test. This commit fixes the test so the assertion is actually executed, just like any other tests in the file, where `.message` is called.
* | | | Merge pull request #18435 from kuldeepaggarwal/f-remove-unnecessary-requireRafael Mendonça França2015-01-117-8/+0
|\ \ \ \ | | | | | | | | | | No need of requiring `rbconfig`, it is by-default loaded
| * | | | No need of requiring `rbconfig`, it is by-default loadedKuldeep Aggarwal2015-01-107-8/+0
| |/ / /
* | | | Merge pull request #18445 from y-yagi/remove_hide_actionsRafael Mendonça França2015-01-111-1/+0
|\ \ \ \ | | | | | | | | | | remove autoload HideActions, no longer exist
| * | | | remove autoload HideActions, no longer existyuuji.yaginuma2015-01-111-1/+0
|/ / / /
* | | | Deprecate passing a column to `quote`Sean Griffin2015-01-101-0/+6
| | | | | | | | | | | | | | | | | | | | It's only used to grab the type for type casting purposes, and we would like to remove the type from the columns entirely.
* | | | Stop passing a column to `quote` in testsSean Griffin2015-01-102-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm planning on deprecating the column argument to mirror the deprecation in [arel]. [arel]: https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11
* | | | Stop passing a column to `quote` when finding by AR modelsSean Griffin2015-01-101-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm planning on deprecating the column argument to mirror the deprecation in [arel]. [arel]: https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11
* | | | Stop passing a column to `quote` when executing from a statement cacheSean Griffin2015-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm planning on deprecating the column argument to mirror the deprecation in [arel]. [arel]: https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11
* | | | Stop passing a column to `quote` in `Relation#to_sql`Sean Griffin2015-01-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm planning on deprecating the column argument to mirror the deprecation in [arel]. [arel]: https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11
* | | | Stop passing a column to `quote` when prepared statements are turned offSean Griffin2015-01-102-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm planning on deprecating the column argument to mirror the deprecation in [arel]. [arel]: https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11
* | | | Merge pull request #18440 from robertomiranda/patch-3Guillermo Iguaran2015-01-101-1/+1
|\ \ \ \ | | | | | | | | | | Fix Typo SecureToken [ci skip]
| * | | | Fix Typo SecureToken [ci skip]Roberto Miranda2015-01-101-1/+1
|/ / / /
* | | | Stop passing a column to `quote` in `insert_fixture`Sean Griffin2015-01-102-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm planning on deprecating the column argument to mirror the deprecation in [arel]. [arel]: https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11
* | | | Stop special casing null binary data in loggingSean Griffin2015-01-103-9/+7
| |_|/ |/| | | | | | | | | | | | | | There's very little value in logging "<NULL binary data>" instead of just "nil". I'd like to remove the column from the equation entirely, and this case is preventing us from doing so.
* | | Don't attempt to save dirty attributes which are not persistableSean Griffin2015-01-104-1/+28
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets a precident for how we handle `attribute` calls, which aren't backed by a database column. We should not take this as a conscious decision on how to handle them, and this can change when we make `attribute` public if we have better ideas in the future. As the composed attributes API gets fleshed out, I expect the `persistable_attributes` method to change to `@attributes.select(&:persistable).keys`, or some more performant variant there-of. This can probably go away completely once we fully move dirty checking into the attribute objects once it gets moved up to Active Model. Fixes #18407
* | Merge branch 'Prefer-IO_NULL'. Closes #18381.Yves Senn2015-01-104-4/+4
|\ \
| * | Use IO::NULL alwaysNobuyoshi Nakada2015-01-104-4/+4
|/ /
* | Merge pull request #18433 from koraktor/patch-1Yves Senn2015-01-101-1/+1
|\ \ | | | | | | Fix typo in PostresSQLAdapter's documentation [ci skip]
| * | Fix typo in PostresSQLAdapter's documentationSebastian Staudt2015-01-101-1/+1
|/ /
* | formatting pass over CHANGELOGs. [ci skip]Yves Senn2015-01-104-6/+12
| |
* | Remove note about supported plugins from the releasing docsCarlos Antonio da Silva2015-01-091-11/+0
| | | | | | | | | | | | | | The last supported plugin on the list was protected_attributes, which is not going to be supported anymore on Rails 5. [ci skip]
* | Remove support for the protected attributes gemCarlos Antonio da Silva2015-01-092-10/+6
| | | | | | | | Related to #10690.
* | Merge pull request #18347 from robertomiranda/has_secure_token_base62Guillermo Iguaran2015-01-092-32/+8
|\ \ | | | | | | Switching SecureTokens to Base58
| * | Switch Secure Token generation to Base58robertomiranda2015-01-092-32/+8
| | | | | | | | | | | | | | | | | | Update Secure Token Doc [ci skip] remove require securerandom, core_ext/securerandom already do that ref 7e006057
* | | Merge pull request #10690 from robertomiranda/remove_mass_assignment_securityGuillermo Iguaran2015-01-091-7/+0
|\ \ \ | | | | | | | | Remove attributes_protected_by_default reference
| * | | Remove attributes_protected_by_default reference, since ↵robertomiranda2015-01-091-7/+0
| | | | | | | | | | | | | | | | MassAssignmentSecurity was removed from ActiveModel f8c9a4d3e88181
* | | | Add missing requireGuillermo Iguaran2015-01-091-0/+2
| |/ / |/| |
* | | Add SecureRandom.base58Guillermo Iguaran2015-01-093-0/+45
|/ /
* | Merge pull request #18426 from arthurnn/txn_refGodfrey Chan2015-01-091-3/+3
|\ \ | | | | | | Copy records to parent transaction should happen on TransactionManager
| * | Copy records to parent transaction should happen on TransactionManagerArthur Neves2015-01-091-3/+3
| | | | | | | | | | | | It is up to the TransactionManager keep the state of current transaction, so after it commits it needs to copy any remaning record to the next current transaction
* | | Merge pull request #18425 from arthurnn/kargs_transactionRafael Mendonça França2015-01-092-5/+5
|\| | | | | | | | Use keyword args on committed! and rolledback!
| * | Use keyword args on committed! and rolledback!Arthur Neves2015-01-092-5/+5
|/ / | | | | | | As discussed before, those methods should receive a keyword args instead of just parameters
* | Properly copy nested bind values from subqueried relationsSean Griffin2015-01-092-12/+22
| | | | | | | | | | | | | | | | | | | | | | This is cropping up all over the place. After a brief dive, I'm really not sure why we have `arel.bind_values` at all. A cursory grep didn't reveal where they're actually being assigned (it's definitely in AR, not in Arel). I'd like to dig further into it, as I'm fairly certain we don't actually need it, we just need a way for the predicate builder to communicate merged binds upstream. Fixes #18414
* | Properly persist `lock_version` as 0 if the DB has no defaultSean Griffin2015-01-092-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason this bug occured is that we never actually check to see if this column has changed from it's default, since it was never assigned and is not mutable. It appears I was wrong in b301c40224c6d15b539dbcc7485adb44d810f88c, with my statement of "there is no longer a case where a given value would differ from the default, but would not already be marked as changed." However, I chose not to revert the deletion of `initialize_internals_callback` from that commit, as I think a solution closer to where the problem lies is less likely to get erroneously removed. I'm not super happy with this solution, but it mirrors what is being done in `_update_record`, and a fix for one should work for the other. I toyed with the idea of changing the definition of `changed?` on the type to `changed_in_place?`. If we type cast the raw value, it'll break a test about updating not modifying the lock column if nothing else was changed. We could have the definition check if `raw_old_value` is `nil`, but this feels fragile and less intention revealing. It would, however, have the benefit of cleaning up old data that incorrectly persisted as `nil`. Fixes #18422
* | Merge pull request #18390 from tgxworld/parallel_bundle_installRafael Mendonça França2015-01-091-1/+1
|\ \ | | | | | | Use parallel bundler install.
| * | Use parallel bundler install.Guo Xiang Tan2015-01-101-1/+1
| | | | | | | | | | | | | | | Travis recommends a default of 3. See: http://docs.travis-ci.com/user/languages/ruby/#Default-Test-Script
* | | Merge pull request #18413 from brainopia/automatic_inverse_of_for_belongs_toDavid Heinemeier Hansson2015-01-095-31/+70
|\ \ \ | | | | | | | | Correctly count methods when using declarative `#test` in minitest
| * | | Drop old test locations from `rake stats`brainopia2015-01-093-6/+8
| | | | | | | | | | | | | | | | | | | | - test/functional - test/unit
| * | | Update `rake counts` to count declarative tests in minitestbrainopia2015-01-093-25/+62
| | | |
* | | | Merge pull request #18423 from jone/remove-default-headerYves Senn2015-01-093-0/+35
|\ \ \ \ | | | | | | | | | | | | | | | Default headers, removed in controller actions, will not be reapplied to the test response
| * | | | Default headers, removed in controller actions, will not be reapplied to the ↵Jonas Baumann2015-01-093-0/+35
|/ / / / | | | | | | | | | | | | test response.
* | | | Merge pull request #18416 from caike/masterRafael Mendonça França2015-01-093-6/+6
|\ \ \ \ | | | | | | | | | | Add _mailer suffix to i18n path
| * | | | Add _mailer suffix to i18n pathCarlos Souza2015-01-083-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mailers created via generators Follow up to #18074
* | | | | Merge pull request #18417 from ↵Sean Griffin2015-01-091-0/+3
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | yoshiokatsuneo/active_record_connection_pool_error_disconnect ActiveRecord: release connection on reconnect failure.
| * | | ActiveRecord: release connection on reconnect failure.Yoshioka Tsuneo2015-01-091-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to checkout connection from connection pool, checkout()(and checkout_and_verify) verify whether the connection is active or not. And, if the connection is not active, connection adapters try to reconnect to server. And, if database is down at this moment, reconnect fails and exception is raised. (Ex: Mysql2::Error: Can't connect to local MySQL server through socket xxx) But, ConnectionPool does not catch the exception, but leaks current disconnected connection to @connection. So, if database's temporary down happens several times and exceeds the number of connection pool(5 by default), activerecord will be no more available, even if database server is already recovered. This patch fix it by catching exception and releasing connection.
* | | Merge pull request #18410 from seuros/ripfilterRafael Mendonça França2015-01-083-9/+37
|\ \ \ | | | | | | | | remove *_filter