aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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]
| | * | | | Add documentation for #clear on certain Store classesMatt Stopa2013-07-102-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip
| | * | | | Update the filestore documentation for clearMatt Stopa2013-07-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Enhancing readability of options for delegate methodThiago Pinto2013-07-161-0/+5
| |/ / / /
* | | | | Merge pull request #11416 from tigrish/masterYves Senn2013-07-213-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Rename the I18n keys for associations' restrict_dependent_destroy errors
| * | | | | Remove ambiguity with pluralizations and I18n keys used for association ↵Christopher Dell2013-07-133-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | restrict_dependent_destroy errors
* | | | | | Merge pull request #11515 from prathamesh-sonpatki/edit-index-pageYves Senn2013-07-211-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed information about creating database [ci skip]
| * | | | | | Removed information about creating database[ci skip]Prathamesh Sonpatki2013-07-201-2/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As default index page is no longer in public folder, rails hits the welcome controller in railties for index action - If the database is not created or username and password are incorrect in database.yml, those errors are first shown before index action succeeds - welcome#index succeeds iff the database is created with correct details in database.yml - So this information about creating database is not required in the index template
* | | | | | Merge pull request #11521 from mking/release-notes-major-featuresGuillermo Iguaran2013-07-201-2/+39
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Rails 4.0 release notes. Explain major features added and removed.
| * | | | | Rails 4.0 release notes. Explain major features added and removed. [ci skip]Matthew King2013-07-201-2/+39
|/ / / / /
* | | | | Merge pull request #11508 from vipulnsward/extract_constantsYves Senn2013-07-201-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Extract verbs array from helper to a contant
| * | | | Extract verbs array from helper to a constantVipul A M2013-07-201-2/+2
| | | | |
* | | | | Merge pull request #11507 from vipulnsward/av_typo-4Guillermo Iguaran2013-07-191-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix test name typos
| * | | | Fix test name typosVipul A M2013-07-191-2/+2
|/ / / /
* | | | Merge pull request #11501 from nishantmodak/patch-3Yves Senn2013-07-191-0/+2
|\ \ \ \ | | | | | | | | | | Upgrade guide. Renaming Indexes on tables. [ci skip]
| * | | | Upgrade guide. Renaming Indexes on tables. [ci skip].Nishant Modak2013-07-191-0/+2
|/ / / / | | | | | | | | | | | | https://github.com/rails/rails/commit/39eef1a565ef02e4dabc0811ef1bf4547ff9a60e#commitcomment-3672522
* | | | fix typo in Active Record Validations guide. [ci skip].Yves Senn2013-07-191-1/+1
| | | | | | | | | | | | | | | | Closes #11498.
* | | | use the superclass implementationAaron Patterson2013-07-182-2/+4
| | | |
* | | | Merge pull request #11492 from maratvmk/concern_testYves Senn2013-07-181-6/+0
|\ \ \ \ | | | | | | | | | | remove duplication in concern_test
| * | | | remove duplication in testMarat Kazbekov2013-07-181-6/+0
| | | | |
* | | | | Merge pull request #11491 from erichkist/ek-revert-unscope-patchRafael Mendonça França2013-07-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Revert "Fix SyntaxError in guides sample code"
| * | | | Revert "Fix SyntaxError in guides sample code"Erich Kist2013-07-181-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f573df32d43c413a5098721ba6151ff190c23c6c. The original idea of this documentation was to showcase the feature where you can remove some only queries attributes with a single key-value pair.
* | | | Use the canonical router on the CHANGELOG entryRafael Mendonça França2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks @egilburg [ci skip]
* | | | Fix examples of number_to_percentageRafael Mendonça França2013-07-181-8/+8
| | | | | | | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 22:53:07 +0000