aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unneeded assertionAkira Matsuda2013-07-291-1/+1
|
* 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.
| * 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_name
| * | Cleanup of class_nameAnkit Gupta2013-07-282-2/+2
| |/ | | | | | | Don't think class name is needed as by default belongs_to :select will be linked to Select class.
* | Merge pull request #11634 from ↵Rafael Mendonça França2013-07-281-0/+4
|\ \ | | | | | | | | | | | | neerajdotname/fix_order_dependent_test_for_migration fix order dependent test related to migration
| * | fix order dependent test related to migrationNeeraj Singh2013-07-281-0/+4
| | | | | | | | | | | | | | | | | | If the order in which tests are executed is changed then test fails. This commit ensures that all migrations are run before ensuring that there are no pending migration.
* | | Merge pull request #11635 from ↵Rafael Mendonça França2013-07-281-0/+2
|\ \ \ | | | | | | | | | | | | | | | | neerajdotname/make_test_order_independent_by_resetting_timezone make test order independent by resetting timezone
| * | | 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 independent
| * | | reset default timezone and make test order independentNeeraj Singh2013-07-281-0/+4
| |/ /
* | | Merge pull request #11638 from ↵Rafael Mendonça França2013-07-281-0/+1
|\ \ \ | | | | | | | | | | | | | | | | neerajdotname/make_order_independent_association_test make test not depend on order
| * | | make test not depend on orderNeeraj Singh2013-07-281-0/+1
| |/ / | | | | | | | | | | | | | | | | | | `NestedThroughAssociationsTest` adds records to `member_details` table. When test performs `@member_details[0]` then the order of record is not guaranteed. Hence it is best to start with a clean slate by deleting unwanted records.
* | | 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
| | | | | | | | | | | | To share a certain logic across other examples, let's add a sample SQL code generated by the given Ruby code
| * | Refix my misreading of the diffDamien Mathieu2013-07-261-1/+1
| | | | | | | | | | | | sorry @robin850. Thanks @fxn
| * | Revert "Fix the SQLite gem name"Damien Mathieu2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 700c6c65bcce17d4c61423ceaef031bcbe203337. Bot the `sqlite3` and `sqlite3-ruby` gems exist. https://rubygems.org/gems/sqlite3 https://rubygems.org/gems/sqlite3-ruby In fact, they both point to the same github repository. https://github.com/luislavena/sqlite3-ruby However, the last one hasn't been released since 2011, while the first one keeps getting regular releases.
| * | Add packages list for ArchLinux [ci skip]Robin Dupret2013-07-241-0/+20
| | | | | | | | | | | | Add the packages required on Arch Linux when setting up the development dependencies
| * | 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
| | | | | | | | | for blank?
* | | Merge pull request #11633 from neerajdotname/fix_rder_dependent_testGuillermo Iguaran2013-07-281-0/+5
|\ \ \ | | | | | | | | fix order dependent test
| * | | fix order dependent testNeeraj Singh2013-07-281-0/+5
| | |/ | |/| | | | | | | | | | `ReflectionTest` uses column information in tests and those tests break if tests are run in random order.
* | | 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 an array
| * | Minor refactor - Uses Enumerable#to_a instead of iterate and add to anPablo Cantero2013-07-273-5/+2
| | | | | | | | | | | | array
* | | Merge pull request #11620 from spajus/update_docsSantiago Pastorino2013-07-271-1/+1
|\ \ \ | | | | | | | | Update Rails 3.2.x guide link [ci skip]
| * | | 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
|\ \ \ | | | | | | | | Excluding action_view/vendor in API[ci skip]
| * | | Removed excluding vendor from API doc [ci skip]Arun Agrawal2013-07-261-6/+3
| | | | | | | | | | | | | | | | These folder not exists in system
| * | | Excluding action_view/vendor in API [ci skip]Arun Agrawal2013-07-261-1/+2
|/ / /
* | | Refactor handling of action normalizationMax Shytikov2013-07-261-11/+13
| | | | | | | | | | | | | | | | | | Reference: Bloody mess internals http://gusiev.com/slides/rails_contribution/static/#40
* | | 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
| | | | | | | | | | | | Restore default ActiveSupport::XmlMini.backend after tests
* | | 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
| | | | | | | | | | | | see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be
* | | Fix order dependent testsAkira Matsuda2013-07-261-0/+4
| | | | | | | | | | | | Reset ActionView::Base.logger after tests
* | | Fix order dependent AP testAkira Matsuda2013-07-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any_instance.stubs + unstub with Mocha doesn't restore the original status in the following case, so we need to undef Customer#to_json before every test require 'test/unit' require 'mocha/setup' module M def foo() :foo; end end class C include M undef_method :foo end C.any_instance.stubs(:foo).returns(:mocha) C.any_instance.unstub(:foo)
* | | 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.flatten in mas_many_through_associations_test.rb
| * | | 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/rake
| * | | rake -> bin/rakeSteve Klabnik2013-07-241-1/+1
| | | |