aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't rewrite AR connection#commit_db_transaction method globallyAkira Matsuda2013-07-291-4/+4
* Merge pull request #11640 from pawel2105/manifest_fixDavid Heinemeier Hansson2013-07-283-6/+14
|\
| * Changed stylesheet load order in the stylesheet manifest generator.Pawel Janiak2013-07-283-6/+14
* | Merge pull request #11641 from ankit8898/test_cleanupRafael Mendonça França2013-07-282-2/+2
|\ \
| * | Cleanup of class_nameAnkit Gupta2013-07-282-2/+2
| |/
* | Merge pull request #11634 from neerajdotname/fix_order_dependent_test_for_mig...Rafael Mendonça França2013-07-281-0/+4
|\ \
| * | fix order dependent test related to migrationNeeraj Singh2013-07-281-0/+4
* | | Merge pull request #11635 from neerajdotname/make_test_order_independent_by_r...Rafael Mendonça França2013-07-281-0/+2
|\ \ \
| * | | make test order independent by resetting timezoneNeeraj Singh2013-07-281-0/+2
| |/ /
* | | Merge pull request #11637 from neerajdotname/make_test_not_depend_on_orderRafael Mendonça França2013-07-281-0/+4
|\ \ \
| * | | reset default timezone and make test order independentNeeraj Singh2013-07-281-0/+4
| |/ /
* | | Merge pull request #11638 from neerajdotname/make_order_independent_associati...Rafael Mendonça França2013-07-281-0/+1
|\ \ \
| * | | make test not depend on orderNeeraj Singh2013-07-281-0/+1
| |/ /
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-285-55/+44
|\ \ \ | |_|/ |/| |
| * | Typo fixMikhail Dieterle2013-07-281-1/+1
| * | Using markdown-style code quotesMikhail Dieterle2013-07-281-2/+2
| * | Fix lixml2 to libxml2 [ci skip]Robin Dupret2013-07-281-1/+1
| * | Fixes typo in Object#try!Jay Hayes2013-07-261-1/+1
| * | Use hyphenated version of assert_url [ci skip]Robin Dupret2013-07-261-1/+1
| * | Add a SQL example for `not` [ci skip]Robin Dupret2013-07-261-1/+7
| * | Refix my misreading of the diffDamien Mathieu2013-07-261-1/+1
| * | Revert "Fix the SQLite gem name"Damien Mathieu2013-07-261-1/+1
| * | Add packages list for ArchLinux [ci skip]Robin Dupret2013-07-241-0/+20
| * | Fix the SQLite gem nameRobin Dupret2013-07-241-1/+1
| * | Removed doc of removed method diff [ci skip]Rashmi Yadav2013-07-241-38/+0
| * | Updated guides with latest method [ci skip]Rashmi Yadav2013-07-241-2/+2
| * | fixed file name references [ci skip]Rashmi Yadav2013-07-241-4/+4
| * | Updated guides with latest method [ci skip]Rashmi Yadav2013-07-231-4/+5
* | | Merge pull request #11633 from neerajdotname/fix_rder_dependent_testGuillermo Iguaran2013-07-281-0/+5
|\ \ \
| * | | fix order dependent testNeeraj Singh2013-07-281-0/+5
| | |/ | |/|
* | | Merge pull request #11625 from phstc/minor-refactor-code-gardener-groupingRafael Mendonça França2013-07-272-2/+1
|\ \ \ | |/ / |/| |
| * | Minor refactor - Uses Enumerable#to_a instead of iterate and add to anPablo Cantero2013-07-273-5/+2
* | | Merge pull request #11620 from spajus/update_docsSantiago Pastorino2013-07-271-1/+1
|\ \ \
| * | | Update Rails 3.2.x guide link [ci skip]Tomas Varaneckas2013-07-271-1/+1
|/ / /
* | | Merge pull request #11611 from arunagw/api-generation-avXavier Noria2013-07-261-7/+5
|\ \ \
| * | | Removed excluding vendor from API doc [ci skip]Arun Agrawal2013-07-261-6/+3
| * | | Excluding action_view/vendor in API [ci skip]Arun Agrawal2013-07-261-1/+2
|/ / /
* | | Refactor handling of action normalizationMax Shytikov2013-07-261-11/+13
* | | Be sure to restore the default I18n.locale after changed its value in a testAkira Matsuda2013-07-261-3/+3
* | | Fix order dependent testsAkira Matsuda2013-07-261-2/+10
* | | Don't mutate the Base settings by merge!ing the given valueAkira Matsuda2013-07-262-1/+4
* | | Reset ActionView::Base.logger instead of AC::Base.loggerAkira Matsuda2013-07-261-1/+1
* | | Fix order dependent testsAkira Matsuda2013-07-261-0/+4
* | | Fix order dependent AP testAkira Matsuda2013-07-261-0/+1
* | | grab executable from rubygemsAaron Patterson2013-07-251-1/+1
* | | Merge pull request #11598 from Karunakar/flat_map1Rafael Mendonça França2013-07-251-1/+1
|\ \ \
| * | | used flat_map instead of map.flattenKarunakar (Ruby)2013-07-251-1/+1
|/ / /
* | | Merge pull request #11582 from steveklabnik/add_binSteve Klabnik2013-07-251-1/+1
|\ \ \
| * | | rake -> bin/rakeSteve Klabnik2013-07-241-1/+1
* | | | Merge pull request #11341 from arunagw/added-missing-actionview-to-installRafael Mendonça França2013-07-252-3/+1
|\ \ \ \