Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge pull request #11416 from tigrish/master" | Yves Senn | 2013-07-22 | 3 | -4/+4 |
| | | | | | This reverts commit 9dc8aef084fc5ae7e3a396dd098d89da93d06fda, reversing changes made to 02e8dae6279ea25312293a3eca777faf35139c4c. | ||||
* | Merge pull request #11517 from nashby/optgroup-html-attributes | Piotr Sarnacki | 2013-07-21 | 3 | -1/+25 |
|\ | | | | | add support for html attributes to grouped_options_for_select | ||||
| * | add support for html attributes to grouped_options_for_select | Vasiliy Ermolovich | 2013-07-20 | 3 | -1/+25 |
| | | |||||
* | | Merge pull request #11534 from gaurish/log | Piotr Sarnacki | 2013-07-21 | 1 | -0/+31 |
|\ \ | | | | | | | Add logging performance [ci skip] | ||||
| * | | Add logging performance [ci skip] | Gaurish Sharma | 2013-07-21 | 1 | -0/+31 |
| | | | |||||
* | | | Update note about declarative etags in release notes | Guillermo Iguaran | 2013-07-21 | 1 | -1/+1 |
| | | | |||||
* | | | Improve comment about ActiveModel::Model | Guillermo Iguaran | 2013-07-21 | 1 | -2/+2 |
| | | | |||||
* | | | Fix note about AP/AV decoupling in release notes | Guillermo Iguaran | 2013-07-21 | 1 | -1/+1 |
| | | | |||||
* | | | Clear named routes when routes.rb is reloaded | Andrew White | 2013-07-21 | 3 | -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/docrails | Vijay Dev | 2013-07-21 | 11 | -28/+42 |
|\ \ \ | |||||
| * | | | use strong_params in example | Mikhail Dieterle | 2013-07-19 | 1 | -1/+6 |
| | | | | |||||
| * | | | use the appropriate RDoc code markup | Damien Mathieu | 2013-07-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Thanks @fxn | ||||
| * | | | document the Rails::ConsoleMethods#helper and #controller methods | Damien Mathieu | 2013-07-18 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | Closes rails/rails#11362 | ||||
| * | | | Merge pull request #159 from rajcybage/my_fix | Rafael Mendonça França | 2013-07-17 | 1 | -4/+4 |
| |\ \ \ | | | | | | | | | | | fixes the test case of that plugins | ||||
| | * | | | fixes the test case of that plugins | Rajarshi Das | 2013-07-18 | 1 | -4/+4 |
| |/ / / | |||||
| * | | | New output for scaffold generate [ci skip] | Rashmi Yadav | 2013-07-17 | 1 | -3/+6 |
| | | | | |||||
| * | | | Guides fixed typo in index.html.erb file [ci skip] | Arun Agrawal | 2013-07-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:rails/docrails | Thiago Pinto | 2013-07-16 | 6 | -20/+15 |
| |\ \ \ | |||||
| | * | | | Added Rack::Sendfile in rake about [ci skip] | Arun Agrawal | 2013-07-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Rack Sendfile is coming as default now | Arun Agrawal | 2013-07-15 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Using ruby 1.9 syntax [ci skip] | Rashmi Yadav | 2013-07-14 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Array#to_formatted_s does not call each element's to_s anymore | Akira Matsuda | 2013-07-11 | 1 | -17/+2 |
| | | | | | | | | | | | | | | | | | | | | Array#to_s calls each element's inspect since ruby 1.9 | ||||
| | * | | | Add documentation for FileStore#increment and #decrement | Matt Stopa | 2013-07-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | Add documentation for #clear on certain Store classes | Matt Stopa | 2013-07-10 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | [ci skip | ||||
| | * | | | Update the filestore documentation for clear | Matt Stopa | 2013-07-09 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Enhancing readability of options for delegate method | Thiago Pinto | 2013-07-16 | 1 | -0/+5 |
| |/ / / | |||||
* | | | | Merge pull request #11416 from tigrish/master | Yves Senn | 2013-07-21 | 3 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Rename the I18n keys for associations' restrict_dependent_destroy errors | ||||
| * | | | | Remove ambiguity with pluralizations and I18n keys used for association ↵ | Christopher Dell | 2013-07-13 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | restrict_dependent_destroy errors | ||||
* | | | | | Merge pull request #11515 from prathamesh-sonpatki/edit-index-page | Yves Senn | 2013-07-21 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Removed information about creating database [ci skip] | ||||
| * | | | | | Removed information about creating database[ci skip] | Prathamesh Sonpatki | 2013-07-20 | 1 | -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-features | Guillermo Iguaran | 2013-07-20 | 1 | -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 King | 2013-07-20 | 1 | -2/+39 |
|/ / / / | |||||
* | | | | Merge pull request #11508 from vipulnsward/extract_constants | Yves Senn | 2013-07-20 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Extract verbs array from helper to a contant | ||||
| * | | | Extract verbs array from helper to a constant | Vipul A M | 2013-07-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #11507 from vipulnsward/av_typo-4 | Guillermo Iguaran | 2013-07-19 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Fix test name typos | ||||
| * | | | Fix test name typos | Vipul A M | 2013-07-19 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #11501 from nishantmodak/patch-3 | Yves Senn | 2013-07-19 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Upgrade guide. Renaming Indexes on tables. [ci skip] | ||||
| * | | | Upgrade guide. Renaming Indexes on tables. [ci skip]. | Nishant Modak | 2013-07-19 | 1 | -0/+2 |
|/ / / | | | | | | | | | | https://github.com/rails/rails/commit/39eef1a565ef02e4dabc0811ef1bf4547ff9a60e#commitcomment-3672522 | ||||
* | | | fix typo in Active Record Validations guide. [ci skip]. | Yves Senn | 2013-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes #11498. | ||||
* | | | use the superclass implementation | Aaron Patterson | 2013-07-18 | 2 | -2/+4 |
| | | | |||||
* | | | Merge pull request #11492 from maratvmk/concern_test | Yves Senn | 2013-07-18 | 1 | -6/+0 |
|\ \ \ | | | | | | | | | remove duplication in concern_test | ||||
| * | | | remove duplication in test | Marat Kazbekov | 2013-07-18 | 1 | -6/+0 |
| | | | | |||||
* | | | | Merge pull request #11491 from erichkist/ek-revert-unscope-patch | Rafael Mendonça França | 2013-07-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Revert "Fix SyntaxError in guides sample code" | ||||
| * | | | Revert "Fix SyntaxError in guides sample code" | Erich Kist | 2013-07-18 | 1 | -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 entry | Rafael Mendonça França | 2013-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Thanks @egilburg [ci skip] | ||||
* | | | Fix examples of number_to_percentage | Rafael Mendonça França | 2013-07-18 | 1 | -8/+8 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #11483 from garysweaver/grammar_fix_in_upgrade_documentation | Santiago Pastorino | 2013-07-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | grammar fix in upgrade documentation | ||||
| * | | | grammar fix in upgrade documentation | Gary S. Weaver | 2013-07-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #11485 from simi/mysql2 | Guillermo Iguaran | 2013-07-17 | 1 | -3/+1 |
|\ \ \ \ | | | | | | | | | | | Use latest mysql2. | ||||
| * | | | | Use latest mysql2. | Josef Šimánek | 2013-07-18 | 1 | -3/+1 |
|/ / / / | | | | | | | | | | | | | Fixes #11457 |