aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125Rafael Mendonça França2012-06-111-1/+1
|\ | | | | current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6
| * current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6Akira Matsuda2012-06-121-1/+1
| |
* | Merge pull request #6708 from ↵José Valim2012-06-111-1/+1
|\ \ | | | | | | | | | | | | amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted ignore .gitignore'd files in rake test:uncomitted
| * | ignore .gitignore'd files in rake test:uncomittedAkira Matsuda2012-06-121-1/+1
| |/
* | Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fixRafael Mendonça França2012-06-111-1/+1
|\ \ | | | | | | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9
| * | TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9Akira Matsuda2012-06-121-1/+1
| |/
* | Merge pull request #6705 from ganeshkumar/string_method_changesRafael Mendonça França2012-06-112-8/+8
|\ \ | | | | | | both string and symbol will be interpolated as string no need to convert to_s
| * | both string and sumbol will be interpolated as string no need to convert to_sganesh2012-06-112-8/+8
| | |
* | | Merge pull request #6704 from amatsuda/lambda_respond_to_bindingJosé Valim2012-06-111-43/+39
|\ \ \ | |/ / |/| | Proc always respond_to :binding
| * | Proc always respond_to :bindingAkira Matsuda2012-06-121-43/+39
| |/
* | Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-112-1/+12
|\ \ | |/ |/| Fix: 'rake rails:templates:copy' doesn't work
| * Added a testcase for #6690.kennyj2012-06-121-0/+11
| |
| * fix stylesheet template dirSugino Yasuhiro2012-06-091-1/+1
| |
* | Merge pull request #6699 from ↵Rafael Mendonça França2012-06-111-1/+1
|\ \ | | | | | | | | | | | | | | | takkanm/fix-character-class-duplicated-range-warning fix warning in Ruby2.0.0
| * | fix warning in Ruby2.0.0takkanm2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | ``` rails/activesupport/lib/active_support/multibyte/chars.rb:136: warning: character class has duplicated range: /\b('?[\S])/ ```
* | | Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-102-2/+2
|\ \ \ | |/ / |/| | Address ORA-00911 errors because of the heading underscore.
| * | Address ORA-00911 errors because of the heading underscore.Yasuo Honda2012-06-112-2/+2
|/ /
* | Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-102-1/+8
|\ \ | | | | | | Fix that #exists? can blow up with ThrowResult exception
| * | Fix that #exists? raises ThrowResult when called with an empty limitedBen Woosley2012-06-102-1/+8
|/ / | | | | | | | | | | | | | | | | reflection. ActiveRecord::FinderMethods#construct_limited_ids_condition will raise ThrowResult if the limited reflection comes back empty. The other callers of #construct_limited_ids_condition handle this exception (more specifically, the callers of construct_relation_for*), but #exists? didn't until now.
* | Remove bundle exec from the exception messageRafael Mendonça França2012-06-101-1/+1
| |
* | Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-102-1/+7
| | | | | | | | | | | | | | | | This behavior was added in be4ecdcc87984e9421ff5d5c90d33f475e0fbc01. Closes #1139. Fixes #2553, #1141, #1623 and #2062.
* | Minimal change to query generation of exists? that makes SQLServer and ↵iaddict2012-06-101-1/+1
| | | | | | | | | | | | | | others happy that do not work without a column alias. Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
* | Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
|\ \ | | | | | | Fix #6635. We should call Scoping methods, before calling Array methods.
| * | Fix #6635. We should call Scoping methods, before calling Array methods.kennyj2012-06-102-5/+14
| | |
* | | Ensure that mass assignment options are preservedAndrew White2012-06-104-11/+55
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two possible scenarios where the @mass_assignment_options instance variable can become corrupted: 1. If the assign_attributes doesn't complete correctly, then subsequent calls to a nested attribute assignment method will use whatever options were passed to the previous assign_attributes call. 2. With nested assign_attributes calls, the inner call will overwrite the current options. This will only affect nested attributes as the attribute hash is sanitized before any methods are called. To fix this we save the current options in a local variable and then restore these options in an ensure block.
* | Merge pull request #6694 from arunagw/build_fix_masterJosé Valim2012-06-101-1/+1
|\ \ | | | | | | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fba
| * | Build fix broken here 03f2249153ae4d2078646e6796d8b9e5ef747fbaArun Agrawal2012-06-101-1/+1
|/ /
* | Merge pull request #6692 from schneems/schneems/something-went-wrongJosé Valim2012-06-102-0/+2
|\ \ | | | | | | Add Prompt to 404 & 500 Pages to Check Logs in Production
| * | add prompt to 404 & 500 pages to check logsschneems2012-06-092-0/+2
| | | | | | | | | When new programmers push their code to a production server and receive an error they often don't know to check the logs, this simple reminder will help. Most professional applications have custom error pages so this change shouldn't affect them. The wording of the message should not confuse non-developer visitors.
* | | Use . instead of :: for class methods, add CHANGELOG entriesJosé Valim2012-06-105-5/+10
| | |
* | | Merge pull request #6665 from schneems/schneems/raise-migration-errorJosé Valim2012-06-106-0/+74
|\ \ \ | | | | | | | | Notify A User they Have Pending Migrations
| * | | test errors for pending migrationsschneems2012-06-091-0/+15
| | | | | | | | | | | | App should raise error on page_load
| * | | raise error for pending migration schneems2012-06-095-4/+40
| | | | | | | | | | | | can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications.
| * | | add convenience methods for checking migrationsschneems2012-06-032-0/+23
| | | | | | | | | | | | if a rails project needs to be migrated ActiveRecord::Migrator.needs_migration? will be true or false if the current version matches the last version.
* | | | Merge pull request #6683 from stevecj/fix-fragile-assert-queriesRafael Mendonça França2012-06-095-25/+37
|\ \ \ \ | | | | | | | | | | Fix fragile #assert_queries implementation and usages.
| * | | | Fix fragile #assert_queries implementation and usages.Steve Jorgensen2012-06-095-25/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several tests that passed when run in the order they are loaded by rake test were failing when run in different sequences due to problems with the implementation of assert_queries and assert_no_queries as well as incorrect assumptions made about how many queries might be executed by a database adapter in various cases.
* | | | | removes the obsolete require_association method from dependenciesXavier Noria2012-06-103-21/+7
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This is an obsolete method from the very early days, apparently it was used circa 2004 because STI support was not smart enough. This method is not public interface, and we are heading a major version, so removal seems right.
* | | | Remove conditional committed by accidentSantiago Pastorino2012-06-091-1/+1
| | | |
* | | | Use each_with_object instead of each hereSantiago Pastorino2012-06-092-4/+4
| | | |
* | | | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
| |_|/ |/| | | | | | | | ActiveRecord#attributes optimization: minimize objects created
* | | Fix tests, active_authorizer shouldn't include blank valuesPiotr Sarnacki2012-06-091-1/+1
|/ / | | | | | | Fix for a test failing after: 00ff0a6776
* | Merge pull request #6668 from pomnikita/masterPiotr Sarnacki2012-06-082-1/+7
|\ \ | | | | | | Compact array of values added to PermissionSet instance
| * | Compact array of values added to PermissionSet instanceNikita Pomyashchiy2012-06-082-1/+7
| | |
* | | Merge pull request #6681 from arunagw/plugin_gen_fixRafael Mendonça França2012-06-082-3/+9
|\ \ \ | | | | | | | | Plugin gen fix
| * | | We should not include engine.rake file into rakeArun Agrawal2012-06-082-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we are passing -T which is skip_test_unit See issue #6673 for more details. I saw that we are not creating dummy app even if we do skip_test_unit. Fixes #6673
| * | | Removed protected as we already doing it above.Arun Agrawal2012-06-081-2/+0
| | | |
* | | | Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-082-0/+10
|/ / / | | | | | | | | | (closes #6672)
* | | Merge pull request #6667 from yahonda/skip_polymorphic_index_with_oracleRafael Mendonça França2012-06-071-0/+3
|\ \ \ | | | | | | | | Skip two tests with polymorphic if current adapter is Oracle Adapter.
| * | | Skip two tests with polymorphic if current adapter is Oracle Adapter.Yasuo Honda2012-06-081-0/+3
| |/ / | | | | | | | | | because Oracle Adapter does not support foreign keys if :polymorphic => true is used.
* | | Merge pull request #6597 from frodsan/am_include_root_to_falseRafael Mendonça França2012-06-074-98/+115
|\ \ \ | |/ / |/| | change AMS::JSON.include_root_in_json default value to false
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 07:05:29 +0000