aboutsummaryrefslogtreecommitdiffstats
path: root/guides
Commit message (Collapse)AuthorAgeFilesLines
* Same as f39cb2b except backport friendlyZachary Scott2014-08-201-4/+4
| | | | Point release notes to stable branch for list of commits. [ci skip]
* Point release notes to stable branch for list of commits. [ci skip]Zachary Scott2014-08-206-9/+15
|
* Merge pull request #16582 from cristianbica/actionmailer-deprecate-deliverRafael Mendonça França2014-08-205-13/+40
|\ | | | | Deprecated ActionMailer .deliver and updated ActionMailer / ActiveJob docs/guide
| * Updated rdoc / guides / release notes related to ActiveJob / ActionMailerCristian Bica2014-08-205-13/+40
| |
* | Merge pull request #16583 from JuanitoFatas/doc/patch-1Rafael Mendonça França2014-08-201-16/+22
|\ \ | |/ |/| [ci skip] Format pass of Active Job Basics guide.
| * [ci skip] Format pass of Active Job Basics guide.Juanito Fatas2014-08-201-16/+22
| |
* | Revert "Do not gsub non ASCII characters in header anchor.".Juanito Fatas2014-08-202-2/+2
|/ | | | | | This reverts commit 699babe. Also change the upgrading_ruby_on_rails link back to original in 4_2_release_notes.
* Copy & paste fail [ci skip]Godfrey Chan2014-08-191-1/+1
|
* :nail_care: The note doesn't look good on the blue background [ci skip]Godfrey Chan2014-08-191-2/+2
|
* :bomb: oops, it should be 4.2 that's WIP [ci skip]Godfrey Chan2014-08-192-5/+4
|
* Some placeholders for the 4.2 upgrade guide [ci skip]Godfrey Chan2014-08-191-0/+16
|
* Clearly mark these as WIP, and invite people to contribute. [ci skip]Godfrey Chan2014-08-192-1/+6
|
* List the 4.2 release notes in the index, mark it as WIP [ci skip]Godfrey Chan2014-08-191-0/+5
|
* Major features in 4.2 release notes [ci skip]Godfrey Chan2014-08-191-0/+40
|
* Synced AR release notes [ci-skip]Godfrey Chan2014-08-191-0/+18
|
* Synced Active Support release notes [ci skip]Godfrey Chan2014-08-191-0/+21
| | | | [Godfrey Chan, Genadi Samokovarov]
* Fix setting simple values to the new config.xCarlos Antonio da Silva2014-08-191-2/+1
| | | | | | | | | | Previously setting simple values to the config.x object resulted in the following: config.x.super_debugger = true config.x.super_debugger #=> {} Which was against the examples showed in the changelog/release notes.
* Synced Active Model changelogs [ci skip]Godfrey Chan2014-08-191-4/+16
| | | | Godfrey Chan, Genadi Samokovarov
* Revert "Improve custom configuration"Rafael Mendonça França2014-08-192-19/+15
| | | | | | | | | This reverts commit de4891344ccc074f6d5693f4fac6ad610584e336. Conflicts: railties/lib/rails/railtie/configuration.rb It added regression. Will be back after the beta
* Merge pull request #16561 from gsamokovarov/mention-web-console-in-changelogGuillermo Iguaran2014-08-191-0/+3
|\ | | | | Mention web-console in 4.2 release notes
| * Mention web-console in 4.2 release notesGenadi Samokovarov2014-08-201-0/+3
| | | | | | | | | | | | | | | | Mention the web-console inclusion in the default Gemfile in the Release notes and the railties changelog. We can eventually mention it in the upgrade guide, if needed. [ci skip]
* | Merge pull request #16536 from rails/improve-custom-configurationRafael Mendonça França2014-08-192-15/+19
|\ \ | | | | | | Improve custom configuration
| * | Improve custom configurationRafael Mendonça França2014-08-192-15/+19
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Hashes can be assigned 2. We don't need a special level anymore The method chain only works in the top level. If users need a second level they need to assign a OrderedOptions to the key: config.resque.server = ActiveSupport::OrderedOptions.new config.resque.server.url = "http://localhost" config.resque.server.port = 3000 [Rafael Mendonça França + Carlos Antonio da Silva]
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-194-13/+13
|\ \ | |/ |/| | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb activerecord/lib/active_record/type/value.rb
| * [ci skip] Update links in getting_started guide.Juanito Fatas2014-08-161-5/+5
| |
| * Uppercase HTML in docs.Hendy Tanata2014-08-083-8/+8
| | | | | | | | [skip ci]
* | minor copy editing [ci skip]Vijay Dev2014-08-191-3/+1
| |
* | Merge pull request #16487 from jayshepherd/patch-1Rafael Mendonça França2014-08-191-1/+1
|\ \ | | | | | | Small grammar fix in pluck description
| * | Small grammar fix in pluck descriptionJay Shepherd2014-08-121-1/+1
| | |
* | | Merge pull request #16556 from jonatack/patch-9Robin Dupret2014-08-191-15/+16
|\ \ \ | | | | | | | | 4.2 Release Notes pass [ci skip]
| * | | 4.2 Release Notes pass [skip ci]Jon Atack2014-08-191-15/+16
| | | |
* | | | Merge pull request #16552 from untidy-hair/update_plugin_guideYves Senn2014-08-191-21/+21
|\ \ \ \ | |/ / / |/| | | [ci skip] Update plugin doc with the latest rails
| * | | [ci skip] Update plugin doc with the latest railsYukio Mizuta2014-08-181-21/+21
| | | |
* | | | http://gembundler.com/ => http://bundler.io/Akira Matsuda2014-08-191-1/+1
| | | |
* | | | Removed unnecessary wordTom Kadwill2014-08-191-1/+1
| | | |
* | | | Sync Action Mailer release notes [ci skip]Godfrey Chan2014-08-181-0/+9
| | | |
* | | | Sync Action View release notes [ci skip]Godfrey Chan2014-08-181-0/+6
| | | |
* | | | Mention deprecation of assert_select and friends in the release notes [ci skip]Godfrey Chan2014-08-181-0/+4
| | | |
* | | | require 'test_help' -> require 'rails/test_help'Sean Griffin2014-08-181-1/+1
| | | |
* | | | Merge pull request #16545 from jonatack/patch-9Zachary Scott2014-08-181-1/+1
|\ \ \ \ | | | | | | | | | | Fix broken link to Upgrading Ruby on Rails Guide [ci skip]
| * | | | Fix broken link to Upgrading Ruby on Rails GuideJon Atack2014-08-181-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | in the 4.2 Release Notes [skip ci] Change to link suggested by @zzak [skip ci]
* | | | Add activejob guide to documents.yml [ci skip]Cristian Bica2014-08-181-0/+4
| | | |
* | | | fix broken link [ci skip]Aditya Kapoor2014-08-191-1/+1
|/ / /
* | | :nail_care: [ci skip]Godfrey Chan2014-08-181-20/+26
| | |
* | | Sync action pack release notes [ci skip]Godfrey Chan2014-08-181-0/+8
| | |
* | | Sync railties release notes [ci skip]Godfrey Chan2014-08-181-0/+40
| | |
* | | Merge branch 'master' into loofahRafael Mendonça França2014-08-177-7/+286
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * \ \ Merge pull request #16485 from seuros/activejobDavid Heinemeier Hansson2014-08-171-0/+253
| |\ \ \ | | | | | | | | | | Integrate ActiveJob / DeliverLater / GlobalID with Rails
| | * | | ActiveJob guides improvements [ci skip]Cristian Bica2014-08-161-108/+29
| | | | |
| | * | | ActiveJob: Reworked queue_base_name as default_queue_name + Allow configure ↵Cristian Bica2014-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | ActiveJob from app.config.active_job