Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Improve custom configuration" | Rafael Mendonça França | 2014-08-19 | 2 | -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-changelog | Guillermo Iguaran | 2014-08-19 | 1 | -0/+3 |
|\ | | | | | Mention web-console in 4.2 release notes | ||||
| * | Mention web-console in 4.2 release notes | Genadi Samokovarov | 2014-08-20 | 1 | -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-configuration | Rafael Mendonça França | 2014-08-19 | 2 | -15/+19 |
|\ \ | | | | | | | Improve custom configuration | ||||
| * | | Improve custom configuration | Rafael Mendonça França | 2014-08-19 | 2 | -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/docrails | Vijay Dev | 2014-08-19 | 4 | -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 Fatas | 2014-08-16 | 1 | -5/+5 |
| | | |||||
| * | Uppercase HTML in docs. | Hendy Tanata | 2014-08-08 | 3 | -8/+8 |
| | | | | | | | | [skip ci] | ||||
* | | minor copy editing [ci skip] | Vijay Dev | 2014-08-19 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #16487 from jayshepherd/patch-1 | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 |
|\ \ | | | | | | | Small grammar fix in pluck description | ||||
| * | | Small grammar fix in pluck description | Jay Shepherd | 2014-08-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #16556 from jonatack/patch-9 | Robin Dupret | 2014-08-19 | 1 | -15/+16 |
|\ \ \ | | | | | | | | | 4.2 Release Notes pass [ci skip] | ||||
| * | | | 4.2 Release Notes pass [skip ci] | Jon Atack | 2014-08-19 | 1 | -15/+16 |
| | | | | |||||
* | | | | Merge pull request #16552 from untidy-hair/update_plugin_guide | Yves Senn | 2014-08-19 | 1 | -21/+21 |
|\ \ \ \ | |/ / / |/| | | | [ci skip] Update plugin doc with the latest rails | ||||
| * | | | [ci skip] Update plugin doc with the latest rails | Yukio Mizuta | 2014-08-18 | 1 | -21/+21 |
| | | | | |||||
* | | | | http://gembundler.com/ => http://bundler.io/ | Akira Matsuda | 2014-08-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Removed unnecessary word | Tom Kadwill | 2014-08-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Sync Action Mailer release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+9 |
| | | | | |||||
* | | | | Sync Action View release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+6 |
| | | | | |||||
* | | | | Mention deprecation of assert_select and friends in the release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+4 |
| | | | | |||||
* | | | | require 'test_help' -> require 'rails/test_help' | Sean Griffin | 2014-08-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #16545 from jonatack/patch-9 | Zachary Scott | 2014-08-18 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix broken link to Upgrading Ruby on Rails Guide [ci skip] | ||||
| * | | | | Fix broken link to Upgrading Ruby on Rails Guide | Jon Atack | 2014-08-18 | 1 | -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 Bica | 2014-08-18 | 1 | -0/+4 |
| | | | | |||||
* | | | | fix broken link [ci skip] | Aditya Kapoor | 2014-08-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | :nail_care: [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -20/+26 |
| | | | |||||
* | | | Sync action pack release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+8 |
| | | | |||||
* | | | Sync railties release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+40 |
| | | | |||||
* | | | 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" |