Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #8258 from kommen/eager_loading_with_select_test2 | Carlos Antonio da Silva | 2012-11-18 | 1 | -0/+13 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add test to ensure preloading works as expected with "group", "select" and "includes". | |||||
| * | | | | | Add test to ensure preloading works as expected with "select" and "includes". | Dieter Komendera | 2012-11-18 | 1 | -0/+13 | |
| | |/ / / | |/| | | | | | | | | | | | | | This didn't work in rails 3.1. See #2303 for more information and original pull request. | |||||
* | | | | | Merge pull request #8260 from sauliusg/improved_deprecation_notice | Rafael Mendonça França | 2012-11-18 | 1 | -4/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | Point user to strong_parameters as the new protection model [ci skip] | |||||
| * | | | | | Point user to strong_parameters as the new protection model [ci skip] | Saulius Grigaliunas | 2012-11-18 | 1 | -4/+6 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #8259 from senny/make_queued_message_autoloadable | Rafael Mendonça França | 2012-11-18 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | make ActionMailer::QueuedMessage autoloadable | |||||
| * | | | | make ActionMailer::QueuedMessage autoloadable | Yves Senn | 2012-11-18 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Upgrade mail dependency to 2.5.2 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Remove not used require and some useless test comments | Carlos Antonio da Silva | 2012-11-17 | 2 | -14/+3 | |
| | | | | ||||||
* | | | | Bump mysql gem version to the newly 2.9.0, fix build. | Carlos Antonio da Silva | 2012-11-17 | 2 | -2/+2 | |
| | | | | ||||||
* | | | | Upgrade mail dependency to 2.5.0 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Initialize #min_cost to avoid warning in Ruby 2.0 | Carlos Antonio da Silva | 2012-11-17 | 1 | -2/+3 | |
| | | | | ||||||
* | | | | Fix typo in module name and make #in_time_zone private | Carlos Antonio da Silva | 2012-11-17 | 3 | -3/+5 | |
| | | | | ||||||
* | | | | Extract #in_time_zone helper method duplication to a module | Carlos Antonio da Silva | 2012-11-17 | 3 | -24/+17 | |
| | | | | ||||||
* | | | | Simplify helper method in attribute methods test | Carlos Antonio da Silva | 2012-11-17 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | Remove return guard | Carlos Antonio da Silva | 2012-11-17 | 2 | -3/+1 | |
|/ / / | ||||||
* | | | Merge pull request #8251 from alexeymuranov/deprecate-removed-fixture-methods | Carlos Antonio da Silva | 2012-11-17 | 1 | -0/+6 | |
|\ \ \ | | | | | | | | | | | | | | | | | Add a deprecation before removing ActiveRecord::Fixtures::find_table_name Removed in e0ef0936193491689724880599ae26a8f5c2b5a6 | |||||
| * | | | Add a deprecation before removing find_table_name | Alexey Muranov | 2012-11-17 | 1 | -0/+6 | |
| | | | | | | | | | | | | The `ActiveRecord::Fixtures::find_table_name` method was removed from "master" almost a year ago, but it was never deprecated. Here it comes back, more dead than alive. | |||||
* | | | | Merge pull request #8249 from steveklabnik/add_two_oh_to_travis | Carlos Antonio da Silva | 2012-11-17 | 1 | -0/+4 | |
|\ \ \ \ | | | | | | | | | | | Add Ruby 2.0 to .travis.yml. | |||||
| * | | | | Add Ruby 2.0 to .travis.yml. | Steve Klabnik | 2012-11-17 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | @joshk said it's okay. :) | |||||
* | | | | | Merge pull request #8248 from zenspider/master | Carlos Antonio da Silva | 2012-11-17 | 2 | -5/+8 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Removed extra call to #diff in #assert_recognizes | |||||
| * | | | | Please use assert_equal instead of diff directly | Ryan Davis | 2012-11-17 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Removed extra call to #diff in #assert_recognizes. assert_equal calls it for ↵ | Ryan Davis | 2012-11-17 | 1 | -4/+7 | |
|/ / / / | | | | | | | | | | | | | you and shows the diff. Also delayed message calculation so the cost of the diff on success is now gone. | |||||
* | | | | Merge pull request #8247 from rnesius/sqlserver-template | Rafael Mendonça França | 2012-11-16 | 2 | -0/+62 | |
|\ \ \ \ | | | | | | | | | | | Adding sqlserver.yml template to satisfy "-d sqlserver" | |||||
| * | | | | Adding sqlserver.yml template to satisfy "-d sqlserver" being given | Robert Nesius | 2012-11-16 | 2 | -0/+62 | |
|/ / / / | | | | | | | | | | | | | invocations of "rails new". | |||||
* | | | | Revert "Debugger gem doesn't work with patchlevel >= 327" | Santiago Pastorino | 2012-11-16 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit 0ecd4640664c4723323d6fff5760dc4d833d7eb9. | |||||
* | | | | Fix some AR changelog entries [ci skip] | Carlos Antonio da Silva | 2012-11-16 | 1 | -6/+5 | |
| | | | | ||||||
* | | | | Test for has_many bug on unsaved records | George Brocklehurst | 2012-11-16 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | See issue #7950. | |||||
* | | | | Merge pull request #8244 from yahonda/mysql_ruby200 | Carlos Antonio da Silva | 2012-11-16 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Now mysql gem can be built on ruby 2.0.0-preview1 | |||||
| * | | | | Revert "mysql does not build on Ruby 2.0.0 at the moment" | Yasuo Honda | 2012-11-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8d8fd13179cacd86f307e87396474bdfab9f3462. mysql 2.8.1 gem can be built on ruby 2.0.0-preview1. | |||||
* | | | | | Improve UpgradeSignatureToEncryptionCookieStore docs | Santiago Pastorino | 2012-11-16 | 1 | -1/+14 | |
|/ / / / | | | | | | | | | | | | | | | | | I suck at English, please help me reviewing this <3 <3 <3 [ci skip] | |||||
* | | | | Remove old comments about using our own sdoc fork [ci skip] | Vijay Dev | 2012-11-17 | 1 | -4/+0 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 61 | -957/+959 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | |||||
| * | | | | copy edits and fixes [ci skip] | Vijay Dev | 2012-11-17 | 5 | -8/+8 | |
| | | | | | ||||||
| * | | | | remove kindle link from guides index [ci skip] | Vijay Dev | 2012-11-17 | 1 | -3/+1 | |
| | | | | | ||||||
| * | | | | Revert "Switch to 1.9 hash syntax" | Vijay Dev | 2012-11-17 | 1 | -10/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d8596c4b8500a899d686c57fa093c549b0378c7a. Reason: too many mistakes [ci skip] | |||||
| * | | | | Revert "add AR deep dive video links to guides" | Vijay Dev | 2012-11-17 | 1 | -15/+0 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 25648ce35b9d8df9fac81c1d53c45aaeef08fde9. | |||||
| * | | | | Switch to 1.9 hash syntax (guides) | Agis Anastasopoulos | 2012-11-16 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Switch to 1.9 hash syntax (guides) | Agis Anastasopoulos | 2012-11-16 | 1 | -16/+16 | |
| | | | | | ||||||
| * | | | | Update the middleware stack to reflect the current Rails output | Agis Anastasopoulos | 2012-11-16 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | Specifically, remove `ActionDispatch::Head` in favor of `Rack::Head`. | |||||
| * | | | | Remove unnecessary whitespace | Agis Anastasopoulos | 2012-11-16 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Add link to the Application Templates guide | Agis Anastasopoulos | 2012-11-16 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Remove unnecessary whitespace | Agis Anastasopoulos | 2012-11-16 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Switch to 1.9 hash syntax (guides) | Agis Anastasopoulos | 2012-11-16 | 1 | -8/+8 | |
| | | | | | ||||||
| * | | | | Switch to 1.9 hash syntax (guides) | Agis Anastasopoulos | 2012-11-16 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Switch to 1.9 hash syntax | Agis Anastasopoulos | 2012-11-16 | 1 | -22/+22 | |
| | | | | | ||||||
| * | | | | Switch to 1.9 hash syntax | Agis Anastasopoulos | 2012-11-16 | 1 | -81/+78 | |
| | | | | | ||||||
| * | | | | Add a consideration note | Agis Anastasopoulos | 2012-11-16 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | regarding linking to Kindle | |||||
| * | | | | Switch to 1.9 hash syntax & remove some parentheses when it reads nicer | Agis Anastasopoulos | 2012-11-16 | 1 | -33/+33 | |
| | | | | | ||||||
| * | | | | Add a consideration note and a WIP note | Agis Anastasopoulos | 2012-11-16 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | Remove the ActiveRecordHelper section | Agis Anastasopoulos | 2012-11-16 | 1 | -56/+0 | |
| | | | | | | | | | | | | | | | Since ActionView::Helpers::ActiveRecordHelper is removed. |