aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #9945 from vipulnsward/drop_var_in_validationsCarlos Antonio da Silva2013-03-271-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | drop variable assignment in validationsVipul A M2013-03-271-2/+1
|/ / / /
* | | | Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstore_testRafael Mendonça França2013-03-261-15/+5
|\ \ \ \
| * | | | Combine tests and restore columns dropped by hstore testingMack Earnhardt2013-03-261-15/+5
* | | | | Merge pull request #9928 from vipulnsward/fix_rename_auto_increment_mysqlRafael Mendonça França2013-03-266-11/+27
|\ \ \ \ \
| * | | | | respect auto_increment in rename_column for mysqlVipul A M2013-03-276-11/+27
* | | | | | Merge pull request #9939 from dchapman1988/masterRafael Mendonça França2013-03-261-1/+1
|\ \ \ \ \ \
| * | | | | | s/and and run/and runs/David Chapman2013-03-261-1/+1
|/ / / / / /
* | | | | | Merge pull request #9937 from zolzaya/masterRafael Mendonça França2013-03-261-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed timezone mapping of Ulaanbaatar.Zolzaya2013-03-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #9923 from danmcclain/psql-concurrent-indexesRafael Mendonça França2013-03-269-35/+86
|\ \ \ \ \ \
| * | | | | | Checks :algorithm argument for valid valuesDan McClain2013-03-264-1/+18
| * | | | | | Adds support for concurrent indexing in PostgreSQL adapterDan McClain2013-03-259-35/+69
| |/ / / / /
* | | | | | Merge pull request #9930 from kennyj/bump_tzinfoSantiago Pastorino2013-03-252-2/+2
|\ \ \ \ \ \
| * | | | | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.kennyj2013-03-262-2/+2
* | | | | | | default RAILS_ENV to test if we're in a test taskAaron Patterson2013-03-251-0/+4
| |/ / / / / |/| | | | |
* | | | | | Fix typoRafael Mendonça França2013-03-251-1/+1
* | | | | | Merge pull request #9925 from senny/relative_guide_linksSteve Klabnik2013-03-253-18/+26
|\ \ \ \ \ \
| * | | | | | use relative links inside guides [ci skip]Yves Senn2013-03-253-18/+26
* | | | | | | The sql_type method called here is fromRafael Mendonça França2013-03-252-7/+6
* | | | | | | Merge pull request #9920 from senny/clean_up_testing_examples_for_action_mailerSteve Klabnik2013-03-252-36/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | move mailer testing examples into the testing guide.Yves Senn2013-03-252-36/+26
* | | | | | | Merge pull request #7324 from MSch/pg-geometricRafael Mendonça França2013-03-256-12/+77
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Move away from column.sql_type in untested code tooMartin Schürrer2013-03-251-5/+6
| * | | | | | Make Postgres point type correspond to ruby array with two floats insideMartin Schürrer2013-03-256-8/+72
|/ / / / / /
* | | | | | Created a layer of abstraction for the valid type checking in schema dumper. ...Ranjay Krishna2013-03-257-1/+40
* | | | | | Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5Rafael Mendonça França2013-03-251-0/+10
|\ \ \ \ \ \
| * | | | | | Skipping test for OpenSSL::PKCS5 JRubyArun Agrawal2013-03-251-0/+10
* | | | | | | Merge pull request #8527 from shockone/patch-1Rafael Mendonça França2013-03-253-0/+39
|\ \ \ \ \ \ \
| * | | | | | | Add a method full_messages_for to the Errors classshock_one2013-03-243-0/+39
* | | | | | | | Merge pull request #9864 from vipulnsward/fix_test_AR_v2Rafael Mendonça França2013-03-253-2/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add Error#full_message test; Fix typosVipul A M2013-03-223-2/+3
* | | | | | | | Merge pull request #9918 from prathamesh-sonpatki/railties-typosSteve Klabnik2013-03-252-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed typo in railties/testPrathamesh Sonpatki2013-03-252-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #9916 from neerajdotname/no-exception-when-cookie-is-tampe...Rafael Mendonça França2013-03-251-4/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | if cookie is tampered with then nil is returned [ci skip]Neeraj Singh2013-03-251-4/+2
|/ / / / / / /
* | | | | | | Merge pull request #9914 from prathamesh-sonpatki/controller-pluralizeXavier Noria2013-03-251-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Controller name pluralizedPrathamesh Sonpatki2013-03-251-2/+2
|/ / / / / / /
* | | | | | | Fix jquery-as-default test to account for switch from gem to github source in...Jeremy Kemper2013-03-251-1/+1
* | | | | | | Update tests for #9704, named route collisionsJeremy Kemper2013-03-242-6/+7
* | | | | | | Tender love for #9909 :heart:Jeremy Kemper2013-03-241-1/+1
* | | | | | | Merge pull request #9909 from trevorturk/9740Jeremy Kemper2013-03-245-100/+171
|\ \ \ \ \ \ \
| * | | | | | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing sign...Trevor Turk2013-03-245-100/+171
* | | | | | | | Merge pull request #9881 from gkop/masterJeremy Kemper2013-03-243-16/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Put coffee-rails in top-level of generated GemfileGabe Kopley2013-03-243-16/+43
|/ / / / / / / /
* | | | | | | | Merge pull request #9912 from rwz/jbuilder-bumpGuillermo Iguaran2013-03-241-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Relaxed jbuilder dependency and bumped version numberPavel Pravosud2013-03-251-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #9489 from obrie/fix/overridden_defaults_changed_attributesJeremy Kemper2013-03-242-3/+19
|\ \ \ \ \ \ \
| * | | | | | | Fix ActiveRecord locking column defaults not getting persistedAaron Pfeifer2013-03-182-3/+19
* | | | | | | | Merge pull request #9704 from trevorturk/warn-about-skipped-routesJeremy Kemper2013-03-244-35/+34
|\ \ \ \ \ \ \ \