aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* Merge pull request #11401 from dpdawson/masterYves Senn2013-07-121-2/+2
|\
| * 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
|/
* Merge pull request #11400 from dpdawson/masterYves Senn2013-07-111-1/+1
|\
| * 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
* Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompileJosé Valim2013-07-104-19/+26
|\
| * #11381: Ignore config.eager_load=true for rakePaul Nikitochkin2013-07-104-19/+26
* | Merge pull request #11394 from robin850/patch-8Steve Klabnik2013-07-101-0/+17
|\ \
| * | Add documentation for add_flash_types [ci skip]Robin Dupret2013-07-101-0/+17
* | | Add missing require so that DateTime has the right superclassAndrew White2013-07-101-0/+1
|/ /
* | Add failing test for #9562Andrew White2013-07-101-0/+5
* | Better not mutate the given options HashAkira Matsuda2013-07-101-3/+3
* | Merge pull request #11391 from schuetzm/remove-swp-fileRafael Mendonça França2013-07-101-0/+0
|\ \
| * | Remove accidentally committed vi .swp file.Marc Schütz2013-07-101-0/+0
|/ /
* | Simplify Array#in_groups_of codeAkira Matsuda2013-07-101-3/+1
* | Speed up Array#splitAkira Matsuda2013-07-101-6/+20
* | Speed up String#truncateAkira Matsuda2013-07-101-1/+1
* | Merge pull request #10642 from LTe/invalid-load-errorYves Senn2013-07-105-1/+38
|\ \