aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | | | |
* | | | | Merge pull request #11107 from nettsundere/password-confirmation-fixGuillermo Iguaran2013-07-233-2/+18
|\ \ \ \ \ | | | | | | | | | | | | Fix secure_password password_confirmation validations
| * | | | | Fix secure_password password_confirmation validationsVladimir Kiselev2013-07-243-2/+18
| | | | | |
* | | | | | stop relying on side effects of const_missingAaron Patterson2013-07-232-7/+13
|/ / / / /
* | | | | add a specific factory method rather than using newAaron Patterson2013-07-239-13/+11
| | | | |
* | | | | Use GeneratedAttribute#column_name if #reference? scaffold_generator in ↵Zachary Scott2013-07-232-0/+29
| | | | | | | | | | | | | | | | | | | | _form view [Fixes #11573]
* | | | | factory methods should not have side effects.Aaron Patterson2013-07-233-8/+11
| | | | | | | | | | | | | | | | | | | | Move model mutation to the methods that are called on the model.
* | | | | extract mutation from generation methodAaron Patterson2013-07-232-4/+6
| | | | |
* | | | | Merge pull request #11566 from rajcybage/masterRafael Mendonça França2013-07-231-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 Das2013-07-231-1/+1
| | | | | |
* | | | | | habtm can only ever be an association reflectionAaron Patterson2013-07-221-2/+4
| | | | | |
* | | | | | use the predicate methodAaron Patterson2013-07-221-1/+1
| | | | | |
* | | | | | Stop reading the same file twice for testing different contentCarlos Antonio da Silva2013-07-221-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 objectsAaron Patterson2013-07-223-21/+21
| | | | | |
* | | | | | remove unnecessary readerAaron Patterson2013-07-221-4/+4
| | | | | |
* | | | | | only flatten one sideAaron Patterson2013-07-221-1/+1
| | | | | |
* | | | | | extend by adding relationships rather than monkey patchingAaron Patterson2013-07-222-11/+13
| | | | | |
* | | | | | decouple extensions from association object stateAaron Patterson2013-07-222-3/+3
| | | | | |
* | | | | | Merge pull request #11558 from kennyj/bump_mysql2_to_0_3_13Guillermo Iguaran2013-07-221-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Uses mysql2 0.3.13 or later.
| * | | | | Uses mysql2 0.3.13 or laterkennyj2013-07-231-1/+1
|/ / / / /
* | | | | Leave the knowledge of boolean tag values to content tagCarlos Antonio da Silva2013-07-221-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 styleCarlos Antonio da Silva2013-07-221-7/+7
| | | | |