aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-013-23/+29
|\
| * prefix TemplateAssertions ivars (#7459)Yves Senn2012-10-013-23/+29
* | New CHANGELOG entries always in the topRafael Mendonça França2012-10-011-2/+2
|/
* Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-013-2/+27
|\
| * resource and resources do no longer modify passed optionsYves Senn2012-10-013-2/+27
|/
* Merge pull request #7813 from arunagw/warning_fixed_asRafael Mendonça França2012-10-011-1/+1
|\
| * warning fixed: (...) interpreted as grouped expressionArun Agrawal2012-10-011-1/+1
|/
* Merge pull request #7812 from bdurand/optimize_cache_entry_take_2Jeremy Kemper2012-09-302-3/+3
|\
| * fix broken cache testsBrian Durand2012-09-302-3/+3
|/
* Merge pull request #7811 from iHiD/resource_generator_routes_masterSantiago Pastorino2012-09-301-1/+1
|\
| * Fix broken scaffold routes testJeremy Walker2012-10-011-1/+1
|/
* Merge pull request #7810 from steveklabnik/fix_buildJeremy Kemper2012-09-301-0/+1
|\
| * fix cache store testSteve Klabnik2012-09-301-0/+1
|/
* Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-09-302-6/+115
|\
| * Fixed generated whitespace in routes when using namespaced resource.Jeremy Walker2012-09-292-6/+115
* | Add a changelog entry for asset aliasing update in sprockets-rails. Supports ...Jeremy Kemper2012-09-301-0/+14
* | Merge pull request #7808 from steveklabnik/fix_assertion_orderXavier Noria2012-09-301-5/+5
|\ \
| * | Fix other assertions that were backwards.Steve Klabnik2012-09-301-5/+5
|/ /
* | Merge pull request #7805 from steveklabnik/fix_assertion_orderXavier Noria2012-09-301-2/+2
|\ \
| * | fix order of assertions.Steve Klabnik2012-09-301-2/+2
|/ /
* | Merge pull request #7800 from bdurand/optimize_cache_entry_take_2Xavier Noria2012-09-304-101/+141
|\ \
| * | Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead.Brian Durand2012-09-304-101/+141
|/ /
* | Merge pull request #7795 from guilleiguaran/fix-ap-changelogVijay Dev2012-09-301-3/+2
|\ \
| * | Fix changelog entry about sprockets-railsGuillermo Iguaran2012-09-301-3/+2
|/ /
* | Merge pull request #7791 from acapilleri/build_associationRafael Mendonça França2012-09-291-5/+3
|\ \
| * | small refactoring of build_relation in uniquenessAngelo Capilleri2012-09-291-5/+3
* | | Whitespaces :scissors: [ci skip]Rafael Mendonça França2012-09-302-11/+14
* | | Merge pull request #7659 from HugoLnx/template_error_no_matches_rebasedRafael Mendonça França2012-09-294-5/+51
|\ \ \ | |/ / |/| |
| * | `assert_template` no more passing with what ever string that matches.Hugo Roque2012-09-294-5/+51
|/ /
* | Merge pull request #7784 from morgoth/proper_test_names_for_assertionsRafael Mendonça França2012-09-281-2/+2
|\ \ | |/ |/|
| * Changed test names to match proper contextWojciech Wnętrzak2012-09-281-2/+2
* | Merge pull request #7787 from sferik/update_minitestJeremy Kemper2012-09-281-1/+1
|\ \
| * | Update minitest dependency to ~> 4.0Erik Michaels-Ober2012-09-281-1/+1
|/ /
* | Merge pull request #7783 from guilleiguaran/namespace-assets-cache-storeSantiago Pastorino2012-09-283-3/+6
|\ \
| * | Assets cache shouldn't be shared between different environmentsGuillermo Iguaran2012-09-283-3/+6
* | | Merge pull request #7782 from yahonda/case_insensitive_test_for_partial_insertsRafael Mendonça França2012-09-281-1/+1
|\ \ \ | |_|/ |/| |
| * | Change query pattern case insensitiveYasuo Honda2012-09-291-1/+1
|/ /
* / Fix syntax error in the command_line guide [ci skip]Rafael Mendonça França2012-09-281-2/+2
|/
* Fix syntax error with no US-ASCII charRafael Mendonça França2012-09-281-1/+1
* revise commandline guide [ci skip]Vijay Dev2012-09-281-12/+6
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-2836-373/+365
|\
| * copy editing [ci skip]Vijay Dev2012-09-281-1/+1
| * Revert "add documentation to generated routes"Vijay Dev2012-09-282-4/+2
| * Improve documentation for subscribe blockGrant Hutchins & Sabrina Staedt2012-09-271-1/+11
| * Add #update_columns entry in Rails 4.0 release notes [ci skip]Sebastian Martinez2012-09-271-0/+8
| * bleakhouse is no longer useful for rails and outdated.Teng Siong Ong2012-09-271-55/+1
| * typo fix: remove duplicate periodcczona2012-09-271-1/+1
| * Remove readonly notice.Steve Klabnik2012-09-261-2/+0
| * update image_tag output in examples to actualNihad Abbasov2012-09-251-4/+4
| * Update guides/source/routing.mdBryan Larsen2012-09-251-0/+12