Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | as of Rails 3.2.13 it appears that importing an engine's migration into the ↵ | Les Nightingill | 2013-03-31 | 1 | -1/+1 |
| | | | | host app is achieved by rake blorgh_engine:install:migrations | ||||
* | Remove unnecessary / confusing code in example | Jonathan Roes | 2013-03-31 | 1 | -11/+2 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | Vijay Dev | 2013-03-30 | 17 | -181/+267 |
|\ | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 23 | -79/+172 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | | rdoc is no longer a gem dependency, sdoc becomes a runtime dependency | Xavier Noria | 2013-03-30 | 1 | -0/+5 |
| | | | |||||
| * | | Update Gemfile since group assets doesn't exist anymore in Gemfile | robertomiranda | 2013-03-28 | 1 | -12/+11 |
| | | | |||||
| * | | Update Bundler require in getting started application | robertomiranda | 2013-03-28 | 1 | -2/+3 |
| | | | |||||
| * | | contrib guide: documents guidelines for running the test suite | Xavier Noria | 2013-03-28 | 1 | -0/+11 |
| | | | |||||
| * | | contrib guide: documents how to generate a --dev application | Xavier Noria | 2013-03-28 | 1 | -0/+16 |
| | | | |||||
| * | | mention strong parameters in complex forms section of the guides. | Yves Senn | 2013-03-27 | 1 | -1/+25 |
| | | | | | | | | | | | | Closes #9921. | ||||
| * | | Merge pull request #9925 from senny/relative_guide_links | Steve Klabnik | 2013-03-25 | 3 | -18/+26 |
| |\ \ | | | | | | | | | use relative links inside guides [ci skip] | ||||
| | * | | use relative links inside guides [ci skip] | Yves Senn | 2013-03-25 | 3 | -18/+26 |
| | | | | |||||
| * | | | move mailer testing examples into the testing guide. | Yves Senn | 2013-03-25 | 2 | -36/+26 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | Closes #9325. I adjusted the example and the description in the testing guide and simply linked from the mailer to the testing guide. This way we don't have to maintain two separate places. | ||||
| * | | Merge pull request #9909 from trevorturk/9740 | Jeremy Kemper | 2013-03-24 | 1 | -1/+11 |
| |\ \ | | | | | | | | | Transparently upgrade signed cookies when setting secret_key_base | ||||
| | * | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵ | Trevor Turk | 2013-03-24 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4 | ||||
| * | | | Relaxed jbuilder dependency and bumped version number | Pavel Pravosud | 2013-03-25 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Newer version contains some generator bugfixes | ||||
| * | | Merge pull request #9704 from trevorturk/warn-about-skipped-routes | Jeremy Kemper | 2013-03-24 | 1 | -15/+3 |
| |\ \ | | | | | | | | | Raise an ArgumentError when a clashing named route is defined | ||||
| | * | | Raise an ArgumentError when a clashing named route is defined | Trevor Turk | 2013-03-19 | 1 | -15/+3 |
| | | | | |||||
| * | | | Better styles for the CSS [ci skip] | Rafael Mendonça França | 2013-03-23 | 3 | -38/+38 |
| |/ / | |||||
| * | | Fix guides error on error class name | Sebastian Sogamoso | 2013-03-19 | 1 | -1/+1 |
| | | | | | | | | | The error that's raised in case the required key is missing it's actually `ActionController::ParameterMissing` not `ActionController::MissingParameter`. It's important to fix so that people reading the guides knows what error to rescue from when needed. | ||||
| * | | More helpful message when starting server | Gabe Kopley | 2013-03-18 | 1 | -1/+1 |
| | | | | | | | | | | | | v2 of pull request based on feedback from @rafaelfranca, @schneems, and @carlosantoniodasilva | ||||
| * | | Getting Started Guide: typo fix. [ci skip] | Steve Klabnik | 2013-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | There was an s missing in 'views'. Fixes #9752. | ||||
| * | | Update image in Getting Started Guide [ci skip] | Steve Klabnik | 2013-03-16 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | When I updated these images, I must have gotten this one wrong. Now it's right. Fixes #9749. | ||||
| * | | rename `Relation#uniq` to `Relation#distinct`. `#uniq` still works. | Yves Senn | 2013-03-15 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | The similarity of `Relation#uniq` to `Array#uniq` is confusing. Since our Relation API is close to SQL terms I renamed `#uniq` to `#distinct`. There is no deprecation. `#uniq` and `#uniq!` are aliases and will continue to work. I also updated the documentation to promote the use of `#distinct`. | ||||
| * | | `Http::Headers` directly modifies the passed environment. | Yves Senn | 2013-03-15 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The env hash passed to `Http::Headers#new` must be in env format. Also be aware that the passed hash is modified directly. docs and test-cases for setting headers/env in functional tests. Follow up to #9700. | ||||
| * | | Getting Started Guide: 3.2.9 -> 4.0.0. [ci skip] | Steve Klabnik | 2013-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | Brought up in https://github.com/rails/rails/issues/9727 | ||||
| * | | Document change to clashing named route selection from journey commit 98a9802a | Trevor Turk | 2013-03-12 | 1 | -0/+26 |
| | | | |||||
| * | | Improve wording for rails test command | Dalibor Nasevic | 2013-03-09 | 1 | -4/+3 |
| | | | |||||
| * | | Add support for MiniTest flags in TestRunner | Prem Sichanugrist | 2013-03-09 | 1 | -20/+5 |
| | | | | | | | | | | | | | | | Any flags that got set will be passed through to MiniTest::Unit.runner, such as `-n`, `-s-, and `-v`. | ||||
| * | | Update testing documentation | Prem Sichanugrist | 2013-03-09 | 1 | -63/+71 |
| | | | | | | | | | | | | | | | | | | | | | * Update test invocation to use `rails test` instead. * Update all the test command previews (since we're now using MiniTest.) * Mentioning MiniTest instead of Test::Unit. * Update list of test suites. | ||||
* | | | Revert "Using American English spellings over British style spellings" | Vijay Dev | 2013-03-30 | 1 | -2/+2 |
| |/ |/| | | | | | | | | | | | | | This reverts commit 573df1cf2a5d5d1f288c8a4a5d76194675141832. Reason: changelog edits aren't allowed in docrails. [ci skip] | ||||
* | | More typo / wording fixes | Jonathan Roes | 2013-03-29 | 1 | -6/+6 |
| | | |||||
* | | Proofreading tweaks | Jonathan Roes | 2013-03-29 | 1 | -7/+7 |
| | | | | | | | | - Consistent hash structure - Rewording / typo fixes | ||||
* | | info that Gemfile *group :assets* was removed | Vinicius Quaiato | 2013-03-29 | 1 | -0/+26 |
| | | | | | | Adding info that Gemfile *group :assets* was removed on upgrading_ruby_on_rails.md | ||||
* | | Minor proofing | Jonathan Roes | 2013-03-27 | 1 | -13/+13 |
| | | |||||
* | | Remove unnecessary hyphen. | Jonathan Roes | 2013-03-27 | 1 | -1/+1 |
| | | |||||
* | | Extraneous syntax on guides path. | Jonathan Roes | 2013-03-27 | 1 | -1/+1 |
| | | |||||
* | | ReCAPTCHA plug-in link now points to Github repo. Plug-in is no longer ↵ | sthollmann | 2013-03-27 | 1 | -1/+1 |
| | | | | | | | | available at the previous location | ||||
* | | localised => localized | Prathamesh Sonpatki | 2013-03-25 | 1 | -1/+1 |
| | | |||||
* | | Fix some typos | Akira Matsuda | 2013-03-25 | 1 | -1/+1 |
| | | |||||
* | | s/Textmate/TextMate/ | Akira Matsuda | 2013-03-25 | 1 | -1/+1 |
| | | |||||
* | | s/Github/GitHub/ | Akira Matsuda | 2013-03-25 | 1 | -1/+1 |
| | | |||||
* | | fix some typos | Vipul A M | 2013-03-25 | 2 | -3/+3 |
| | | |||||
* | | correct some typo in earlier commit. | Deshi Xiao | 2013-03-24 | 1 | -1/+1 |
| | | |||||
* | | correct test command's typo | Deshi Xiao | 2013-03-24 | 1 | -13/+13 |
| | | |||||
* | | view/views, asset/assets | Prathamesh Sonpatki | 2013-03-24 | 2 | -2/+2 |
| | | |||||
* | | s/app\/model\//app\/models\//g | Akira Matsuda | 2013-03-24 | 2 | -6/+6 |
| | | |||||
* | | Typo: Migration class name would use plural | Chao Ren | 2013-03-23 | 1 | -1/+1 |
| | | |||||
* | | Changed 'args' to 'arguments' when used in places other than code with ↵ | Prathamesh Sonpatki | 2013-03-24 | 2 | -2/+2 |
| | | | | | | | | fixing few more typos | ||||
* | | Add minitest-spec-rails to guide's testing options | Ken Collins | 2013-03-22 | 1 | -0/+1 |
| | |