aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Fix spacingDavid Heinemeier Hansson2012-08-291-8/+8
* | | | Fix spacingDavid Heinemeier Hansson2012-08-291-5/+4
* | | | Merge pull request #7230 from schneems/schneems/expose_required_keysAndrew White2012-08-296-30/+41
|\ \ \ \
| * | | | refactor route_set `generate_extras` functionalityschneems2012-08-281-17/+9
| * | | | Add Missing Keys from Journey on failed URL formatschneems2012-08-286-16/+35
* | | | | fixes a regexpXavier Noria2012-08-291-1/+1
| |/ / / |/| | |
* | | | Merge pull request #7476 from ayrton/fixed_indentationXavier Noria2012-08-291-3/+3
|\ \ \ \
| * | | | Fixed indendationAyrton De Craene2012-08-291-3/+3
|/ / / /
* | | | Add a test to make sure preloading properly merges association and default sc...Pratik Naik2012-08-283-0/+23
* | | | CHANGELOGs are now per branchXavier Noria2012-08-286-17846/+6
* | | | detect circular constant autoloadingXavier Noria2012-08-284-4/+27
* | | | Merge pull request #7470 from kennyj/fix_method_redefined_warningRafael Mendonça França2012-08-282-0/+6
|\ \ \ \
| * | | | Fix method redefined warnings.kennyj2012-08-292-0/+6
|/ / / /
* | | | Merge pull request #7469 from kennyj/fix_many_warnings_in_amJosé Valim2012-08-281-1/+1
|\ \ \ \
| * | | | Fixes warnings when executing rake test in ActionMailer. Related to 582a7f459...kennyj2012-08-291-1/+1
|/ / / /
* | | | Merge pull request #7468 from kennyj/tiny_fixingsJosé Valim2012-08-285-7/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused require.kennyj2012-08-292-3/+0
| * | | Fixes wrong test class names.kennyj2012-08-294-4/+4
|/ / /
* | | fixes a bug in dependencies.rbXavier Noria2012-08-281-1/+1
* | | Merge pull request #7466 from arunagw/warning_removed_apRafael Mendonça França2012-08-281-1/+1
|\ \ \
| * | | removed : warning: `*' interpreted as argument prefixArun Agrawal2012-08-281-1/+1
|/ / /
* | | Add missing requireRafael Mendonça França2012-08-281-0/+1
* | | Merge pull request #7452 from arunagw/memcached_dalliRafael Mendonça França2012-08-282-7/+7
|\ \ \
| * | | More fixes for action pack tests with Dalli.Arun Agrawal2012-08-271-3/+3
| * | | Let's run action pack tests with DalliArun Agrawal2012-08-271-4/+4
* | | | Merge pull request #7465 from wpp/generator_controller_pluralJosé Valim2012-08-281-6/+6
|\ \ \ \
| * | | | Change generators controller help from singular to plural example.Philipp Weissensteiner2012-08-281-6/+6
|/ / / /
* | | | Merge pull request #7458 from frodsan/fix_orddep_basicsRafael Mendonça França2012-08-281-5/+5
|\ \ \ \
| * | | | fix order dependent test in AR::BasicsTestFrancesco Rodriguez2012-08-271-5/+5
* | | | | Merge branch 'actionview-decoupling'Piotr Sarnacki2012-08-2849-232/+487
|\ \ \ \ \
| * | | | | Update AP's CHANGELOG with user facing changesPiotr Sarnacki2012-08-281-0/+14
| * | | | | Deprecate AV::RecordIdentifier in controllersPiotr Sarnacki2012-08-283-4/+57
| * | | | | Fix ActionView::RecordIdentifier to work as a singletonPiotr Sarnacki2012-08-282-0/+10
| * | | | | No need to use included hook for includePiotr Sarnacki2012-08-281-3/+1
| * | | | | Deprecate Template#mime_typePiotr Sarnacki2012-08-282-0/+13
| * | | | | Add deprecation horizon to html-scannerPiotr Sarnacki2012-08-281-1/+2
| * | | | | Implement ActionView::Template::TypesPiotr Sarnacki2012-08-285-4/+65
| * | | | | Don't require action_dispatch in ActionView::UrlHelpersPiotr Sarnacki2012-08-288-100/+134
| * | | | | Use ActionView::Base.logger instead of AC::Base.loggerPiotr Sarnacki2012-08-282-2/+2
| * | | | | Add ActionView::Base.default_formatsPiotr Sarnacki2012-08-284-1/+19
| * | | | | Remove Mime::Type translations from Action ViewPiotr Sarnacki2012-08-284-11/+10
| * | | | | Deprecate mime types lookup in auto_discovery_link_tagPiotr Sarnacki2012-08-282-1/+18
| * | | | | Remove comment about getting rid of old AV::Base.new behaviorPiotr Sarnacki2012-08-281-2/+0
| * | | | | Remove stubs from LogSubscriber testsPiotr Sarnacki2012-08-281-3/+4
| * | | | | Move action_controller/vendor/html-scanner to action_viewPiotr Sarnacki2012-08-2816-27/+32
| * | | | | Deprecate ActionController::RecordIdentifierPiotr Sarnacki2012-08-282-0/+12
| * | | | | Add ActionView::ModelNamingPiotr Sarnacki2012-08-283-4/+16
| * | | | | Move ActionController::RecordIdentifier to ActionViewPiotr Sarnacki2012-08-287-11/+6
| * | | | | Remove dependency on actionpack in ActionView::AssetPathsPiotr Sarnacki2012-08-284-6/+20
|/ / / / /
* | | | | Merge pull request #7460 from frodsan/fix_nested_attributes_testRafael Mendonça França2012-08-271-7/+9
|\ \ \ \ \ | |/ / / / |/| | | |