Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14654 from Alamoz/secret_key | Rafael Mendonça França | 2014-04-09 | 1 | -4/+7 |
|\ | | | | | Expand explanation of how to set secrets.yml. | ||||
| * | Expand explanation of how to set secrets.yml. [ci skip] | Adrien Lamothe | 2014-04-08 | 1 | -4/+7 |
| | | |||||
* | | upgrading section for 4.1 is no longer WIP. [ci skip] | Yves Senn | 2014-04-09 | 1 | -2/+0 |
| | | |||||
* | | Guides: minor typo fixed [ci skip] | Vadim Golub | 2014-04-09 | 1 | -1/+1 |
|/ | |||||
* | Updates the maintenance policy with new Rails versions | Matias Korhonen | 2014-04-08 | 1 | -3/+3 |
| | |||||
* | Added OS X specific commands to installation guide [ci skip] | Jarmo Isotalo | 2014-04-07 | 1 | -1/+14 |
| | | | | Recommended using homebrew for installing MySQL and PostgreSQL | ||||
* | W3C CSP document moved to gihub.io URL [ci skip] | Andy Callaghan | 2014-04-05 | 1 | -1/+1 |
| | | | The old link https://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-specification.dev.html is now being soft redirected to this new URL | ||||
* | Merge pull request #14569 from matthewd/sqlite_relative_deprecated | Rafael Mendonça França | 2014-04-03 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | Revise 'sqlite3:' URL handling for smoother upgrades Conflicts: activerecord/CHANGELOG.md | ||||
| * | Revise 'sqlite3:' URL handling for smoother upgrades | Matthew Draper | 2014-04-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the 4.0 behaviour for 'sqlite3:///', but deprecate it. We'll change to the absolute-path interpretation in 4.2. The current "correct" spellings for in-memory, relative, and absolute URLs, respectively, are: sqlite3::memory: sqlite3:relative/path sqlite3:/full/path Substantially reverses/defers fbb79b517f3127ba620fedd01849f9628b78d6ce. Uncovered by @guilleiguaran while investigating #14495, though that sounds like a different issue. | ||||
* | | In Active Record Querying guide, currently `Merging of scopes` section uses ↵ | ariabov | 2014-04-02 | 1 | -30/+29 |
| | | | | | | | | | | | | a concept of default scope in its example before it is introduced in the following section titled `Applying a default scope`. It makes more sense to switch the ordering to introduce default scopes (`Applying a default scope`) first and then go into `Merging of scopes` section where it is used. | ||||
* | | Merge pull request #14564 from killthekitten/patch-2 | Rafael Mendonça França | 2014-04-02 | 1 | -5/+4 |
|\ \ | | | | | | | Fix default_url_options example in i18n guide | ||||
| * | | Fix default_url_options example in i18n guide [ci skip] | Nikolay Shebanov | 2014-04-03 | 1 | -5/+4 |
| |/ | |||||
* | | Fix cookie serializer docs | Carlos Antonio da Silva | 2014-04-02 | 1 | -3/+3 |
| | | | | | | | | The option actually needs to be set on action_dispatch. [ci skip] | ||||
* | | Fixed small documentation typo | Alessandro Tagliapietra | 2014-04-02 | 1 | -1/+1 |
|/ | | | Using `Rails.application.config.cookies_serializer :hybrid` throws an exception, fixed to `=`. | ||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-03-29 | 2 | -1/+11 |
|\ | |||||
| * | copy edit [ci skip] | Vijay Dev | 2014-03-29 | 1 | -1/+1 |
| | | |||||
| * | Clarify environment_name for logs | Gaurish Sharma | 2014-03-27 | 1 | -1/+1 |
| | | | | | | [ci skip] | ||||
| * | Updating select helper doc [ci skip] | Rashmi Yadav | 2014-03-08 | 1 | -0/+10 |
| | | |||||
* | | [ci skip] Fix Pull Request URL in 4.1 release note. | Juanito Fatas | 2014-03-27 | 1 | -1/+1 |
| | | |||||
* | | link to "Schema migration" Wikipedia page. Closes #14479. [ci skip] | Yves Senn | 2014-03-26 | 1 | -3/+4 |
| | | |||||
* | | synchronize changelogs and 4.1 release notes. [ci skip] | Yves Senn | 2014-03-25 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md | ||||
* | | fix log_tags request object grammar | Iain D Broadfoot | 2014-03-21 | 1 | -1/+1 |
| | | |||||
* | | Added a warning about serializing data with JSON cookie jars [skip ci] | Godfrey Chan | 2014-03-19 | 2 | -0/+48 |
| | | | | | | | | Closes #14409 | ||||
* | | Fix a typo to make clause plural [ci skip] | chriskohlbrenner | 2014-03-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #14379 from robertomiranda/rake-notes.config | Guillermo Iguaran | 2014-03-17 | 1 | -1/+7 |
|\ \ | | | | | | | Add Public Api for Register New Extensions for Rake Notes | ||||
| * | | Update command line guide | robertomiranda | 2014-03-17 | 1 | -1/+7 |
| | | | |||||
* | | | Remove extra white-spaces [ci skip] | Robin Dupret | 2014-03-16 | 1 | -13/+13 |
| | | | | | | | | | | | | Follow up to 024e5e31 | ||||
* | | | Reword 5.6 strong parameters and private method stuff [ci skip] | Afshin Mokhtari | 2014-03-15 | 1 | -11/+28 |
|/ / | |||||
* | | Fix probs in sections 5.6 and 5.9; [ci skip] | Afshin Mokhtari | 2014-03-13 | 1 | -3/+3 |
| | | |||||
* | | Fix a grammatical error in the i18n guide [ci skip] | sukolsak | 2014-03-12 | 1 | -1/+1 |
| | | |||||
* | | minor fix to 4.1 rel notes for begin_transaction joinable option [CI skip] | Gary S. Weaver | 2014-03-10 | 1 | -1/+1 |
| | | |||||
* | | The 4.1 release notes is already a thing so lets show in the guides | Rafael Mendonça França | 2014-03-10 | 1 | -1/+0 |
| | | | | | | | | links | ||||
* | | docs, shorten CsrfHelper description and refer to security guide. [ci skip] | Yves Senn | 2014-03-08 | 1 | -8/+3 |
| | | |||||
* | | added CSRF helper to rails guide documentation. Closes #11615. [ci skip] | Yves Senn | 2014-03-08 | 1 | -3/+19 |
| | | |||||
* | | Add preventDefault() on click event | Patrick Perey | 2014-03-07 | 1 | -1/+3 |
|/ | |||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-03-07 | 3 | -13/+21 |
|\ | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md | ||||
| * | Improve collision explanation for Hash#transform_keys. | Hendy Tanata | 2014-02-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | Based on comments at https://github.com/rails/docrails/commit/42417b0013819e573be9ffc5402e179003156e8e#commitcomment-5527251 [skip ci] | ||||
| * | Fix code alignment in duplicable? guide. | Hendy Tanata | 2014-02-27 | 1 | -2/+2 |
| | | | | | | | | [skip ci] | ||||
| * | Improve guide for Hash#transform_keys and related methods. | Hendy Tanata | 2014-02-27 | 1 | -6/+15 |
| | | | | | | | | [skip ci] | ||||
| * | Tweak Configuring Guide language | Gaurish Sharma | 2014-02-23 | 1 | -1/+1 |
| | | | | | | the fact that Rails is multi-thread by default is not very relevant. see https://github.com/rails/rails/pull/13998 [ci skip] | ||||
| * | typos fixes | Mikhail Dieterle | 2014-02-22 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #14257 from killthekitten/patch-1 | Vijay Dev | 2014-03-06 | 1 | -0/+20 |
|\ \ | | | | | | | Add "Low-Level Caching" part to "Caching With Rails" guide | ||||
| * | | [ci skip] Add "Low-Level Caching" part to "Caching With Rails" | Nikolay Shebanov | 2014-03-06 | 1 | -0/+20 |
| | | | |||||
* | | | Merge pull request #14285 from ↵ | Aaron Patterson | 2014-03-06 | 1 | -2/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | sikachu/master-revert-render-body-remove-content-type Do note remove `Content-Type` when `render :body` | ||||
| * | | | Do note remove `Content-Type` when `render :body` | Prem Sichanugrist | 2014-03-05 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da. | ||||
* | | | | Fix guide about `config.active_record.default_timezone` [ci skip] | joker1007 | 2014-03-06 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Now the initial value of ActiveRecord.default_timezone is always :utc | ||||
* / / | docs, flash message keys are normalized to strings. [ci skip] | Yves Senn | 2014-03-05 | 1 | -0/+20 |
|/ / | | | | | | | This is a follow up to a668beffd64106a1e1fedb71cc25eaaa11baf0c1 | ||||
* | | [ci skip] use secrets.secret_key_base instead of config.secret_key_base | Kuldeep Aggarwal | 2014-03-01 | 2 | -4/+11 |
| | | | | | | | | use secrets.yml instead of secret_token.rb | ||||
* | | Improve a bit the 4.1 release notes [ci skip] | Robin Dupret | 2014-02-28 | 1 | -4/+6 |
| | | | | | | | | | | Fix a few typos. #present_in has been changed to #presence_in through commit d61baee5. | ||||
* | | [ci skip] use secrets.yml instead of secret_token.rb in the action ↵ | Brian Thomas Storti | 2014-02-27 | 1 | -3/+18 |
| | | | | | | | | controller guide |