aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix rails db command with sqlite3 databaseCarlos Antonio da Silva2012-11-182-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | When using sqlite3 it was attempting to find the database file based on Rails.root, the problem is that Rails.root is not always present because we try to first manually load "config/database.yml" instead of loading the entire app, to make "rails db" faster. This means that when we're in the root path of the app, calling "rails db" won't allow us to use Rails.root, making the command fail for sqlite3 with the error: ./rails/commands/dbconsole.rb:62:in `start': undefined method `root' for Rails:Module (NoMethodError) The fix is to simply not pass any dir string to File.expand_path, which will make it use the current directory of the process as base, or the root path of the app, which is what we want. When we are in any other subdirectory, calling "rails db" should work just fine, because "config/database.yml" won't be found, thus "rails db" will fallback to loading the app, making Rails.root available. Closes #8257.
* Merge pull request #3023 from Tho85/preserve_sti_typeRafael Mendonça França2012-11-183-2/+31
|\ | | | | | | | | | | | | AR::Base.becomes should not change the STI type Conflicts: activerecord/CHANGELOG.md
| * AR::Base.becomes should not change the STI typeThomas Hollstegge2012-11-173-2/+31
| | | | | | | | If you want to change the STI type too, use AR::Base.becomes! instead
* | Merge pull request #8266 from CvX/index_renameRafael Mendonça França2012-11-183-0/+23
|\ \ | | | | | | Add rename_index to change_table.
| * | Add rename_index to change_table.Jarek Radosz2012-11-193-0/+23
|/ /
* | Merge branch 'deprecate-pending'Carlos Antonio da Silva2012-11-184-2/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | Properly deprecate #pending from AS::TestCase. This has been previously removed from master, and is now back with a deprecation instead, to avoid people having tests breaking when upgrading an app. Please check #4575 for more background.
| * | Properly deprecate #pending from AS::TestCaseCarlos Antonio da Silva2012-11-183-8/+10
| | | | | | | | | | | | Check https://github.com/rails/rails/pull/4575#issuecomment-5765575.
| * | Revert "Merge pull request #4575 from carlosantoniodasilva/remove-test-pending"Carlos Antonio da Silva2012-11-183-2/+22
|/ / | | | | | | | | | | | | | | | | This reverts commit 1620df78dff527b4fa3f7b204fa05d1b630aae17, reversing changes made to 2d000328dfc0d4b297fb4bdcebc9af6c2fb559dc. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/test_case.rb
* | Ensure ordering to make the test pass with postgresqlCarlos Antonio da Silva2012-11-181-4/+5
| |
* | Merge pull request #8258 from kommen/eager_loading_with_select_test2Carlos Antonio da Silva2012-11-181-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 Komendera2012-11-181-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_noticeRafael Mendonça França2012-11-181-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 Grigaliunas2012-11-181-4/+6
| |/ /
* | | Merge pull request #8259 from senny/make_queued_message_autoloadableRafael Mendonça França2012-11-181-0/+1
|\ \ \ | |/ / |/| | make ActionMailer::QueuedMessage autoloadable
| * | make ActionMailer::QueuedMessage autoloadableYves Senn2012-11-181-0/+1
|/ /
* | Upgrade mail dependency to 2.5.2Mikel Lindsaar2012-11-181-1/+1
| |
* | Remove not used require and some useless test commentsCarlos Antonio da Silva2012-11-172-14/+3
| |
* | Bump mysql gem version to the newly 2.9.0, fix build.Carlos Antonio da Silva2012-11-172-2/+2
| |
* | Upgrade mail dependency to 2.5.0Mikel Lindsaar2012-11-181-1/+1
| |
* | Initialize #min_cost to avoid warning in Ruby 2.0Carlos Antonio da Silva2012-11-171-2/+3
| |
* | Fix typo in module name and make #in_time_zone privateCarlos Antonio da Silva2012-11-173-3/+5
| |
* | Extract #in_time_zone helper method duplication to a moduleCarlos Antonio da Silva2012-11-173-24/+17
| |
* | Simplify helper method in attribute methods testCarlos Antonio da Silva2012-11-171-3/+1
| |
* | Remove return guardCarlos Antonio da Silva2012-11-172-3/+1
|/
* Merge pull request #8251 from alexeymuranov/deprecate-removed-fixture-methodsCarlos Antonio da Silva2012-11-171-0/+6
|\ | | | | | | | | Add a deprecation before removing ActiveRecord::Fixtures::find_table_name Removed in e0ef0936193491689724880599ae26a8f5c2b5a6
| * Add a deprecation before removing find_table_nameAlexey Muranov2012-11-171-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_travisCarlos Antonio da Silva2012-11-171-0/+4
|\ \ | | | | | | Add Ruby 2.0 to .travis.yml.
| * | Add Ruby 2.0 to .travis.yml.Steve Klabnik2012-11-171-0/+4
| | | | | | | | | | | | @joshk said it's okay. :)
* | | Merge pull request #8248 from zenspider/masterCarlos Antonio da Silva2012-11-172-5/+8
|\ \ \ | |_|/ |/| | Removed extra call to #diff in #assert_recognizes
| * | Please use assert_equal instead of diff directlyRyan Davis2012-11-171-1/+1
| | |
| * | Removed extra call to #diff in #assert_recognizes. assert_equal calls it for ↵Ryan Davis2012-11-171-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-templateRafael Mendonça França2012-11-162-0/+62
|\ \ | | | | | | Adding sqlserver.yml template to satisfy "-d sqlserver"
| * | Adding sqlserver.yml template to satisfy "-d sqlserver" being givenRobert Nesius2012-11-162-0/+62
|/ / | | | | | | invocations of "rails new".
* | Revert "Debugger gem doesn't work with patchlevel >= 327"Santiago Pastorino2012-11-161-2/+1
| | | | | | | | This reverts commit 0ecd4640664c4723323d6fff5760dc4d833d7eb9.
* | Fix some AR changelog entries [ci skip]Carlos Antonio da Silva2012-11-161-6/+5
| |
* | Test for has_many bug on unsaved recordsGeorge Brocklehurst2012-11-161-0/+7
| | | | | | | | See issue #7950.
* | Merge pull request #8244 from yahonda/mysql_ruby200Carlos Antonio da Silva2012-11-161-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 Honda2012-11-171-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 8d8fd13179cacd86f307e87396474bdfab9f3462. mysql 2.8.1 gem can be built on ruby 2.0.0-preview1.
* | | Improve UpgradeSignatureToEncryptionCookieStore docsSantiago Pastorino2012-11-161-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 Dev2012-11-171-4/+0
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-1761-957/+959
|\ \ | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * | copy edits and fixes [ci skip]Vijay Dev2012-11-175-8/+8
| | |
| * | remove kindle link from guides index [ci skip]Vijay Dev2012-11-171-3/+1
| | |
| * | Revert "Switch to 1.9 hash syntax"Vijay Dev2012-11-171-10/+11
| | | | | | | | | | | | | | | | | | This reverts commit d8596c4b8500a899d686c57fa093c549b0378c7a. Reason: too many mistakes [ci skip]
| * | Revert "add AR deep dive video links to guides"Vijay Dev2012-11-171-15/+0
| | | | | | | | | | | | This reverts commit 25648ce35b9d8df9fac81c1d53c45aaeef08fde9.
| * | Switch to 1.9 hash syntax (guides)Agis Anastasopoulos2012-11-161-4/+4
| | |
| * | Switch to 1.9 hash syntax (guides)Agis Anastasopoulos2012-11-161-16/+16
| | |
| * | Update the middleware stack to reflect the current Rails outputAgis Anastasopoulos2012-11-161-2/+2
| | | | | | | | | Specifically, remove `ActionDispatch::Head` in favor of `Rack::Head`.
| * | Remove unnecessary whitespaceAgis Anastasopoulos2012-11-161-1/+1
| | |
| * | Add link to the Application Templates guideAgis Anastasopoulos2012-11-161-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 11:28:18 +0000