aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #6911 from abonec/masterJosé Valim2012-06-292-1/+17
|\ \ \ \ \
| * | | | | fix FileUpdateChecker when file has wrong mtime (from future)abonec2012-06-292-1/+17
| | |_|_|/ | |/| | |
* | | | | Revert "Allow loading external route files from the router"José Valim2012-06-2910-149/+6
* | | | | Remove unused responsibilities and add a few load definitions to enginesJosé Valim2012-06-295-148/+141
|/ / / /
* | | | Remove unnecessary Railties structure now that plugins are goneJosé Valim2012-06-295-121/+85
* | | | Depend on thor 0.15.4José Valim2012-06-291-1/+1
* | | | Rename RouteInspect to RoutesInspector for consistencyJosé Valim2012-06-294-7/+7
* | | | Merge pull request #6905 from kennyj/add_changelog_entry_20120629Santiago Pastorino2012-06-291-0/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Added an entry about fda24312d3 in the CHANGELOG.kennyj2012-06-291-0/+15
|/ / /
* | | Merge pull request #6902 from frodsan/mailer_async_docCarlos Antonio da Silva2012-06-282-31/+33
|\ \ \
| * | | fix ActionMailer::Async docs and update to follow coding conventionsFrancesco Rodriguez2012-06-282-31/+33
|/ / /
* | | Merge pull request #6900 from cbandy/issue-6898Carlos Antonio da Silva2012-06-281-0/+2
|\ \ \
| * | | Require URIChris Bandy2012-06-281-0/+2
|/ / /
* | | Merge pull request #6895 from kennyj/support_collate_for_postgresqlRafael Mendonça França2012-06-284-1/+40
|\ \ \
| * | | Support collate and ctype on the PostgreSQL.kennyj2012-06-294-1/+40
|/ / /
* | | Merge pull request #6894 from subbarao/masterRafael Mendonça França2012-06-281-2/+2
|\ \ \
| * | | fixing typo in from documentationSubba Rao Pasupuleti2012-06-281-2/+2
|/ / /
* | | Remove some aggregation tests related to composed_ofCarlos Antonio da Silva2012-06-282-21/+0
* | | Move newly added multiparameter tests to base_test fileCarlos Antonio da Silva2012-06-282-35/+36
* | | Bump minitest to 3.2.0Santiago Pastorino2012-06-281-1/+1
* | | Merge pull request #6890 from yahonda/address_test_setting_time_attribute_oracleCarlos Antonio da Silva2012-06-281-0/+2
|\ \ \
| * | | Skip test_setting_time_attribute because Oracle databaseYasuo Honda2012-06-281-0/+2
|/ / /
* | | Merge pull request #6886 from nertzy/faster_stringify_and_symbolize_keysCarlos Antonio da Silva2012-06-271-1/+1
|\ \ \
| * | | Speed up Hash#transform_keys using Hash#each_keyGrant Hutchins2012-06-271-1/+1
|/ / /
* | | Merge pull request #6878 from masarakki/masterRafael Mendonça França2012-06-275-0/+41
|\ \ \
| * | | fix: limit of enum columns of mysqlYamada Masaki2012-06-285-0/+41
|/ / /
* | | Merge pull request #6873 from mauricio/fix-for-6825Rafael Mendonça França2012-06-273-16/+58
|\ \ \ | |_|/ |/| |
| * | Fixes #6825, adds tests covering cases and error possibilities, also changes ...Mauricio Linhares2012-06-273-16/+58
|/ /
* | Add changelog entry for polymorphic option in model generatorCarlos Antonio da Silva2012-06-271-0/+10
* | Merge pull request #6880 from kennyj/fix_20120628Carlos Antonio da Silva2012-06-272-2/+2
|\ \
| * | Fix wrong environment. env should be RAILS_ENV or test.kennyj2012-06-281-1/+1
| * | Fix wrong testcase. This is a testcase for db:test:prepare.kennyj2012-06-281-1/+1
* | | Merge pull request #6856 from lexmag/polymorphic_generatorsCarlos Antonio da Silva2012-06-274-14/+42
|\ \ \
| * | | Add polymorphic option to model generatorAleksey Magusev2012-06-274-14/+42
* | | | Merge pull request #6879 from yahonda/address_basic_inclusion_model_test_oracleRafael Mendonça França2012-06-271-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Address test_basic_model test error with Oracle enhanced adapterYasuo Honda2012-06-271-1/+1
|/ / /
* | | Merge pull request #6863 from bcardarella/asyn-actionmailer-guidesXavier Noria2012-06-261-0/+31
|\ \ \
| * | | Guide update for Async ActionMailerBrian Cardarella2012-06-261-0/+31
* | | | Refactor attribute method matcher to use Hash#fetchCarlos Antonio da Silva2012-06-261-5/+3
* | | | Cleanup attribute methods a bit, use map! when accepting *argsCarlos Antonio da Silva2012-06-261-17/+12
* | | | Use default + merge! instead of reverse_mergeCarlos Antonio da Silva2012-06-261-1/+1
* | | | Set hash value instead of merge a single key, and use flatten! if possibleCarlos Antonio da Silva2012-06-262-4/+5
* | | | Ensure Array#to_sentence does not modify given hashCarlos Antonio da Silva2012-06-263-8/+14
* | | | Merge pull request #6870 from erichmenge/patch/base_test_oracleRafael Mendonça França2012-06-261-20/+8
|\ \ \ \
| * | | | Setup each test with default ActiveRecord timezone settings to ensure each te...Erich Menge2012-06-261-20/+8
|/ / / /
* | | | Remove file added by mistake at 88230b7cf77181c2088cce3314493caa9b3ac1fbRafael Mendonça França2012-06-261-1/+0
* | | | Merge pull request #6859 from bogdan/deprecate_monkey_patchJosé Valim2012-06-265-1/+23
|\ \ \ \
| * | | | AS::Callbacks: deprecate monkey patch codeBogdan Gusiev2012-06-265-1/+23
* | | | | Merge pull request #6858 from amatsuda/av_no_such_method_update_detailsJosé Valim2012-06-261-2/+1
|\ \ \ \ \
| * | | | | :update_details method no more exists on @lookup_contextAkira Matsuda2012-06-261-2/+1
| |/ / / /