| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #16271 from alol/action-view-overview-guide-tweaks | Vijay Dev | 2014-08-22 | 1 | -11/+11 |
| |\ | | | | | Small Action View Overview guide grammar and readability tweaks | ||||
| | * | Small Action View Overview edits [ci skip] | Alan Oliver | 2014-07-24 | 1 | -11/+11 |
| | | | | | | | | | Some small grammar and readability edits | ||||
| * | | Guide fix. [CI SKIP] | Guo Xiang Tan | 2014-08-22 | 1 | -3/+3 |
| | | | | | | | | | Related: https://github.com/rails/rails/pull/16607 | ||||
| * | | Merge pull request #16612 from loganhasson/master | Zachary Scott | 2014-08-21 | 1 | -5/+5 |
| |\ \ | | | | | | | [ci skip] Clarify Action Mailer/Active Job usage note | ||||
| | * | | [ci skip] Clarify Action Mailer/Active Job usage note | Logan Hasson | 2014-08-21 | 1 | -5/+5 |
| | | | | |||||
| * | | | Merge pull request #16607 from tgxworld/upgrading_guide_pass | Santiago Pastorino | 2014-08-21 | 1 | -9/+10 |
| |\ \ \ | |/ / |/| | | Upgrade guide pass. [CI SKIP] | ||||
| | * | | Upgrade guide pass. [CI SKIP] | Guo Xiang Tan | 2014-08-21 | 1 | -9/+10 |
| | | | | |||||
| * | | | Fix some issues in 4.2 release notes. | Geoffrey ROGUELON | 2014-08-21 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | Remove duplicate line in Railties. [ci skip] | ||||
| * | | | Change 'does' to 'do' | Jake Worth | 2014-08-21 | 1 | -1/+1 |
| |/ / | |||||
| * | | [ci skip] Fixing spelling typo in testing guide. | Bradly Feeley | 2014-08-20 | 1 | -1/+1 |
| | | | |||||
| * | | Update configuring.md [ci skip] | Tee Parham | 2014-08-20 | 1 | -2/+0 |
| | | | | | | | Remove ActiveRecord config instructions for active_record.attribute_types_cached_by_default, which was removed in https://github.com/rails/rails/commit/66736c8e50585 | ||||
| * | | Fix a few typos/some grammar in Active Job Basics | Logan Hasson | 2014-08-20 | 1 | -8/+8 |
| | | | |||||
| * | | Same as f39cb2b except backport friendly | Zachary Scott | 2014-08-20 | 1 | -1/+4 |
| | | | | | | | | | Point release notes to stable branch for list of commits. [ci skip] | ||||
| * | | Same as f39cb2b except backport friendly | Zachary Scott | 2014-08-20 | 1 | -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 Scott | 2014-08-20 | 6 | -9/+15 |
| | | | |||||
| * | | Merge pull request #16582 from cristianbica/actionmailer-deprecate-deliver | Rafael Mendonça França | 2014-08-20 | 5 | -13/+40 |
| |\ \ | | | | | | | Deprecated ActionMailer .deliver and updated ActionMailer / ActiveJob docs/guide | ||||
| | * | | Updated rdoc / guides / release notes related to ActiveJob / ActionMailer | Cristian Bica | 2014-08-20 | 5 | -13/+40 |
| | | | | |||||
| * | | | Merge pull request #16583 from JuanitoFatas/doc/patch-1 | Rafael Mendonça França | 2014-08-20 | 1 | -16/+22 |
| |\ \ \ | |/ / |/| | | [ci skip] Format pass of Active Job Basics guide. | ||||
| | * | | [ci skip] Format pass of Active Job Basics guide. | Juanito Fatas | 2014-08-20 | 1 | -16/+22 |
| | | | | |||||
| * | | | Revert "Do not gsub non ASCII characters in header anchor.". | Juanito Fatas | 2014-08-20 | 2 | -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 Chan | 2014-08-19 | 1 | -1/+1 |
| | | | |||||
| * | | :nail_care: The note doesn't look good on the blue background [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -2/+2 |
| | | | |||||
| * | | :bomb: oops, it should be 4.2 that's WIP [ci skip] | Godfrey Chan | 2014-08-19 | 2 | -5/+4 |
| | | | |||||
| * | | Some placeholders for the 4.2 upgrade guide [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+16 |
| | | | |||||
| * | | Clearly mark these as WIP, and invite people to contribute. [ci skip] | Godfrey Chan | 2014-08-19 | 2 | -1/+6 |
| | | | |||||
| * | | List the 4.2 release notes in the index, mark it as WIP [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+5 |
| | | | |||||
| * | | Major features in 4.2 release notes [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+40 |
| | | | |||||
| * | | Synced AR release notes [ci-skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+18 |
| | | | |||||
| * | | Synced Active Support release notes [ci skip] | Godfrey Chan | 2014-08-19 | 1 | -0/+21 |
| | | | | | | | | | [Godfrey Chan, Genadi Samokovarov] | ||||
| * | | Fix setting simple values to the new config.x | Carlos Antonio da Silva | 2014-08-19 | 1 | -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 Chan | 2014-08-19 | 1 | -4/+16 |
| | | | | | | | | | Godfrey Chan, Genadi Samokovarov | ||||
| * | | 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 |
| | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |