aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ /
* | | Merge pull request #11549 from dmathieu/test_duplicationSantiago Pastorino2013-07-221-4/+0
|\ \ \ | | | | | | | | Remove duplication in include test
| * | | remove useless duplication in include testDamien Mathieu2013-07-221-4/+0
| | | |
* | | | Merge pull request #11536 from dpickett/patch-1Santiago Pastorino2013-07-221-1/+0
|\ \ \ \ | |_|/ / |/| | | metal is no longer mentioned on rack guide
| * | | metal is no longer mentioned on rack guideDan Pickett2013-07-211-1/+0
| | | |
* | | | Merge pull request #11538 from vipulnsward/rescue-expPiotr Sarnacki2013-07-223-3/+17
|\ \ \ \ | | | | | | | | | | rescue from all exceptions in `ConnectionManagement#call`
| * | | | rescue from all exceptions in `ConnectionManagement#call`Vipul A M2013-07-223-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11497 As `ActiveRecord::ConnectionAdapters::ConnectionManagement` middleware does not rescue from Exception (but only from StandardError), the Connection Pool quickly runs out of connections when multiple erroneous Requests come in right after each other. Recueing from all exceptions and not just StandardError, fixes this behaviour.
* | | | | Merge pull request #11514 from schneems/schneems/dev-prod-parity-indexPiotr Sarnacki2013-07-223-3/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | Match Dev/Prod parity for Index Page
| * | | | Match Dev/Prod parity for Index Pageschneems2013-07-203-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Rails 4 the default index page was moved from a static file `index.html` inside the `public/` folder to an internal controller/view inside of the railties gem. This was to allow use of erb in the default index page and to remove the requirement that new apps must delete a static file to make their index pages work. While this was a good change, the functionality was unexpected to developers who wish to get their apps running in production ASAP. They will create a new app `rails new my app`, start a server to verify it works, then immediately deploy the app to verify that it can start working in production. Unfortunately locally they see a page when they visit `localhost:3000` when they visit their production app they get an error page. We initially anticipated this problem in the original pull request, but did not properly anticipate the severity or quantity of people who would like this functionality. Having a default index page serves as an excellent litmus test for a passed deploy on default apps, and it is very unexpected to have a page work locally, but not on production. This change makes the default index page available in production if the developer has not over-written it by defining their own `root` path inside of routes.
* | | | | Revert "Merge pull request #11416 from tigrish/master"Yves Senn2013-07-223-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9dc8aef084fc5ae7e3a396dd098d89da93d06fda, reversing changes made to 02e8dae6279ea25312293a3eca777faf35139c4c.
* | | | | Merge pull request #11517 from nashby/optgroup-html-attributesPiotr Sarnacki2013-07-213-1/+25
|\ \ \ \ \ | | | | | | | | | | | | add support for html attributes to grouped_options_for_select
| * | | | | add support for html attributes to grouped_options_for_selectVasiliy Ermolovich2013-07-203-1/+25
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11534 from gaurish/logPiotr Sarnacki2013-07-211-0/+31
|\ \ \ \ \ | | | | | | | | | | | | Add logging performance [ci skip]
| * | | | | Add logging performance [ci skip]Gaurish Sharma2013-07-211-0/+31
| | | | | |
* | | | | | Update note about declarative etags in release notesGuillermo Iguaran2013-07-211-1/+1
| | | | | |
* | | | | | Improve comment about ActiveModel::ModelGuillermo Iguaran2013-07-211-2/+2
| |_|_|_|/ |/| | | |
* | | | | Fix note about AP/AV decoupling in release notesGuillermo Iguaran2013-07-211-1/+1
| |_|_|/ |/| | |
* | | | Clear named routes when routes.rb is reloadedAndrew White2013-07-213-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue where Journey was failing to clear the named routes hash when the routes were reloaded and since it doesn't overwrite existing routes then if a route changed but wasn't renamed it kept the old definition. This was being masked by the optimised url helpers so it only became apparent when passing an options hash to the url helper.
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-2111-28/+42
|\ \ \ \
| * | | | use strong_params in exampleMikhail Dieterle2013-07-191-1/+6
| | | | |
| * | | | use the appropriate RDoc code markupDamien Mathieu2013-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | Thanks @fxn
| * | | | document the Rails::ConsoleMethods#helper and #controller methodsDamien Mathieu2013-07-181-0/+6
| | | | | | | | | | | | | | | | | | | | Closes rails/rails#11362
| * | | | Merge pull request #159 from rajcybage/my_fixRafael Mendonça França2013-07-171-4/+4
| |\ \ \ \ | | | | | | | | | | | | fixes the test case of that plugins
| | * | | | fixes the test case of that pluginsRajarshi Das2013-07-181-4/+4
| |/ / / /
| * | | | New output for scaffold generate [ci skip]Rashmi Yadav2013-07-171-3/+6
| | | | |
| * | | | Guides fixed typo in index.html.erb file [ci skip]Arun Agrawal2013-07-171-1/+1
| | | | |
| * | | | Merge branch 'master' of github.com:rails/docrailsThiago Pinto2013-07-166-20/+15
| |\ \ \ \
| | * | | | Added Rack::Sendfile in rake about [ci skip]Arun Agrawal2013-07-151-1/+1
| | | | | |
| | * | | | Rack Sendfile is coming as default nowArun Agrawal2013-07-151-0/+1
| | | | | |
| | * | | | Using ruby 1.9 syntax [ci skip]Rashmi Yadav2013-07-141-2/+2
| | | | | |
| | * | | | Array#to_formatted_s does not call each element's to_s anymoreAkira Matsuda2013-07-111-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | Array#to_s calls each element's inspect since ruby 1.9
| | * | | | Add documentation for FileStore#increment and #decrementMatt Stopa2013-07-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 19:03:43 +0000