aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Fix changelog syntax and use Ruby 1.9 hash style [ci skip]Carlos Antonio da Silva2013-07-221-2/+1
| |
* | Merge pull request #11461 from kennyj/fix_11454Yves Senn2013-07-224-8/+34
|\ \ | | | | | | Fixes #11454 . We should define the return type of select_all method clearly.
| * | Added some usage about ActiveRecord::Result [ci skip]kennyj2013-07-231-2/+26
| | |
| * | Defines the return type of select / select_all method.kennyj2013-07-233-6/+8
|/ /
* | Move #11546 changelog to the top [ci skip]Carlos Antonio da Silva2013-07-221-13/+13
| |
* | Add info about placing a new CHANGELOG entry to contributing guidePiotr Sarnacki2013-07-221-1/+1
| |
* | Revert "Match Dev/Prod parity for Index Page"Piotr Sarnacki2013-07-223-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.
* | Merge pull request #11546 from swoop-inc/ss_memory_store_cache_sizePiotr Sarnacki2013-07-223-5/+53
|\ \ | |/ |/| [Fixes #11512] improves cache size calculation in MemoryStore
| * [Fixes #11512] improves cache size calculation in ↵Simeon Simeonov2013-07-223-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::Cache::MemoryStore Previously, the cache size of `ActiveSupport::Cache::MemoryStore` was calculated as the sum of the size of its entries, ignoring the size of keys and any data structure overhead. This could lead to the calculated cache size sometimes being 10-100x smaller than the memory used, e.g., in the case of small values. The size of a key/entry pair is now calculated via `#cached_size`: def cached_size(key, entry) key.to_s.bytesize + entry.size + PER_ENTRY_OVERHEAD end The value of `PER_ENTRY_OVERHEAD` is 240 bytes based on an [empirical estimation](https://gist.github.com/ssimeonov/6047200) for 64-bit MRI on 1.9.3 and 2.0. Fixes GH#11512 https://github.com/rails/rails/issues/11512
* | Merge pull request #11528 from Empact/optimistic_lock_improvementRafael Mendonça França2013-07-225-4/+33
|\ \ | | | | | | Rebase and make fixes to #6763 "Specified column type for quote_value"
| * | Don't allow `quote_value` to be called without a columnBen Woosley2013-07-223-3/+12
| | | | | | | | | | | | | | | | | | | | | Some adapters require column information to do their job properly. By enforcing the provision of the column for this internal method we ensure that those using adapters that require column information will always get the proper behavior.
| * | Tidy up the "Specified column type for quote_value" changesBen Woosley2013-07-223-4/+4
| | | | | | | | | | | | | | | | | | This includes fixing typos in changelog, removing a deprecated mocha/setup test require, and preferring the `column_for_attribute` accessor over direct access to the columns_hash in the new code.
| * | Specified column type for quote_valueAlfred Wong2013-07-223-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling quote_value the underlying connection sometimes requires more information about the column to properly return the correct quoted value. I ran into this issue when using optimistic locking in JRuby and the activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to insert a integer into a NVARCHAR column type so we need to format it as N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without the column type being passed the connection adapter cannot properly return the correct quote value because it doesn't know to return N'3' or '3'. This patch is fairly straight forward where it just passes in the column type into the quote_value, as it already has the ability to take in the column, so it can properly handle at the connection level. I've added the tests required to make sure that the quote_value method is being passed the column type so that the underlying connection can determine how to quote the value.
* | | Merge pull request #11537 from Karunakar/small_fixRafael Mendonça França2013-07-221-1/+1
|\ \ \ | | | | | | | | syntax fix f.select doc
| * | | syntax fix for f.select doc. [ci skip] .Karunakar (Ruby)2013-07-221-1/+1
|/ / /
* | | Merge pull request #11551 from skammer/patch-1Yves Senn2013-07-221-1/+1
|\ \ \ | | | | | | | | Removed random dot in ActionController docs [ci skip]
| * | | Removed random dot in code sample [ci skip]Max Vasiliev2013-07-221-1/+1
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-23 01:57:28 +0000