aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removing :en in favor of I18n.default_locale in duration#inspectDominik Masur2015-01-122-1/+10
| | | | | | | | | | | | | | | | | Hi there, i have an app without english as available locale. So i got an error when we try to inspect something like 1.day. This is done automatically when we use the dalli cache. I would like to change the :en to ::I18n.default_locale to be sure that this is always constant and is an available locale. Tests are all green with this change. Calculating ------------------------------------- :locale => :en 2.024k i/100ms :locale => ::I18n.default_locale 2.236k i/100ms ------------------------------------------------- :locale => :en 25.758k (±26.3%) i/s - 117.392k :locale => ::I18n.default_locale 26.311k (±18.1%) i/s - 127.452k
* Merge pull request #18460 from mechanicles/a-to-an-for-xmlXavier Noria2015-01-121-2/+2
|\ | | | | Change 'a' to 'an' for 'XML' word [ci skip]
| * Change 'a' to 'an' for 'XML' word [ci skip]Santosh Wadghule2015-01-121-2/+2
| |
* | Merge pull request #18461 from zetsubo/patch-1Matthew Draper2015-01-121-1/+1
|\ \ | |/ |/| minor grammatical fix in documentation
| * minor grammatical fix in documentationJade McGough2015-01-121-1/+1
|/
* Merge pull request #18436 from deepj/fork-detectionCarlos Antonio da Silva2015-01-111-1/+1
|\ | | | | Better fork detection in ActiveSupport::Testing::Isolation
| * Better fork detection in ActiveSupport::Testing::Isolationdeepj2015-01-101-3/+1
| | | | | | | | | | Process.respond_to?(:fork) returns false if fork is not available. More on http://www.ruby-doc.org/core-2.0.0/Process.html#method-c-fork
* | Merge pull request #18456 from claudiob/remove-unused-fixtures-to-renderCarlos Antonio da Silva2015-01-111-65/+0
|\ \ | | | | | | Remove unused AV fixtures from AP tests
| * | Remove unused AV fixtures from AP testsclaudiob2015-01-111-65/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | When `render` was moved from ActionPack to ActionView in acc8e259, some fixtures required by the tests were duplicated, but they are actually only required by ActionView tests. To give one example, `double_render` is already defined [in the AV tests](https://github.com/rails/rails/blob/72139d8d310d896db78eaec98582c7a638135102/actionview/test/actionpack/controller/render_test.rb#L407) and is never used in the ActionPack tests.
* | | Merge pull request #18454 from claudiob/test-on-option-for-amv-callbacksCarlos Antonio da Silva2015-01-111-0/+26
|\ \ \ | | | | | | | | Add test for AM::Validation::Callbacks with :on
| * | | Add test for AM::Validation::Callbacks with :onclaudiob2015-01-111-0/+26
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `before_validation` and `after_validation` from ActiveModel::Validation::Callbacks accept an optional `:on` parameter that was not previously documented or tested. For instance given before_validation :do_something, on: :create then `object.valid?(:create)` will invoke `:do_something` while `object.valid?` or `object.valid?(:anything_else)` will not.
* | | Merge pull request #18455 from claudiob/remove-unused-deprecated_reload-methodCarlos Antonio da Silva2015-01-111-4/+0
|\ \ \ | |/ / |/| | Remove unused "deprecated_reload" method
| * | Remove unused "deprecated_reload" methodclaudiob2015-01-111-4/+0
|/ / | | | | | | | | | | The method was introduced in https://github.com/rails/rails/commit/66d0a0153578ce760d822580c5b8c0b726042ac2#diff-8cec05860729a3851ceb756f4dd90370R49 for the "reset_changes is deprecated" test, but this test was successively removed in https://github.com/rails/rails/commit/37175a24bd508e2983247ec5d011d57df836c743
* | Merge pull request #18448 from robertomiranda/has_secure_token_generatorGuillermo Iguaran2015-01-116-1/+51
|\ \ | | | | | | Add has secure token to migration generator
| * | Add Secure Token Generatorrobertomiranda2015-01-116-1/+51
| | |
* | | 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!
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 00:37:12 +0000