Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Blacklist->whitelist for reference scans in order! | Ernie Miller | 2013-07-14 | 2 | -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. | ||||
* | Merge pull request #11433 from arunagw/removed_unused_task | José Valim | 2013-07-14 | 1 | -13/+0 |
|\ | | | | | railties Rakefile tweaks | ||||
| * | Removed unused require from Rakefile | Arun Agrawal | 2013-07-14 | 1 | -4/+0 |
| | | |||||
| * | Removed unused broken task for update README [ci skip] | Arun Agrawal | 2013-07-14 | 1 | -9/+0 |
|/ | |||||
* | Merge pull request #11425 from arunagw/actionview_api_generation | Xavier Noria | 2013-07-14 | 1 | -8/+7 |
|\ | | | | | Actionview api generation | ||||
| * | Added actionview in API generation [ci skip] | Arun Agrawal | 2013-07-14 | 1 | -8/+7 |
| | | | | | | CHANGELOG and LICENSE removed as suggested | ||||
* | | Merge pull request #11431 from ianfleeton/initialization_memoized_typo | Yves Senn | 2013-07-14 | 1 | -1/+1 |
|\ \ | | | | | | | memorized -> memoized typo fix [ci skip] | ||||
| * | | memorized -> memoized typo fix [ci skip] | Ian Fleeton | 2013-07-14 | 1 | -1/+1 |
|/ / | | | | | | | Reverts one line from 457b7ff9 | ||||
* | | Merge pull request #11424 from kennyj/fix_column_defaults_caching | Santiago Pastorino | 2013-07-13 | 3 | -0/+15 |
|\ \ | | | | | | | Reset @column_defaults when assigning locking_column. | ||||
| * | | Reset @column_defaults when assigning . | kennyj | 2013-07-14 | 3 | -0/+15 |
| | | | |||||
* | | | This is not needed anymore, before_initialize block can access config | Santiago Pastorino | 2013-07-14 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #11428 from evangoer/minor_asset_pipeline_docfix | Guillermo Iguaran | 2013-07-13 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Update YUI Compressor link; tweak UglifyJS | ||||
| * | | | [ci-skip] Update link, tweak UglifyJS | Evan Goer | 2013-07-13 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #11426 from wangjohn/action_controller_live_docs | Santiago Pastorino | 2013-07-13 | 1 | -0/+86 |
|\ \ \ | | | | | | | | | ActionController::Live documentation in the guides. | ||||
| * | | | ActionController::Live documentation in the guides. | wangjohn | 2013-07-13 | 1 | -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-1 | Santiago Pastorino | 2013-07-13 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | it's xml, not json | ||||
| * | | it's xml, not json | John Gesimondo | 2013-07-13 | 1 | -1/+1 |
|/ / | | | | | change docs for xml serializer to talk about xml | ||||
* | | Merge pull request #11422 from arunagw/added_missing_actionview | Guillermo Iguaran | 2013-07-13 | 1 | -1/+1 |
|\ \ | |/ |/| | Added missing actionview in list for release | ||||
| * | Added missing actionview in list for release | Arun Agrawal | 2013-07-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #11421 from arunagw/actionpack_activerecord_remove | Guillermo Iguaran | 2013-07-13 | 1 | -91/+0 |
|\ | | | | | Removed unused file! Moved to actionview | ||||
| * | Removed unused file! Moved to actionview | Arun Agrawal | 2013-07-13 | 1 | -91/+0 |
| | | | | | | | | Removed unused file as this has been moved to actionview | ||||
* | | Merge pull request #11413 from envylabs/master | Yves Senn | 2013-07-13 | 1 | -2/+2 |
|\ \ | | | | | | | Remove block argument from callback example. [ci skip] | ||||
| * | | Remove block argument from callback example. | Carlos Souza | 2013-07-13 | 1 | -2/+2 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #11420 from simi/remove_update_application_controller_task | Yves Senn | 2013-07-13 | 2 | -12/+6 |
|\ \ \ | |_|/ |/| | | Remove update:application_controller rake task. | ||||
| * | | Remove update:application_controller rake task. | Josef Šimánek | 2013-07-13 | 2 | -12/+6 |
|/ / | |||||
* | | Merge pull request #11417 from arunagw/gem_source_index_no_required | Yves Senn | 2013-07-13 | 1 | -1/+0 |
|\ \ | | | | | | | Removing Gem.source_index [ci skip] | ||||
| * | | Removing Gem.source_index [ci skip] | Arun Agrawal | 2013-07-13 | 1 | -1/+0 |
| |/ | |||||
* | | Merge pull request #11414 from ankit8898/typo | Yves Senn | 2013-07-13 | 1 | -1/+1 |
|\ \ | |/ |/| | Typo fix [skip ci] | ||||
| * | Typo fix [skip ci] | Ankit Gupta | 2013-07-12 | 1 | -1/+1 |
|/ | |||||
* | add test-case to verify `error.path` when a helper was not found. | Yves Senn | 2013-07-12 | 1 | -0/+5 |
| | | | | | This verifies the code added with: https://github.com/rails/rails/commit/99c9d18601539c7e7e87f26bb047add1f93072af | ||||
* | move `MissingHelperError` out of the `ClassMethods` module. | Yves Senn | 2013-07-12 | 3 | -16/+23 |
| | |||||
* | Merge pull request #11401 from dpdawson/master | Yves Senn | 2013-07-12 | 1 | -2/+2 |
|\ | | | | | Improved Active View Overview guide. [ci skip] | ||||
| * | Improve Active View Overview guide. [ci skip] | Daniel Dawson | 2013-07-12 | 1 | -2/+2 |
| | | |||||
* | | Documment config.log_formatter added on 51aeae91 | Rafael Mendonça França | 2013-07-11 | 1 | -0/+2 |
|/ | | | | [ci skip] | ||||
* | Merge pull request #11400 from dpdawson/master | Yves Senn | 2013-07-11 | 1 | -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 Dawson | 2013-07-11 | 1 | -1/+1 |
|/ | |||||
* | Add missing require | Akira Matsuda | 2013-07-11 | 1 | -0/+1 |
| | |||||
* | Only raise DelegationError if it's is the source of the exception | Andrew White | 2013-07-11 | 3 | -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_precompile | José Valim | 2013-07-10 | 4 | -19/+26 |
|\ | | | | | #11381: Ignore config.eager_load=true for rake | ||||
| * | #11381: Ignore config.eager_load=true for rake | Paul Nikitochkin | 2013-07-10 | 4 | -19/+26 |
| | | | | | | | | Closes #11381 | ||||
* | | Merge pull request #11394 from robin850/patch-8 | Steve Klabnik | 2013-07-10 | 1 | -0/+17 |
|\ \ | | | | | | | Add documentation for add_flash_types [ci skip] | ||||
| * | | Add documentation for add_flash_types [ci skip] | Robin Dupret | 2013-07-10 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | Document a little bit the ActionController::Flash::add_flash_types class method. | ||||
* | | | Add missing require so that DateTime has the right superclass | Andrew White | 2013-07-10 | 1 | -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 #9562 | Andrew White | 2013-07-10 | 1 | -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 Hash | Akira Matsuda | 2013-07-10 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #11391 from schuetzm/remove-swp-file | Rafael Mendonça França | 2013-07-10 | 1 | -0/+0 |
|\ \ | | | | | | | Remove accidentally committed vi .swp file. | ||||
| * | | Remove accidentally committed vi .swp file. | Marc Schütz | 2013-07-10 | 1 | -0/+0 |
|/ / | |||||
* | | Simplify Array#in_groups_of code | Akira Matsuda | 2013-07-10 | 1 | -3/+1 |
| | | |||||
* | | Speed up Array#split | Akira Matsuda | 2013-07-10 | 1 | -6/+20 |
| | | | | | | | | | | | | | | Benchmark: user system total real old 0.510000 0.000000 0.510000 ( 0.506749) new 0.330000 0.000000 0.330000 ( 0.336187) | ||||
* | | Speed up String#truncate | Akira Matsuda | 2013-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Benchmark: user system total real old 1.550000 0.040000 1.590000 ( 1.585866) new 1.250000 0.040000 1.290000 ( 1.287693) |