aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| | | | |
* | | | | Merge pull request #11341 from arunagw/added-missing-actionview-to-installRafael Mendonça França2013-07-252-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Added description in actionview gemspec.
| * | | | | Added some description to generate actionview gem [ci skip]Arun Agrawal2013-07-172-3/+1
| | | | | |
* | | | | | :scissors: [ci skip]Carlos Antonio da Silva2013-07-251-1/+1
| | | | | |
* | | | | | Merge pull request #11591 from ankit8898/typoCarlos Antonio da Silva2013-07-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Typo fix [ci skip]
| * | | | | | Typo fixAnkit Gupta2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci] Fixing the typo which is formed a not required link. Check here http://api.rubyonrails.org/classes/ActionController/Base.html under paramters section keeping it under tt tag
* | | | | | | Merge pull request #11593 from rajcybage/fix_test_modelsCarlos Antonio da Silva2013-07-252-5/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | change function def self.table_name to self.table_name
| * | | | | | | change function def self.table_name to self.table_nameRajarshi Das2013-07-252-5/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change def self.primary_key to self.primary_key change def self.primary_key to self.primary_key
* / / / / / / More unused associations in AR test modelsAkira Matsuda2013-07-258-13/+0
|/ / / / / /
* | | | | | Clean up unused associations in AR test modelAkira Matsuda2013-07-251-3/+0
| | | | | |
* | | | | | Use Ruby 2.0 caller_locations instead of caller if availableAkira Matsuda2013-07-251-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * we no more have to manipulate the each caller strings by ourselves using caller_locations * caller_locations runs slightly faster, and creates less objects than good old caller Benchmark (loading an Engine 1000 times): caller: 262.89 ms caller_locations: 186.068 ms
* | | | | | Privatize non-test methodAkira Matsuda2013-07-251-0/+1
| | | | | |
* | | | | | Allow overriding of all headers from passed environment hashAndrew White2013-07-253-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow REMOTE_ADDR, HTTP_HOST and HTTP_USER_AGENT to be overridden from the environment passed into `ActionDispatch::TestRequest.new`. Fixes #11590
* | | | | | Merge pull request #11585 from vipulnsward/hstore_changeRafael Mendonça França2013-07-241-6/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup task for informing about hstore
| * | | | | | Cleanup task for informing about hstoreVipul A M2013-07-251-6/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #11584 from Peeja/actionmailer-guide-typoRafael Mendonça França2013-07-241-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | ActionMailer Guide: Should be "different formats".
| * | | | | AM Guide: Should be "different formats".Peter Jaros2013-07-241-1/+1
|/ / / / /
* | | | | Merge pull request #11559 from bughit/11533_to_procJosé Valim2013-07-244-3/+12
|\ \ \ \ \ | | | | | | | | | | | | don't convert mailer default values to procs
| * | | | | don't convert mailer default values to procsAlex Tsukernik2013-07-224-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invoke mailer defaults as procs only if they are procs, do not convert with to_proc. That an object is convertible to a proc does not mean it's meant to be always used as a proc. Fixes #11533
* | | | | | Merge pull request #11579 from kennyj/refactor_20130724Rafael Mendonça França2013-07-241-10/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Simplify select_one method.
| * | | | | | Fix indentation.kennyj2013-07-241-8/+8
| | | | | | |
| * | | | | | Simplify select_one method.kennyj2013-07-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The select_all method always returns ActiveRecord::Result instance, and the ActiveRecord::Result includes Enumerable mixin. If #empty?, #first method returns nil. Thus we can simplify this method.
* | | | | | | Merge pull request #11570 from joelcogen/harmonize_text_field_and_areaRafael Mendonça França2013-07-244-3/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | text_area should handle nil value option like text_field
| * | | | | | text_area should handle nil value option like text_fieldJoel Cogen2013-07-244-3/+24
|/ / / / / /
* | | | | | Refactor to use flat_mapCarlos Antonio da Silva2013-07-231-3/+3
| | | | | |
* | | | | | oops!Aaron Patterson2013-07-231-1/+1
| | | | | |
* | | | | | eliminate conditional in JoinHelperAaron Patterson2013-07-232-2/+2
| | | | | |
* | | | | | acually get the actual source reflection :cry::gun:Aaron Patterson2013-07-232-9/+17
| | | | | |