Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into loofah | Rafael Mendonça França | 2014-08-17 | 7 | -7/+286 |
|\ | | | | | | | | | Conflicts: actionpack/CHANGELOG.md | ||||
| * | Merge pull request #16485 from seuros/activejob | David Heinemeier Hansson | 2014-08-17 | 1 | -0/+253 |
| |\ | | | | | | | Integrate ActiveJob / DeliverLater / GlobalID with Rails | ||||
| | * | ActiveJob guides improvements [ci skip] | Cristian Bica | 2014-08-16 | 1 | -108/+29 |
| | | | |||||
| | * | ActiveJob: Reworked queue_base_name as default_queue_name + Allow configure ↵ | Cristian Bica | 2014-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | ActiveJob from app.config.active_job | ||||
| | * | Update ActiveJob guide [ci skip] | Cristian Bica | 2014-08-13 | 1 | -3/+12 |
| | | | |||||
| | * | Merge branch 'master' into activejob | Cristian Bica | 2014-08-13 | 1 | -1/+1 |
| | |\ | |||||
| | * | | [ci skip] First version of the Active Job guide | Cristian Bica | 2014-08-13 | 1 | -0/+323 |
| | | | | |||||
| * | | | Remove more references to respond_with | José Valim | 2014-08-17 | 2 | -2/+7 |
| | | | | |||||
| * | | | [ci skip] Fix sample code in Layouts and Rendering guide | yuuji.yaginuma | 2014-08-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] re-worded section on CookieStore to make it more readable. | Tom Kadwill | 2014-08-16 | 1 | -3/+3 |
| | | | | |||||
| * | | | Point to rubygems instead of Rails GitHub. [ci skip] | Rafael Mendonça França | 2014-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | The rails repository is not the official plugin anymore | ||||
| * | | | Fixed link for in_place_editor [ci skip] | Arun Agrawal | 2014-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | closes #16512 | ||||
| * | | | ಠ_ಠ now that the commit sha is known I can add it to the relese guide. | Yves Senn | 2014-08-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | remove deprecated `MissingHelperError` proxy. | Yves Senn | 2014-08-14 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | The error was moved outside of the `ClassMethods` module. | ||||
| * | | | Merge pull request #16408 from aditya-kapoor/add-doc-ERB-escape | Zachary Scott | 2014-08-13 | 1 | -0/+15 |
| |\ \ \ | | |_|/ | |/| | | [ci skip] add note about the ERB escape in generator docs | ||||
| | * | | [ci skip] add note about the ERB escape in generator docs | Aditya Kapoor | 2014-08-14 | 1 | -0/+15 |
| | | | | |||||
* | | | | Prepare for partial release. | Kasper Timm Hansen | 2014-08-17 | 1 | -0/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Default to Rails::DeprecatedSanitizer in ActionView::Helpers::SanitizeHelper. - Add upgrade notes. - Add sanitizer to new applications Gemfiles. - Remove 'rails-dom-testing' as a dependency. | ||||
* | | | | Merge branch 'master' into loofah | Rafael Mendonça França | 2014-08-12 | 22 | -327/+456 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/integration_test.rb actionview/CHANGELOG.md | ||||
| * | | | [ci skip] Fix broken url in plugins guide | yuuji.yaginuma | 2014-08-12 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge pull request #16300 from ↵ | Godfrey Chan | 2014-08-10 | 1 | -1/+5 |
| |\ \ | | | | | | | | | | | | | | | | | vast/mention-changes-to-nil-serialization-in-upgrading-from-3.2 Mention changes to `nil` handling in serialized attributes | ||||
| | * | | [ci skip] Clarify the "Serialized Attributes" section | Vasily Polovnyov | 2014-07-26 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Mention that the change in nil handling for serialized attributes affects custom coders. | ||||
| | * | | [ci skip] Mention the change in nil handling for serialized attributes | Vasily Polovnyov | 2014-07-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | in "Upgrading from Rails 3.2 to Rails 4.0" | ||||
| * | | | Cleanup Guides Guidelines [ci skip] | Robert Eshleman | 2014-08-10 | 1 | -12/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Copy editing for clarity in several locations * Rename "Titles" section to "Headings" * Fix incorrect anchor in link to API Documentation Guidelines for filenames | ||||
| * | | | [ci skip] Fix sample code in engines guide | yuuji.yaginuma | 2014-08-10 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix typo in plugins doc | Guillermo Álvarez Fernández | 2014-08-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #16359 from skanev/after-bundle-in-rails-templates | Yves Senn | 2014-08-06 | 3 | -3/+56 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Add an after_bundle callback in Rails templates Conflicts: railties/CHANGELOG.md | ||||
| | * | | Add after_bundle to the release notes and upgrade guide | Stefan Kanev | 2014-08-05 | 2 | -0/+35 |
| | | | | |||||
| | * | | Add an after_bundle callback in Rails templates | Stefan Kanev | 2014-08-03 | 1 | -3/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | The template runs before the generation of binstubs – this does not allow to write one, that makes an initial commit to version control. It is solvable by adding an after_bundle callback. | ||||
| * | | | Merge pull request #16375 from johnnyshields/guides | Richard Schneeman | 2014-08-04 | 1 | -0/+2 |
| |\ \ \ | | | | | | | | | | | Guides: Add definition of `config.assets.manifest` option to configuring.md | ||||
| | * | | | [ci skip] Guides: Add definition of `config.assets.manifest` option to ↵ | Johnny Shields | 2014-08-05 | 1 | -0/+2 |
| | |/ / | | | | | | | | | | | | | configuring.md | ||||
| * | | | Pull in the custom configuration concept from dhh/custom_configuration | David Heinemeier Hansson | 2014-08-03 | 1 | -0/+21 |
| | | | | |||||
| * | | | Update docs to reflect that helper stubs are no longer generated | David Heinemeier Hansson | 2014-08-03 | 5 | -25/+2 |
| | | | | |||||
| * | | | Merge pull request #16306 from aditya-kapoor/add-docs-for-uglifier | Zachary Scott | 2014-08-02 | 1 | -8/+9 |
| |\ \ \ | | | | | | | | | | | [ci skip] add tip for uglifier in execjs error | ||||
| | * | | | [ci skip] add tip for uglifier in execjs error | Aditya Kapoor | 2014-08-03 | 1 | -8/+9 |
| | | |/ | | |/| | |||||
| * | | | [ci skip] Remove "Machinist" from testing guide | yuuji.yaginuma | 2014-08-03 | 1 | -1/+0 |
| | |/ | |/| | |||||
| * | | [ci skip] fix markdown | schneems | 2014-08-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-08-02 | 3 | -29/+9 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: guides/source/testing.md | ||||
| | * | | [ci skip] Normalize all localhost linking. | Juanito Fatas | 2014-07-20 | 1 | -2/+2 |
| | | | | |||||
| | * | | [ci skip] Remove duplicated last! section. | Juanito Fatas | 2014-07-16 | 1 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/d4fd0bd17709735ac91e434c94fe99429f078c6e cc @schneems | ||||
| | * | | [ci skip] Use appropriate mailer syntax. | Juanito Fatas | 2014-07-16 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/f7e4362011ceb1317fd401125d48d7ccb9a1079c | ||||
| | * | | Add link to minitest rdoc & github | Gaurish Sharma | 2014-07-13 | 1 | -1/+3 |
| | | | | |||||
| * | | | Deprecate `*_path` methods in mailers | @schneems and @sgrif | 2014-07-30 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Email does not support relative links since there is no implicit host. Therefore all links inside of emails must be fully qualified URLs. All path helpers are now deprecated. When removed, the error will give early indication to developers to use `*_url` methods instead. Currently if a developer uses a `*_path` helper, their tests and `mail_view` will not catch the mistake. The only way to see the error is by sending emails in production. Preventing sending out emails with non-working path's is the desired end goal of this PR. Currently path helpers are mixed-in to controllers (the ActionMailer::Base acts as a controller). All `*_url` and `*_path` helpers are made available through the same module. This PR separates this behavior into two modules so we can extend the `*_path` methods to add a Deprecation to them. Once deprecated we can use this same area to raise a NoMethodError and add an informative message directing the developer to use `*_url` instead. The module with warnings is only mixed in when a controller returns false from the newly added `supports_relative_path?`. Paired @sgrif & @schneems | ||||
| * | | | :nail_care: from #16329 [ci skip] | Zachary Scott | 2014-07-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Get request should not write to database note added. [skip ci] | Deepender Singla | 2014-07-29 | 1 | -0/+2 |
| | |/ | |/| | |||||
| * | | Merge pull request #16258 from mattwarrenrnp/master | Yves Senn | 2014-07-25 | 1 | -11/+20 |
| |\ \ | | | | | | | | | adding indexes on tables in migration scripts [ci skip] | ||||
| | * | | adding indexes on tables in migration scripts | Matt Warren | 2014-07-24 | 1 | -11/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missed one migration script in last commit remove some empty lines using the belongs_to index option to be more concise | ||||
| * | | | Merge pull request #16276 from y-yagi/bug_report_templates | Matthew Draper | 2014-07-24 | 2 | -0/+2 |
| |\ \ \ | | | | | | | | | | | [ci skip]Add i18n master to the Gemfile | ||||
| | * | | | [ci skip]Add i18n master to the Gemfile | yuuji.yaginuma | 2014-07-24 | 2 | -0/+2 |
| | | | | | |||||
| * | | | | Merge pull request #16260 from akshay-vishnoi/doc-change | Matthew Draper | 2014-07-24 | 1 | -2/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | Calling require_self twice in css raises Sprockets::ArgumentError exception [ci skip] | ||||
| | * | | | Calling require_self twice in css raises Sprockets::ArgumentError exception ↵ | Akshay Vishnoi | 2014-07-24 | 1 | -2/+1 |
| | |/ / | | | | | | | | | | | | | [ci skip] |