aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Remove not needed begin..end from AR#saveCarlos Antonio da Silva2012-11-191-5/+3
* | | | Initialize accessors to remove some warnings in Ruby 2.0Carlos Antonio da Silva2012-11-192-7/+4
* | | | Merge pull request #8262 from senny/8229_correct_bundler_require_in_enginesRafael Mendonça França2012-11-192-3/+8
|\ \ \ \
| * | | | require bundler groups to include rake-tasks in enginesYves Senn2012-11-182-1/+6
| * | | | cleanup, remove whitspace from railties CHANGELOGYves Senn2012-11-181-2/+2
* | | | | Merge pull request #8256 from nalwayaabhishek/masterCarlos Antonio da Silva2012-11-191-3/+3
|\ \ \ \ \
| * | | | | displaying error message(p tag was missing) and adding output as comment Abhishek Nalwaya2012-11-191-3/+3
* | | | | | Refactor config abort message a bit for dbconsoleCarlos Antonio da Silva2012-11-182-8/+4
* | | | | | Fix rails db command with sqlite3 databaseCarlos Antonio da Silva2012-11-182-5/+13
* | | | | | 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 typeThomas Hollstegge2012-11-173-2/+31
* | | | | | | Merge pull request #8266 from CvX/index_renameRafael Mendonça França2012-11-183-0/+23
|\ \ \ \ \ \ \
| * | | | | | | 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::TestCaseCarlos Antonio da Silva2012-11-183-8/+10
| * | | | | | | Revert "Merge pull request #4575 from carlosantoniodasilva/remove-test-pending"Carlos Antonio da Silva2012-11-183-2/+22
|/ / / / / / /
* | | | | | | 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 "select" and "includes".Dieter Komendera2012-11-181-0/+13
| | |/ / / / | |/| | | |
* | | | | | 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]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 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 find_table_nameAlexey Muranov2012-11-171-0/+6
* | | | | 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.Steve Klabnik2012-11-171-0/+4
* | | | | | Merge pull request #8248 from zenspider/masterCarlos Antonio da Silva2012-11-172-5/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
|/ / / / /
* | | | | Merge pull request #8247 from rnesius/sqlserver-templateRafael Mendonça França2012-11-162-0/+62
|\ \ \ \ \
| * | | | | Adding sqlserver.yml template to satisfy "-d sqlserver" being givenRobert Nesius2012-11-162-0/+62
|/ / / / /
* | | | | Revert "Debugger gem doesn't work with patchlevel >= 327"Santiago Pastorino2012-11-161-2/+1
* | | | | 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
* | | | | Merge pull request #8244 from yahonda/mysql_ruby200Carlos Antonio da Silva2012-11-161-1/+1
|\ \ \ \ \
| * | | | | Revert "mysql does not build on Ruby 2.0.0 at the moment"Yasuo Honda2012-11-171-1/+1
* | | | | | Improve UpgradeSignatureToEncryptionCookieStore docsSantiago Pastorino2012-11-161-1/+14
|/ / / / /
* | | | / 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
|\ \ \ \
| * | | | copy edits and fixes [ci skip]Vijay Dev2012-11-175-8/+8