Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Unneeded assertion | Akira Matsuda | 2013-07-29 | 1 | -1/+1 |
| | |||||
* | Don't rewrite AR connection#commit_db_transaction method globally | Akira Matsuda | 2013-07-29 | 1 | -4/+4 |
| | |||||
* | Merge pull request #11640 from pawel2105/manifest_fix | David Heinemeier Hansson | 2013-07-28 | 3 | -6/+14 |
|\ | | | | | Changed stylesheet load order in the stylesheet manifest generator. | ||||
| * | Changed stylesheet load order in the stylesheet manifest generator. | Pawel Janiak | 2013-07-28 | 3 | -6/+14 |
| | | |||||
* | | Merge pull request #11641 from ankit8898/test_cleanup | Rafael Mendonça França | 2013-07-28 | 2 | -2/+2 |
|\ \ | | | | | | | Cleanup of class_name | ||||
| * | | Cleanup of class_name | Ankit Gupta | 2013-07-28 | 2 | -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ça | 2013-07-28 | 1 | -0/+4 |
|\ \ | | | | | | | | | | | | | neerajdotname/fix_order_dependent_test_for_migration fix order dependent test related to migration | ||||
| * | | fix order dependent test related to migration | Neeraj Singh | 2013-07-28 | 1 | -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ça | 2013-07-28 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | neerajdotname/make_test_order_independent_by_resetting_timezone make test order independent by resetting timezone | ||||
| * | | | make test order independent by resetting timezone | Neeraj Singh | 2013-07-28 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #11637 from neerajdotname/make_test_not_depend_on_order | Rafael Mendonça França | 2013-07-28 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | reset default timezone and make test order independent | ||||
| * | | | reset default timezone and make test order independent | Neeraj Singh | 2013-07-28 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #11638 from ↵ | Rafael Mendonça França | 2013-07-28 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | neerajdotname/make_order_independent_association_test make test not depend on order | ||||
| * | | | make test not depend on order | Neeraj Singh | 2013-07-28 | 1 | -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/docrails | Vijay Dev | 2013-07-28 | 5 | -55/+44 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Typo fix | Mikhail Dieterle | 2013-07-28 | 1 | -1/+1 |
| | | | |||||
| * | | Using markdown-style code quotes | Mikhail Dieterle | 2013-07-28 | 1 | -2/+2 |
| | | | |||||
| * | | Fix lixml2 to libxml2 [ci skip] | Robin Dupret | 2013-07-28 | 1 | -1/+1 |
| | | | |||||
| * | | Fixes typo in Object#try! | Jay Hayes | 2013-07-26 | 1 | -1/+1 |
| | | | |||||
| * | | Use hyphenated version of assert_url [ci skip] | Robin Dupret | 2013-07-26 | 1 | -1/+1 |
| | | | |||||
| * | | Add a SQL example for `not` [ci skip] | Robin Dupret | 2013-07-26 | 1 | -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 diff | Damien Mathieu | 2013-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | sorry @robin850. Thanks @fxn | ||||
| * | | Revert "Fix the SQLite gem name" | Damien Mathieu | 2013-07-26 | 1 | -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 Dupret | 2013-07-24 | 1 | -0/+20 |
| | | | | | | | | | | | | Add the packages required on Arch Linux when setting up the development dependencies | ||||
| * | | Fix the SQLite gem name | Robin Dupret | 2013-07-24 | 1 | -1/+1 |
| | | | |||||
| * | | Removed doc of removed method diff [ci skip] | Rashmi Yadav | 2013-07-24 | 1 | -38/+0 |
| | | | |||||
| * | | Updated guides with latest method [ci skip] | Rashmi Yadav | 2013-07-24 | 1 | -2/+2 |
| | | | |||||
| * | | fixed file name references [ci skip] | Rashmi Yadav | 2013-07-24 | 1 | -4/+4 |
| | | | |||||
| * | | Updated guides with latest method [ci skip] | Rashmi Yadav | 2013-07-23 | 1 | -4/+5 |
| | | | | | | | | | for blank? | ||||
* | | | Merge pull request #11633 from neerajdotname/fix_rder_dependent_test | Guillermo Iguaran | 2013-07-28 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | fix order dependent test | ||||
| * | | | fix order dependent test | Neeraj Singh | 2013-07-28 | 1 | -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-grouping | Rafael Mendonça França | 2013-07-27 | 2 | -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 an | Pablo Cantero | 2013-07-27 | 3 | -5/+2 |
| | | | | | | | | | | | | array | ||||
* | | | Merge pull request #11620 from spajus/update_docs | Santiago Pastorino | 2013-07-27 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update Rails 3.2.x guide link [ci skip] | ||||
| * | | | Update Rails 3.2.x guide link [ci skip] | Tomas Varaneckas | 2013-07-27 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #11611 from arunagw/api-generation-av | Xavier Noria | 2013-07-26 | 1 | -7/+5 |
|\ \ \ | | | | | | | | | Excluding action_view/vendor in API[ci skip] | ||||
| * | | | Removed excluding vendor from API doc [ci skip] | Arun Agrawal | 2013-07-26 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | These folder not exists in system | ||||
| * | | | Excluding action_view/vendor in API [ci skip] | Arun Agrawal | 2013-07-26 | 1 | -1/+2 |
|/ / / | |||||
* | | | Refactor handling of action normalization | Max Shytikov | 2013-07-26 | 1 | -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 test | Akira Matsuda | 2013-07-26 | 1 | -3/+3 |
| | | | |||||
* | | | Fix order dependent tests | Akira Matsuda | 2013-07-26 | 1 | -2/+10 |
| | | | | | | | | | | | | Restore default ActiveSupport::XmlMini.backend after tests | ||||
* | | | Don't mutate the Base settings by merge!ing the given value | Akira Matsuda | 2013-07-26 | 2 | -1/+4 |
| | | | |||||
* | | | Reset ActionView::Base.logger instead of AC::Base.logger | Akira Matsuda | 2013-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be | ||||
* | | | Fix order dependent tests | Akira Matsuda | 2013-07-26 | 1 | -0/+4 |
| | | | | | | | | | | | | Reset ActionView::Base.logger after tests | ||||
* | | | Fix order dependent AP test | Akira Matsuda | 2013-07-26 | 1 | -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 rubygems | Aaron Patterson | 2013-07-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #11598 from Karunakar/flat_map1 | Rafael Mendonça França | 2013-07-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Used flat_map instead of map.flatten in mas_many_through_associations_test.rb | ||||
| * | | | used flat_map instead of map.flatten | Karunakar (Ruby) | 2013-07-25 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #11582 from steveklabnik/add_bin | Steve Klabnik | 2013-07-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | rake -> bin/rake | ||||
| * | | | rake -> bin/rake | Steve Klabnik | 2013-07-24 | 1 | -1/+1 |
| | | | |