Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Merge pull request #11341 from arunagw/added-missing-actionview-to-install | Rafael Mendonça França | 2013-07-25 | 2 | -3/+1 |
|\ \ | | | | | | | Added description in actionview gemspec. | ||||
| * | | Added some description to generate actionview gem [ci skip] | Arun Agrawal | 2013-07-17 | 2 | -3/+1 |
| | | | |||||
* | | | :scissors: [ci skip] | Carlos Antonio da Silva | 2013-07-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #11591 from ankit8898/typo | Carlos Antonio da Silva | 2013-07-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Typo fix [ci skip] | ||||
| * | | | Typo fix | Ankit Gupta | 2013-07-25 | 1 | -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_models | Carlos Antonio da Silva | 2013-07-25 | 2 | -5/+3 |
|\ \ \ \ | | | | | | | | | | | change function def self.table_name to self.table_name | ||||
| * | | | | change function def self.table_name to self.table_name | Rajarshi Das | 2013-07-25 | 2 | -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 models | Akira Matsuda | 2013-07-25 | 8 | -13/+0 |
|/ / / | |||||
* | | | Clean up unused associations in AR test model | Akira Matsuda | 2013-07-25 | 1 | -3/+0 |
| | | | |||||
* | | | Use Ruby 2.0 caller_locations instead of caller if available | Akira Matsuda | 2013-07-25 | 1 | -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 method | Akira Matsuda | 2013-07-25 | 1 | -0/+1 |
| | | | |||||
* | | | Allow overriding of all headers from passed environment hash | Andrew White | 2013-07-25 | 3 | -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_change | Rafael Mendonça França | 2013-07-24 | 1 | -6/+3 |
|\ \ \ | | | | | | | | | Cleanup task for informing about hstore | ||||
| * | | | Cleanup task for informing about hstore | Vipul A M | 2013-07-25 | 1 | -6/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #11584 from Peeja/actionmailer-guide-typo | Rafael Mendonça França | 2013-07-24 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | ActionMailer Guide: Should be "different formats". | ||||
| * | | AM Guide: Should be "different formats". | Peter Jaros | 2013-07-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #11559 from bughit/11533_to_proc | José Valim | 2013-07-24 | 4 | -3/+12 |
|\ \ | | | | | | | don't convert mailer default values to procs | ||||
| * | | don't convert mailer default values to procs | Alex Tsukernik | 2013-07-22 | 4 | -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_20130724 | Rafael Mendonça França | 2013-07-24 | 1 | -10/+9 |
|\ \ \ | | | | | | | | | Simplify select_one method. | ||||
| * | | | Fix indentation. | kennyj | 2013-07-24 | 1 | -8/+8 |
| | | | | |||||
| * | | | Simplify select_one method. | kennyj | 2013-07-24 | 1 | -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_area | Rafael Mendonça França | 2013-07-24 | 4 | -3/+24 |
|\ \ \ \ | |/ / / |/| | | | text_area should handle nil value option like text_field | ||||
| * | | | text_area should handle nil value option like text_field | Joel Cogen | 2013-07-24 | 4 | -3/+24 |
|/ / / | |||||
* | | | Refactor to use flat_map | Carlos Antonio da Silva | 2013-07-23 | 1 | -3/+3 |
| | | | |||||
* | | | oops! | Aaron Patterson | 2013-07-23 | 1 | -1/+1 |
| | | | |||||
* | | | eliminate conditional in JoinHelper | Aaron Patterson | 2013-07-23 | 2 | -2/+2 |
| | | | |||||
* | | | acually get the actual source reflection :cry::gun: | Aaron Patterson | 2013-07-23 | 2 | -9/+17 |
| | | | |||||
* | | | Merge pull request #11107 from nettsundere/password-confirmation-fix | Guillermo Iguaran | 2013-07-23 | 3 | -2/+18 |
|\ \ \ | | | | | | | | | Fix secure_password password_confirmation validations | ||||
| * | | | Fix secure_password password_confirmation validations | Vladimir Kiselev | 2013-07-24 | 3 | -2/+18 |
| | | | | |||||
* | | | | stop relying on side effects of const_missing | Aaron Patterson | 2013-07-23 | 2 | -7/+13 |
|/ / / | |||||
* | | | add a specific factory method rather than using new | Aaron Patterson | 2013-07-23 | 9 | -13/+11 |
| | | | |||||
* | | | Use GeneratedAttribute#column_name if #reference? scaffold_generator in ↵ | Zachary Scott | 2013-07-23 | 2 | -0/+29 |
| | | | | | | | | | | | | _form view [Fixes #11573] | ||||
* | | | factory methods should not have side effects. | Aaron Patterson | 2013-07-23 | 3 | -8/+11 |
| | | | | | | | | | | | | Move model mutation to the methods that are called on the model. | ||||
* | | | extract mutation from generation method | Aaron Patterson | 2013-07-23 | 2 | -4/+6 |
| | | | |||||
* | | | Merge pull request #11566 from rajcybage/master | Rafael Mendonça França | 2013-07-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | add the missing middleware in command line guides rake about [ci skip] |