Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15137 from sgrif/sg-remove-dead-code | Rafael Mendonça França | 2014-05-17 | 19 | -183/+82 |
|\ | | | | | Remove dead test code for unsupported adapters | ||||
| * | Remove dead test code for unsupported adapters | Sean Griffin | 2014-05-17 | 19 | -183/+82 |
|/ | |||||
* | Merge pull request #14428 from jnormore/reset_counters_alias | Rafael Mendonça França | 2014-05-17 | 3 | -8/+27 |
|\ | | | | | Updates reset_counters to allow counter name in params | ||||
| * | 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. | ||||
* | | Document method visibility for designing API docs. [ci skip] | Zachary Scott | 2014-05-17 | 1 | -0/+34 |
| | | | | | | | | cc https://github.com/rails/rails/issues/14848#issuecomment-41198795 | ||||
* | | Merge pull request #15152 from printercu/patch-5 | Rafael Mendonça França | 2014-05-17 | 1 | -70/+69 |
|\ \ | | | | | | | Collected TimeZone's class methods together | ||||
| * | | Collected TimeZone's class methods together | printercu | 2014-05-17 | 1 | -70/+69 |
| | | | | | | | | | | | | Just moved class methods up in file and moved `def self.` methods into `class << self`. | ||||
* | | | Merge pull request #15149 from sgrif/sg-missing-tests | Rafael Mendonça França | 2014-05-17 | 1 | -0/+36 |
|\ \ \ | | | | | | | | | Add missing tests for column type cast behavior | ||||
| * | | | Add missing tests for column type cast behavior | Sean Griffin | 2014-05-17 | 1 | -0/+36 |
| |/ / | |||||
* / / | New applications should be created with json serializer | Rafael Mendonça França | 2014-05-17 | 2 | -0/+41 |
|/ / | | | | | | | | | | | | | | | | | | | | | The fix introduced at 75ba7425f6d235f254c00a45a58f42e88f80301a were missing this case. To fix the original issue mentioned at that commit the correct is to remove update_config_files from the command list since we should not run both config_files command when creating a new application. Tests were added to make sure everything is working fine. | ||||
* | | Merge pull request #15150 from xtian/fix-railties-tests | Guillermo Iguaran | 2014-05-17 | 2 | -6/+2 |
|\ \ | | | | | | | Fix app generator test hanging. | ||||
| * | | Fix app generator test hanging. | Christian Wesselhoeft | 2014-05-17 | 2 | -6/+2 |
|/ / | |||||
* | | Merge pull request #15147 from regonn/fix-symbol | Richard Schneeman | 2014-05-17 | 1 | -1/+1 |
|\ \ | | | | | | | Fix symbol at guides getting_started.md | ||||
| * | | fix symbol | regonn | 2014-05-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #15132 from zuhao/refactor_actionpack_abstract_collector_test | Yves Senn | 2014-05-17 | 1 | -5/+11 |
|\ \ | | | | | | | Ensure :js is defined regardless of the outcome of the test. | ||||
| * | | Ensure :js is defined regardless of the outcome of the test. | Zuhao Wan | 2014-05-17 | 1 | -5/+11 |
| | | | |||||
* | | | prefer file name instead of filename [ci skip] | Vijay Dev | 2014-05-17 | 1 | -2/+2 |
| | | | |||||
* | | | fix typo [ci skip] | Vijay Dev | 2014-05-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #15145 from ShunsukeAida/capitalization | Vijay Dev | 2014-05-17 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | fixed capitalizations [ci skip] | ||||
| * | | | fixed capitalizations [ci skip] | SA | 2014-05-17 | 1 | -3/+3 |
|/ / / | | | | | | | jQuery, SQLite3 and Unicorn use these respective capitalizations pretty much everywhere else in the comment sections of the project. | ||||
* | | | Merge pull request #15144 from leafac/fix-changelog-#15071 | Godfrey Chan | 2014-05-16 | 1 | -1/+3 |
|\ \ \ | |_|/ |/| | | Fix typo in CHANGELOG entry for #15071 | ||||
| * | | Fix typo in CHANGELOG entry for #15071 | Leandro Facchinetti | 2014-05-17 | 1 | -1/+3 |
|/ / | |||||
* | | 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 |
| | | | | | |