aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* save another array allocationAaron Patterson2013-07-151-1/+1
* removing useless assingmentAaron Patterson2013-07-151-1/+1
* reorder bind parameters when merging relationsAaron Patterson2013-07-153-3/+43
* use arel rather than slapping together SQL stringsAaron Patterson2013-07-152-5/+10
* Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_asso...Yves Senn2013-07-152-0/+8
|\
| * Do not re-save destroyed association on saving parent objectPaul Nikitochkin2013-07-152-0/+8
* | Merge pull request #11282 from arunagw/deprecation-removed-attribute-missing-...Yves Senn2013-07-153-29/+4
|\ \
| * | Remove deprecation warning from attribute_missing Arun Agrawal2013-07-153-29/+4
| |/
* | Merge pull request #11448 from arunagw/updated_middleware_testYves Senn2013-07-151-1/+3
|\ \ | |/ |/|
| * Added CheckPending middleware in defaultArun Agrawal2013-07-151-0/+4
| * No need to add config for x_sendfile_headerArun Agrawal2013-07-151-2/+0
|/
* Rack::Sendfile is now included in middleware by default, change tests to refl...Guillermo Iguaran2013-07-151-10/+4
* Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"Santiago Pastorino2013-07-151-3/+1
* Merge pull request #11434 from jetthoughts/new_save_transaction_bugfixSantiago Pastorino2013-07-143-3/+23
|\
| * #4566: Remove extra decrement of transaction levelPaul Nikitochkin2013-07-143-3/+23
* | Merge pull request #11439 from ernie/only-scan-strings-for-nodesYves Senn2013-07-142-1/+8
|\ \
| * | Blacklist->whitelist for reference scans in order!Ernie Miller2013-07-142-1/+8
| |/
* | re-introduce `select_for_count` private method.Yves Senn2013-07-141-5/+10
* | Merge pull request #11437 from kennyj/fix_11393Guillermo Iguaran2013-07-143-1/+11
|\ \ | |/ |/|
| * Fix default rendered format problem when calling render method without :conte...kennyj2013-07-153-1/+11
|/
* Merge pull request #11433 from arunagw/removed_unused_taskJosé Valim2013-07-141-13/+0
|\
| * 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
|\
| * Added actionview in API generation [ci skip]Arun Agrawal2013-07-141-8/+7
* | Merge pull request #11431 from ianfleeton/initialization_memoized_typoYves Senn2013-07-141-1/+1
|\ \
| * | memorized -> memoized typo fix [ci skip]Ian Fleeton2013-07-141-1/+1
|/ /
* | Merge pull request #11424 from kennyj/fix_column_defaults_cachingSantiago Pastorino2013-07-133-0/+15
|\ \
| * | 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
|\ \ \
| * | | [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.wangjohn2013-07-131-0/+86
| |/ /
* | | Merge pull request #11427 from jmondo/patch-1Santiago Pastorino2013-07-131-1/+1
|\ \ \ | |/ / |/| |
| * | it's xml, not jsonJohn Gesimondo2013-07-131-1/+1
|/ /
* | Merge pull request #11422 from arunagw/added_missing_actionviewGuillermo Iguaran2013-07-131-1/+1
|\ \ | |/ |/|
| * 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 actionviewArun Agrawal2013-07-131-91/+0
* | Merge pull request #11413 from envylabs/masterYves Senn2013-07-131-2/+2
|\ \
| * | Remove block argument from callback example.Carlos Souza2013-07-131-2/+2
* | | Merge pull request #11420 from simi/remove_update_application_controller_taskYves Senn2013-07-132-12/+6
|\ \ \ | |_|/ |/| |
| * | 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]Arun Agrawal2013-07-131-1/+0
| |/
* | Merge pull request #11414 from ankit8898/typoYves Senn2013-07-131-1/+1
|\ \ | |/ |/|
| * 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
* move `MissingHelperError` out of the `ClassMethods` module.Yves Senn2013-07-123-16/+23