Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updates reset_counters to allow counter name in params | Jason Normore | 2014-05-16 | 3 | -8/+27 |
| | | | | | | | Add support for counter name to be passed as parameter on `CounterCache::ClassMethods#reset_counters`. This is to be consistent with the other methods in the module that all accept counter name. | ||||
* | Merge pull request #15143 from htanata/first_person_pronouns | Rafael Mendonça França | 2014-05-16 | 3 | -11/+11 |
|\ | | | | | Replace first person point of view on guides. | ||||
| * | Replace first person point of view on guides. | Hendy Tanata | 2014-05-16 | 3 | -11/+11 |
|/ | | | | [skip ci] | ||||
* | Merge pull request #15037 from ↵ | Rafael Mendonça França | 2014-05-16 | 3 | -7/+34 |
|\ | | | | | | | | | | | | | | | | | roccoblues/fix_duplicate_activesupport_subscribers Fixed duplicate subscribers in ActiveSupport::Subscriber Conflicts: activesupport/CHANGELOG.md | ||||
| * | Fixed duplicate subscribers in ActiveSupport::Subscriber | Dennis Schoen | 2014-05-09 | 3 | -7/+34 |
| | | | | | | | | | | ActiveSupport::Subscriber no longer creates multiple subscribers when you redefine a method. | ||||
* | | Add CHANGELOG entry for #15071 [ci skip] | Rafael Mendonça França | 2014-05-16 | 1 | -0/+8 |
| | | |||||
* | | Merge pull request #15071 from leafac/issues/11985 | Rafael Mendonça França | 2014-05-16 | 2 | -4/+18 |
|\ \ | | | | | | | Fix `Relation#delete_all` inconsistency | ||||
| * | | Fix `Relation#delete_all` inconsistency | Leandro Facchinetti | 2014-05-16 | 2 | -4/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When relation scopes include one of `uniq`, `group`, `having` or `offset`, the generated query ignores them and that causes unintended records to be deleted. This solves the issue by restricting the deletion when those scopes are present. rails/rails#11985 | ||||
* | | | foo :bomb: | Rafael Mendonça França | 2014-05-16 | 1 | -2/+5 |
| | | | |||||
* | | | Generate the cookies_serializer configuration with :marshal when upgrading | Rafael Mendonça França | 2014-05-16 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were generating this configuration with :json what may break applications upgrating from Rails 4.0-. Now we always generate with a safer value and people is free to choose hybrid if they want. We don't generate with hybrid by default because there are some cases that can fail. These cases are explained on the upgrading guide. | ||||
* | | | doc, pg `hstore` and `json` columns are mapped as `Hash`. [ci skip] | Yves Senn | 2014-05-17 | 1 | -0/+8 |
| | | | | | | | | | | | | Closes #15141. | ||||
* | | | remove trailing whitespace. [ci skip] | Yves Senn | 2014-05-17 | 2 | -4/+4 |
| | | | |||||
* | | | Merge pull request #15140 from arthurnn/small_cleanup | Rafael Mendonça França | 2014-05-16 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | Remove unecessary require | ||||
| * | | | Remove unecessary require | Arthur Neves | 2014-05-16 | 1 | -2/+0 |
|/ / / | |||||
* | | | Merge pull request #15139 from zzak/habtm_build_model_name | Rafael Mendonça França | 2014-05-16 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Remove the assignment for real this time. | ||||
| * | | | Remove the assignment for real this time. | Zachary Scott | 2014-05-16 | 1 | -2/+2 |
|/ / / | | | | | | | | | | | | | | | | cc: https://github.com/rails/rails/commit/a11e2fcff8cdc9691b977d8330abe63024f8c732#commitcomment-6353614 and 0369dbf | ||||
* | | | prepend mutates the string so we can remove the assignment | Rafael Mendonça França | 2014-05-16 | 1 | -1/+1 |
| | | | |||||
* | | | Reuse the force_clear_transaction_record_state | Rafael Mendonça França | 2014-05-16 | 1 | -1/+1 |
| | | | |||||
* | | | Missed if :bomb: | Rafael Mendonça França | 2014-05-16 | 1 | -1/+1 |
| | | | |||||
* | | | Add a specific method to force the transaction record state clear | Rafael Mendonça França | 2014-05-16 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | We are using that code path in only one place so we should not add a conditional to all the other cases. This will avoid performance regressions on the old paths. | ||||
* | | | Merge pull request #15125 from arthurnn/small_refactoring_transaction_clear | Godfrey Chan | 2014-05-16 | 2 | -4/+19 |
|\ \ \ | | | | | | | | | Small refactoring on clear_transaction_record_state | ||||
| * | | | Clear transaction state if callback raise rollback | Arthur Neves | 2014-05-15 | 2 | -1/+14 |
| | | | | |||||
| * | | | Small refactoring on clear_transaction_record_state | Arthur Neves | 2014-05-15 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Make sure when we clean the `@_start_transaction_state` var we do it in the same code-path. Also this makes `clear_transaction_record_state`, more consistent with `restore_transaction_record_state` | ||||
* | | | | Merge pull request #15131 from arunagw/aa-cleanup-rakefile | Rafael Mendonça França | 2014-05-16 | 2 | -31/+1 |
|\ \ \ \ | | | | | | | | | | | Remove code related to adapter which are no longer in repo | ||||
| * | | | | Remove code related to adapter which are no longer in repo | Arun Agrawal | 2014-05-16 | 2 | -31/+1 |
| | | | | | | | | | | | | | | | | | | | | As we have remove code for these adapters so no need to have tasks | ||||
* | | | | | Merge pull request #15021 from hubertlepicki/allow_custom_host_in_asset_url | Rafael Mendonça França | 2014-05-16 | 4 | -3/+38 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Allow custom asset host to be passed in asset_url | ||||
| * | | | | | Improve documentation for asset_url | Hubert Łępicki | 2014-05-08 | 3 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG.md with entry about :host in asset_url | ||||
| * | | | | | Allow custom asset host to be passed in asset_url | Hubert Łępicki | 2014-05-08 | 2 | -1/+17 |
| | | | | | | |||||
* | | | | | | Our test suite isn't ready to run in random order yet :cry: | Guillermo Iguaran | 2014-05-16 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #15113 from leafac/document-schema-conflicts | Rafael Mendonça França | 2014-05-16 | 1 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Document conflicts in `db/schema.rb` [ci skip] | ||||
| * | | | | | | Document conflicts in `db/schema.rb` [ci skip] | Leandro Facchinetti | 2014-05-16 | 1 | -0/+5 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15133 from ShunsukeAida/master | Rafael Mendonça França | 2014-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | fixed a typo | ||||
| * | | | | | | fixed a typo [ci skip] | Aida | 2014-05-17 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | / / / | formatting pass through CHANGELOGS. [ci skip] | Yves Senn | 2014-05-16 | 4 | -8/+10 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #15118 from ↵ | Rafael Mendonça França | 2014-05-15 | 6 | -2/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | khelben/head_with_status_action_stack_level_too_deep fixes stack level too deep exception on action named 'status' rendering 'head :ok' | ||||
| * | | | | | fixes stack level too deep exception on action named 'status' returning ↵ | Christiaan Van den Poel | 2014-05-15 | 6 | -2/+47 |
|/ / / / / | | | | | | | | | | | | | | | | 'head :ok' | ||||
* | | | | | Merge pull request #15121 from skarpesh/rfc4791-methods | Rafael Mendonça França | 2014-05-15 | 3 | -3/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add RFC 4791 MKCALENDAR method | ||||
| * | | | | | Add RFC4791 MKCALENDAR method | kasper | 2014-05-15 | 3 | -3/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #14791 from asn62/mysql_double_bug | Matthew Draper | 2014-05-16 | 3 | -0/+47 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed extract_limit in class Column to return correct mysql float and double limits | ||||
| * | | | | | | Changed extract_limit in class Column to return correct mysql float and ↵ | Aaron Nelson | 2014-05-16 | 3 | -0/+47 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | double limits | ||||
* / / / / / | Revert "Remove ruby-head from allow_failures matrix" | Santiago Pastorino | 2014-05-15 | 1 | -0/+1 |
|/ / / / / | | | | | | | | | | | | | | | | This reverts commit 5d2d301024cc0b17f26f6b454ac22a72f1db8a23. | ||||
* | | | | | Remove ruby-head from allow_failures matrix | Santiago Pastorino | 2014-05-15 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #15116 from tgxworld/remove_unused_method_in_test | Santiago Pastorino | 2014-05-15 | 1 | -4/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unused method in RouteSet test. | ||||
| * | | | | | Remove unused method in RouteSet test. | Guo Xiang Tan | 2014-05-15 | 1 | -4/+0 |
| | | | | | | |||||
* | | | | | | flexible ruby-oci8 version specification. [Gaurav Sharma] | Yves Senn | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #15109. /cc @Gaurav2728 | ||||
* | | | | | | update ruby-oci8 version specification. Closes #15109. [ci skip] | Yves Senn | 2014-05-15 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | /cc @yahonda | ||||
* | | | | | Only path requirements are relevant to optimized urls | Andrew White | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The bit of URL generation that is optimized is the generation of the path so things like :host, :port, etc. are irrelevant. | ||||
* | | | | | Add missing requires for require 'action_dispatch/routing' | Andrew White | 2014-05-15 | 2 | -0/+3 |
| | | | | | |||||
* | | | | | :scissors: | Rafael Mendonça França | 2014-05-14 | 3 | -4/+0 |
| | | | | | |||||
* | | | | | Methods of these modules are internal | Rafael Mendonça França | 2014-05-14 | 2 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | They should not be used on people application so they should not be present on the API documentation. |