Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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] | ||||
| * | | add the missing middleware in command line guides rake about [ci skip] | Rajarshi Das | 2013-07-23 | 1 | -1/+1 |
| | | | |||||
* | | | habtm can only ever be an association reflection | Aaron Patterson | 2013-07-22 | 1 | -2/+4 |
| | | | |||||
* | | | use the predicate method | Aaron Patterson | 2013-07-22 | 1 | -1/+1 |
| | | | |||||
* | | | Stop reading the same file twice for testing different content | Carlos Antonio da Silva | 2013-07-22 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | assert_file already gives this functionality for free by passing multiple contents. | ||||
* | | | AR::Base does not need to know how to create reflection objects | Aaron Patterson | 2013-07-22 | 3 | -21/+21 |
| | | | |||||
* | | | remove unnecessary reader | Aaron Patterson | 2013-07-22 | 1 | -4/+4 |
| | | | |||||
* | | | only flatten one side | Aaron Patterson | 2013-07-22 | 1 | -1/+1 |
| | | | |||||
* | | | extend by adding relationships rather than monkey patching | Aaron Patterson | 2013-07-22 | 2 | -11/+13 |
| | | | |||||
* | | | decouple extensions from association object state | Aaron Patterson | 2013-07-22 | 2 | -3/+3 |
| | | | |||||
* | | | Merge pull request #11558 from kennyj/bump_mysql2_to_0_3_13 | Guillermo Iguaran | 2013-07-22 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Uses mysql2 0.3.13 or later. | ||||
| * | | Uses mysql2 0.3.13 or later | kennyj | 2013-07-23 | 1 | -1/+1 |
|/ / | |||||
* | | Leave the knowledge of boolean tag values to content tag | Carlos Antonio da Silva | 2013-07-22 | 1 | -3/+3 |
| | | | | | | | | | | | | content tag already knows which tags are boolean and the values that should generate them when a truthy value is passed, so leave this logic for it instead of duplicating when generating options tags. | ||||
* | | Use merge! to avoid a new hash and change some spots to 1.9 hash style | Carlos Antonio da Silva | 2013-07-22 | 1 | -7/+7 |
| | | |||||
* | | Fix changelog syntax and use Ruby 1.9 hash style [ci skip] | Carlos Antonio da Silva | 2013-07-22 | 1 | -2/+1 |
| | | |||||
* | | Merge pull request #11461 from kennyj/fix_11454 | Yves Senn | 2013-07-22 | 4 | -8/+34 |
|\ \ | | | | | | | Fixes #11454 . We should define the return type of select_all method clearly. | ||||
| * | | Added some usage about ActiveRecord::Result [ci skip] | kennyj | 2013-07-23 | 1 | -2/+26 |
| | | | |||||
| * | | Defines the return type of select / select_all method. | kennyj | 2013-07-23 | 3 | -6/+8 |
|/ / | |||||
* | | Move #11546 changelog to the top [ci skip] | Carlos Antonio da Silva | 2013-07-22 | 1 | -13/+13 |
| | | |||||
* | | Add info about placing a new CHANGELOG entry to contributing guide | Piotr Sarnacki | 2013-07-22 | 1 | -1/+1 |
| | | |||||
* | | Revert "Match Dev/Prod parity for Index Page" | Piotr Sarnacki | 2013-07-22 | 3 | -5/+3 |
| | | | | | | | | | | | | | | | | Showing welcome page in production can expose information, which should not be visible on production if people don't override the default root route. This reverts commit b0caea29c2da9f4c8bb958019813482da297067d. |