Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #11282 from arunagw/deprecation-removed-attribute-missing-... | Yves Senn | 2013-07-15 | 3 | -29/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove deprecation warning from attribute_missing | Arun Agrawal | 2013-07-15 | 3 | -29/+4 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #11448 from arunagw/updated_middleware_test | Yves Senn | 2013-07-15 | 1 | -1/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Added CheckPending middleware in default | Arun Agrawal | 2013-07-15 | 1 | -0/+4 | |
| * | | | | | No need to add config for x_sendfile_header | Arun Agrawal | 2013-07-15 | 1 | -2/+0 | |
|/ / / / / | ||||||
* | | | | | Rack::Sendfile is now included in middleware by default, change tests to refl... | Guillermo Iguaran | 2013-07-15 | 1 | -10/+4 | |
* | | | | | Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present" | Santiago Pastorino | 2013-07-15 | 1 | -3/+1 | |
* | | | | | Merge pull request #11434 from jetthoughts/new_save_transaction_bugfix | Santiago Pastorino | 2013-07-14 | 3 | -3/+23 | |
|\ \ \ \ \ | ||||||
| * | | | | | #4566: Remove extra decrement of transaction level | Paul Nikitochkin | 2013-07-14 | 3 | -3/+23 | |
* | | | | | | Merge pull request #11439 from ernie/only-scan-strings-for-nodes | Yves Senn | 2013-07-14 | 2 | -1/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Blacklist->whitelist for reference scans in order! | Ernie Miller | 2013-07-14 | 2 | -1/+8 | |
| |/ / / / / | ||||||
* | | | | | | re-introduce `select_for_count` private method. | Yves Senn | 2013-07-14 | 1 | -5/+10 | |
* | | | | | | Merge pull request #11437 from kennyj/fix_11393 | Guillermo Iguaran | 2013-07-14 | 3 | -1/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix default rendered format problem when calling render method without :conte... | kennyj | 2013-07-15 | 3 | -1/+11 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #11433 from arunagw/removed_unused_task | José Valim | 2013-07-14 | 1 | -13/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added actionview in API generation [ci skip] | Arun Agrawal | 2013-07-14 | 1 | -8/+7 | |
* | | | | | | Merge pull request #11431 from ianfleeton/initialization_memoized_typo | Yves Senn | 2013-07-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | memorized -> memoized typo fix [ci skip] | Ian Fleeton | 2013-07-14 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #11424 from kennyj/fix_column_defaults_caching | Santiago Pastorino | 2013-07-13 | 3 | -0/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [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. | wangjohn | 2013-07-13 | 1 | -0/+86 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #11427 from jmondo/patch-1 | Santiago Pastorino | 2013-07-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | it's xml, not json | John Gesimondo | 2013-07-13 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #11422 from arunagw/added_missing_actionview | Guillermo Iguaran | 2013-07-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | 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 | Arun Agrawal | 2013-07-13 | 1 | -91/+0 | |
* | | | | | | Merge pull request #11413 from envylabs/master | Yves Senn | 2013-07-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove block argument from callback example. | Carlos Souza | 2013-07-13 | 1 | -2/+2 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | 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. | 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] | 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] | 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 | |
* | | | | 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 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
|/ / / / | ||||||
* | | | | 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. | Daniel Dawson | 2013-07-11 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Add missing require | Akira Matsuda | 2013-07-11 | 1 | -0/+1 |