aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | #4566: Remove extra decrement of transaction levelPaul Nikitochkin2013-07-143-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `rollback_active_record_state!` tries to restore model state on `Exception` by invoking `restore_transaction_record_state` it decrement deep level by `1`. After restoring it ensure that states to be cleared and level decremented by invoking `clear_transaction_record_state`, which cause the bug: because state already reduced in `restore_transaction_record_state`. Removed double derement of transaction level and removed duplicated code which clear transaction state for top level.
* | | | Merge pull request #11439 from ernie/only-scan-strings-for-nodesYves Senn2013-07-142-1/+8
|\ \ \ \ | | | | | | | | | | Blacklist->whitelist for reference scans in order!
| * | | | Blacklist->whitelist for reference scans in order!Ernie Miller2013-07-142-1/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | Stop special-casing Arel::Nodes as exempt from reference scanning in order. Instead, only scan order values that are strings for a table reference.
* | | | re-introduce `select_for_count` private method.Yves Senn2013-07-141-5/+10
| | | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion.
* | | | Merge pull request #11437 from kennyj/fix_11393Guillermo Iguaran2013-07-143-1/+11
|\ \ \ \ | |/ / / |/| | | Fix #11393. Fix default rendered format when calling render method without :content_type option.
| * | | Fix default rendered format problem when calling render method without ↵kennyj2013-07-153-1/+11
|/ / / | | | | | | | | | :content_type option. Closes #11393.
* | | Merge pull request #11433 from arunagw/removed_unused_taskJosé Valim2013-07-141-13/+0
|\ \ \ | | | | | | | | railties Rakefile tweaks
| * | | Removed unused require from RakefileArun Agrawal2013-07-141-4/+0
| | | |
| * | | Removed unused broken task for update README [ci skip]Arun Agrawal2013-07-141-9/+0
|/ / /
* | | Merge pull request #11425 from arunagw/actionview_api_generationXavier Noria2013-07-141-8/+7
|\ \ \ | | | | | | | | Actionview api generation
| * | | Added actionview in API generation [ci skip]Arun Agrawal2013-07-141-8/+7
| | | | | | | | | | | | CHANGELOG and LICENSE removed as suggested
* | | | Merge pull request #11431 from ianfleeton/initialization_memoized_typoYves Senn2013-07-141-1/+1
|\ \ \ \ | | | | | | | | | | memorized -> memoized typo fix [ci skip]
| * | | | memorized -> memoized typo fix [ci skip]Ian Fleeton2013-07-141-1/+1
|/ / / / | | | | | | | | | | | | Reverts one line from 457b7ff9
* | | | Merge pull request #11424 from kennyj/fix_column_defaults_cachingSantiago Pastorino2013-07-133-0/+15
|\ \ \ \ | | | | | | | | | | Reset @column_defaults when assigning locking_column.
| * | | | Reset @column_defaults when assigning .kennyj2013-07-143-0/+15
| | | | |
* | | | | This is not needed anymore, before_initialize block can access configSantiago Pastorino2013-07-141-1/+0
| | | | |
* | | | | Merge pull request #11428 from evangoer/minor_asset_pipeline_docfixGuillermo Iguaran2013-07-131-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update YUI Compressor link; tweak UglifyJS
| * | | | | [ci-skip] Update link, tweak UglifyJSEvan Goer2013-07-131-2/+2
|/ / / / /
* | | | | Merge pull request #11426 from wangjohn/action_controller_live_docsSantiago Pastorino2013-07-131-0/+86
|\ \ \ \ \ | | | | | | | | | | | | ActionController::Live documentation in the guides.
| * | | | | ActionController::Live documentation in the guides.wangjohn2013-07-131-0/+86
| |/ / / / | | | | | | | | | | | | | | | | | | | | I'm adding documentation to the action_controller_overview guide which should tell people how to stream arbitrary data.
* | | | | Merge pull request #11427 from jmondo/patch-1Santiago Pastorino2013-07-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | it's xml, not json
| * | | | it's xml, not jsonJohn Gesimondo2013-07-131-1/+1
|/ / / / | | | | | | | | change docs for xml serializer to talk about xml
* | | | Merge pull request #11422 from arunagw/added_missing_actionviewGuillermo Iguaran2013-07-131-1/+1
|\ \ \ \ | |/ / / |/| | | Added missing actionview in list for release
| * | | Added missing actionview in list for releaseArun Agrawal2013-07-131-1/+1
|/ / /
* | | Merge pull request #11421 from arunagw/actionpack_activerecord_removeGuillermo Iguaran2013-07-131-91/+0
|\ \ \ | | | | | | | | Removed unused file! Moved to actionview
| * | | Removed unused file! Moved to actionviewArun Agrawal2013-07-131-91/+0
| | | | | | | | | | | | | | | | Removed unused file as this has been moved to actionview
* | | | Merge pull request #11413 from envylabs/masterYves Senn2013-07-131-2/+2
|\ \ \ \ | | | | | | | | | | Remove block argument from callback example. [ci skip]
| * | | | Remove block argument from callback example.Carlos Souza2013-07-131-2/+2
| | |/ / | |/| | | | | | | | | | [ci skip]
* | | | Merge pull request #11420 from simi/remove_update_application_controller_taskYves Senn2013-07-132-12/+6
|\ \ \ \ | |_|/ / |/| | | Remove update:application_controller rake task.
| * | | Remove update:application_controller rake task.Josef Šimánek2013-07-132-12/+6
|/ / /
* | | Merge pull request #11417 from arunagw/gem_source_index_no_requiredYves Senn2013-07-131-1/+0
|\ \ \ | | | | | | | | Removing Gem.source_index [ci skip]
| * | | Removing Gem.source_index [ci skip]Arun Agrawal2013-07-131-1/+0
| |/ /
* | | Merge pull request #11414 from ankit8898/typoYves Senn2013-07-131-1/+1
|\ \ \ | |/ / |/| | Typo fix [skip ci]
| * | Typo fix [skip ci]Ankit Gupta2013-07-121-1/+1
|/ /
* | add test-case to verify `error.path` when a helper was not found.Yves Senn2013-07-121-0/+5
| | | | | | | | | | This verifies the code added with: https://github.com/rails/rails/commit/99c9d18601539c7e7e87f26bb047add1f93072af
* | move `MissingHelperError` out of the `ClassMethods` module.Yves Senn2013-07-123-16/+23
| |
* | Merge pull request #11401 from dpdawson/masterYves Senn2013-07-121-2/+2
|\ \ | | | | | | Improved Active View Overview guide. [ci skip]
| * | Improve Active View Overview guide. [ci skip]Daniel Dawson2013-07-121-2/+2
| | |
* | | Documment config.log_formatter added on 51aeae91Rafael Mendonça França2013-07-111-0/+2
|/ / | | | | | | [ci skip]
* | Merge pull request #11400 from dpdawson/masterYves Senn2013-07-111-1/+1
|\ \ | | | | | | Fix a grammatical error/typo in Active Record Associations guide. [ci skip]
| * | Fix a grammatical error/typo in Active Record Associations guide.Daniel Dawson2013-07-111-1/+1
|/ /
* | Add missing requireAkira Matsuda2013-07-111-0/+1
| |
* | Only raise DelegationError if it's is the source of the exceptionAndrew White2013-07-113-10/+44
| | | | | | | | | | | | | | | | | | This fixes situations where nested NoMethodError exceptions are masked by delegations. This would cause confusion especially where there was a problem in the Rails booting process because of a delegation in the routes reloading code. Fixes #10559
* | Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompileJosé Valim2013-07-104-19/+26
|\ \ | | | | | | #11381: Ignore config.eager_load=true for rake
| * | #11381: Ignore config.eager_load=true for rakePaul Nikitochkin2013-07-104-19/+26
| | | | | | | | | | | | Closes #11381
* | | Merge pull request #11394 from robin850/patch-8Steve Klabnik2013-07-101-0/+17
|\ \ \ | | | | | | | | Add documentation for add_flash_types [ci skip]
| * | | Add documentation for add_flash_types [ci skip]Robin Dupret2013-07-101-0/+17
| | | | | | | | | | | | | | | | | | | | Document a little bit the ActionController::Flash::add_flash_types class method.
* | | | Add missing require so that DateTime has the right superclassAndrew White2013-07-101-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | If the DateTime core extensions were loaded before the Date core extensions then you would get a superclass mismatch as DateTime hasn't been defined yet so it gets set to Object by the acts_like core extension. Fixes #11206
* | | Add failing test for #9562Andrew White2013-07-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Rails 4.0.0 fails when trying to encode an ActiveSupport::TimeWithZone that wraps a DateTime instance. This is fixed on master so add a test to prevent regression. (cherry picked from commit ad01b8da354268cebfae1519c28d19d75576ccb1)
* | | Better not mutate the given options HashAkira Matsuda2013-07-101-3/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:03:07 +0000