aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6906 from kennyj/extract_collationRafael Mendonça França2012-06-308-8/+88
|\ | | | | Extract collation tasks to database tasks.
| * Extract collation tasks to database tasks.kennyj2012-07-018-8/+88
| |
* | Merge pull request #6869 from bcardarella/active_relation_inspectJon Leighton2012-06-303-5/+5
|\| | | | | Remove ActiveRelation#inspect
| * Remove ActiveRelation#inspectBrian Cardarella2012-06-293-5/+5
|/
* make sure the inflection rules are loaded when cherry-picking ↵Xavier Noria2012-06-293-0/+5
| | | | active_support/core_ext/string/inflections.rb [fixes #6884]
* Fix failing test in file update checkerCarlos Antonio da Silva2012-06-291-2/+3
| | | | | | | | Introduced in 1abe31670fdad2c357b4356b40a4567a46d16693 The test was failing when running on isolation, because the extensions were not being loaded, thus 1.year.from_now was failing. Just use mktime instead, adding 1 year to Time.now.
* Remove another missing test related to draw external routesCarlos Antonio da Silva2012-06-291-10/+0
| | | | Related with 5e7d6bb
* Remove more tests related to draw external routes filesRafael Mendonça França2012-06-294-53/+1
| | | | Related with 5e7d6bba79393de0279917f93b82f3b7b176f4b5
* Merge pull request #6911 from abonec/masterJosé Valim2012-06-292-1/+17
|\ | | | | Bug with FileUpdateChecker with wrong mtime
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b. Usage of this feature did not reveal any improvement in existing apps. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb guides/source/routing.textile railties/lib/rails/engine.rb railties/lib/rails/paths.rb railties/test/paths_test.rb
* | Remove unused responsibilities and add a few load definitions to enginesJosé Valim2012-06-295-148/+141
|/ | | | | | | | Since plugins were removed, we can clean up a few methods in engines. We also use this opportunity to move `load_console`, `load_tasks` and `load_runner` to Rails::Engine. This means that, if someone wants to improve script/rails for engines to support console or runner commands, part of the work is already done.
* 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 a changelog entry about fda24312d3.
| * 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 conventions
| * 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 URI in ConnectionSpecification
| * 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 for postgresql
| * 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 active record from method
| * 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
| | | | | | | | | | | Since composed_of was removed in 051747449e7afc817c599e4135bc629d4de064eb, these tests were working "by mistake", due to the matching "address" string in the error message, but with a different error message than the expected multiparameter assignment error. Since "address" is not an attribute from Customer anymore, the error was "undefined method klass for nil", where nil was supposed to be the column object.
* Move newly added multiparameter tests to base_test fileCarlos Antonio da Silva2012-06-282-35/+36
| | | | | All other multiparameter assignment tests are in the same file, so it makes sense to have all of them here.
* 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 for Oracle database
| * Skip test_setting_time_attribute because Oracle databaseYasuo Honda2012-06-281-0/+2
|/ | | | does not have TIME data type.
* 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_key
| * Speed up Hash#transform_keys using Hash#each_keyGrant Hutchins2012-06-271-1/+1
|/ | | See https://gist.github.com/3007749 for justification
* Merge pull request #6878 from masarakki/masterRafael Mendonça França2012-06-275-0/+41
|\ | | | | | | | | fix bug in limit of enum columns of mysql Closes #6432
| * 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
| * Fixes #6825, adds tests covering cases and error possibilities, also changes ↵Mauricio Linhares2012-06-273-16/+58
|/ | | | SQLite3 driver to correctly generate a time column instead of datetime
* Add changelog entry for polymorphic option in model generatorCarlos Antonio da Silva2012-06-271-0/+10
| | | | | Pull request #6856, merged in 52f6e47682003c83b0466bf5e140ee302498a226. [ci skip]
* Merge pull request #6880 from kennyj/fix_20120628Carlos Antonio da Silva2012-06-272-2/+2
|\ | | | | Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task.
| * 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 generator For instance, $ rails g model Product supplier:references{polymorphic} generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration.
| * | Add polymorphic option to model generatorAleksey Magusev2012-06-274-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For instance, $ rails g model Product supplier:references{polymorphic} generate model with `belongs_to :supplier, polymorphic: true` association and appropriate migration. Also fix model_generator_test.rb#L196 and #L201
* | | 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 adapter
| * | Address test_basic_model test error with Oracle enhanced adapterYasuo Honda2012-06-271-1/+1
|/ / | | | | | | which ids start from 1000 as a default.
* | Merge pull request #6863 from bcardarella/asyn-actionmailer-guidesXavier Noria2012-06-261-0/+31
|\ \ | | | | | | Guide update for Async ActionMailer
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're dealing with a new array instance, it's safe to use map! and we avoid an extra array object. Also remove the symbolize_keys! from AttributeMethodMatcher, since it's an internal class that always receives symbol keys from the prefix/suffix methods implementations.
* | | Use default + merge! instead of reverse_mergeCarlos Antonio da Silva2012-06-261-1/+1
| | | | | | | | | | | | | | | Since we're not directly requiring the reverse_merge extension, we can avoid another hash creation by using default_hash.merge! instead.
* | | Set hash value instead of merge a single key, and use flatten! if possibleCarlos Antonio da Silva2012-06-262-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | There's no need to create two extra hashes with options.merge(another_hash), with the goal of setting only one value, so lets just set it. Also refactor validates_each to use _merge_attributes, like other validates_* helpers do.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:28:04 +0000