Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9543 from maximerety/backport_fix_7774 | Carlos Antonio da Silva | 2013-03-05 | 3 | -2/+16 |
|\ | | | | | Backported #7774 to 3-2-stable | ||||
| * | Backport fixes about #7774 to 3-2-stable | maximerety | 2013-03-05 | 3 | -2/+16 |
|/ | | | | | Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is an empty string. | ||||
* | Merge pull request #9531 from erik-escobedo/patch-1 | Guillermo Iguaran | 2013-03-03 | 1 | -1/+1 |
|\ | | | | | Fix typo on ActionPack's ChangeLog | ||||
| * | Fix typo on CHANGELOG.md | Érik Escobedo | 2013-03-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #9528 from korny/patch-1 | Andrew White | 2013-03-03 | 1 | -2/+0 |
|\ \ | |/ |/| | Fix unused variable warning in mapper.rb | ||||
| * | remove unused path_without_format variable | Kornelius Kalnbach | 2013-03-03 | 1 | -2/+0 |
|/ | | | Was forgotten in a72dab0. | ||||
* | Freeze columns only once per Result | Santiago Pastorino | 2013-03-03 | 1 | -3/+9 |
| | | | | | Conflicts: activerecord/lib/active_record/result.rb | ||||
* | Update docs, change_table does not use TableDefinition. | Yves Senn | 2013-02-28 | 1 | -2/+2 |
| | | | | | | | [ci skip] Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | ||||
* | Improve AR changelog [ci skip] | Carlos Antonio da Silva | 2013-02-28 | 1 | -2/+5 |
| | |||||
* | Merge pull request #9485 from authorNari/backport-6755-to-3-2-stable | Carlos Antonio da Silva | 2013-02-28 | 3 | -1/+16 |
|\ | | | | | | | | | Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtures:load. CSV fixtures have already been removed some time ago in 1716da07204193c8acf967e2d75a53a82e4c7c28, but the task was still loading them, even though later it tried to find the related yaml file. | ||||
| * | Backported #6755 to 3-2-stable. Don't read csv file during executing ↵ | Narihiro Nakamura | 2013-02-28 | 3 | -1/+16 |
|/ | | | | db:fixtures:load. | ||||
* | Enforce i18n version >= v0.6.4 | Carlos Antonio da Silva | 2013-02-27 | 1 | -1/+1 |
| | | | | | v0.6.2 and v0.6.3 both have issues with Ruby 1.8.7, see https://github.com/svenfuchs/i18n/issues/192 for more info. | ||||
* | Merge pull request #9472 from yahonda/revert_7544c7a9 | Rafael Mendonça França | 2013-02-27 | 1 | -3/+1 |
|\ | | | | | Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated ... | ||||
| * | Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated with ↵ | Yasuo Honda | 2013-02-28 | 1 | -3/+1 |
|/ | | | | | | | | Oracle adapter." This reverts commit 7544c7a9f290a3ea25099ae38d52795458391785. Oracle enhanced adapter is supporting remove_column with Array. | ||||
* | Merge pull request #9471 from yahonda/5837_32-stable | Rafael Mendonça França | 2013-02-27 | 1 | -4/+4 |
|\ | | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix | ||||
| * | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix | Yasuo Honda | 2013-02-28 | 1 | -4/+4 |
|/ | | | | backport pull request#5837 to 3-2-stable | ||||
* | Tighten up AS.gemspec. | Steve Klabnik | 2013-02-26 | 1 | -1/+1 |
| | | | | | Apparently 0.6.2 has a call to force_encoding, which is not around in 1.8.7. | ||||
* | CHANGELOG entry for ee291b9. | Steve Klabnik | 2013-02-26 | 1 | -0/+5 |
| | | | | Since we released it, it should go in the CHANGELOG. | ||||
* | Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric" | Steve Klabnik | 2013-02-26 | 7 | -49/+14 |
| | | | | This reverts commit 921a296a3390192a71abeec6d9a035cc6d1865c8. | ||||
* | Do not override attributes on `dup` by default scopes | Hiroshige Umino | 2013-02-26 | 3 | -1/+13 |
| | |||||
* | Improve changelog entry [ci skip] | Carlos Antonio da Silva | 2013-02-26 | 1 | -4/+4 |
| | |||||
* | Merge pull request #9430 from authorNari/backport-7072-to-3-2-stable | Carlos Antonio da Silva | 2013-02-26 | 3 | -1/+23 |
|\ | | | | | Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope | ||||
| * | Backported #7072 to 3-2-stable. Use database value for uniqueness validation ↵ | Narihiro Nakamura | 2013-02-26 | 3 | -1/+23 |
|/ | | | | scope. | ||||
* | Merge pull request #9408 from mikeycgto/origin/3-2-stable | Rafael Mendonça França | 2013-02-24 | 1 | -1/+1 |
|\ | | | | | Update RUBY_VERSION check for performance testing to handle 2.0.0 | ||||
| * | Update RUBY_VERSION check for performance testing to handle 2.0.0 | mikeycgto | 2013-02-24 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #9406 from rails/3-2-stable-ruby-2 | Rafael Mendonça França | 2013-02-24 | 17 | -39/+50 |
|\ | | | | | Rails 3.2.x is now compatible with Ruby 2.0.0 | ||||
| * | Rails 3.2.x is now compatible with Ruby 2.0.0 | Prem Sichanugrist | 2013-02-24 | 1 | -3/+0 |
| | | |||||
| * | added marshal_load and marshal_dump for ProxyTestResult. Behavior of ↵ | SHIBATA Hiroshi | 2013-02-24 | 1 | -2/+10 |
| | | | | | | | | method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later. | ||||
| * | Do not redirect cache logger to /dev/null in test | Prem Sichanugrist | 2013-02-24 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | For some reason, redirecting cache's logger to '/dev/null' resulting in a test failures and LoadError. I think it's because of Thread issue. Instead of trying to make every logger threadsafe for Rails 3.2, I think it's better to just don't set the logger for now. (Note: resetting the logger back to original value in the teardown block didn't fix the problem.) | ||||
| * | Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. ↵ | Jeremy Kemper | 2013-02-24 | 1 | -1/+0 |
| | | | | | | | | No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af | ||||
| * | Make the tests pass with minitest 4.2 | Rafael Mendonça França | 2013-02-24 | 1 | -0/+3 |
| | | |||||
| * | Check for `method_missing` in public and protected | Prem Sichanugrist | 2013-02-24 | 1 | -1/+2 |
| | | | | | | | | | | | | Ruby 2.0 changed the behavior of `respond_to?` without argument to return only search for public method. We actually want to perform the action only if `method_missing` is either in public or protected. | ||||
| * | There is already a Set of non-hidden action_names lying around. | thedarkone | 2013-02-24 | 1 | -8/+2 |
| | | |||||
| * | Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a ↵ | Jeremy Kemper | 2013-02-24 | 1 | -1/+1 |
| | | | | | | | | few times, so fix up the test to work with however it chooses to escape. | ||||
| * | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag ↵ | Aaron Patterson | 2013-02-24 | 1 | -0/+1 |
| | | | | | | | | this file with us-ascii | ||||
| * | search private and protected methods for convert_key | Aaron Patterson | 2013-02-24 | 3 | -4/+3 |
| | | |||||
| * | Define #inspect instead of #to_s | Prem Sichanugrist | 2013-02-24 | 1 | -2/+2 |
| | | | | | | | | Ruby 2.0 Object#inspect does not call #to_s by default anymore. | ||||
| * | Fix failing test case when no database.yml | Prem Sichanugrist | 2013-02-24 | 1 | -4/+11 |
| | | |||||
| * | `name` should be public. | Aaron Patterson | 2013-02-24 | 1 | -12/+12 |
| | | |||||
| * | Add in missing requires | Prem Sichanugrist | 2013-02-24 | 2 | -0/+3 |
|/ | |||||
* | Merge pull request #9388 from senny/9367_wrong_schema_after_remove_column | Carlos Antonio da Silva | 2013-02-23 | 4 | -2/+34 |
|\ | | | | | Sqlite preserves primary keys when copying/altering tables. | ||||
| * | Sqlite preserves primary keys when copying/altering tables. | Yves Senn | 2013-02-23 | 4 | -2/+34 |
|/ | | | | | | | | Backport #2312. Fixes #9367. I also added a test-case to make sure that renaming or removing a column preserves the primary key. | ||||
* | Use 1.8 hash style | Carlos Antonio da Silva | 2013-02-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #9374 from senny/improved_match_shorthand_syntax | Andrew White | 2013-02-22 | 3 | -9/+54 |
|\ | | | | | determine the match shorthand target early. | ||||
| * | determine the match shorthand target early. | Yves Senn | 2013-02-22 | 3 | -9/+54 |
|/ | | | | | | | | | Backport #9361. Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes. | ||||
* | Change tabs to spaces in form options helper [ci skip] | Carlos Antonio da Silva | 2013-02-21 | 1 | -2/+2 |
| | |||||
* | Use order to get the first record since postgresql returns in the | Rafael Mendonça França | 2013-02-20 | 1 | -1/+1 |
| | | | | desired order | ||||
* | Merge pull request #9323 from senny/build_fix_from_9252 | Rafael Mendonça França | 2013-02-19 | 1 | -1/+1 |
|\ | | | | | keep the build :green_heart:, #first on 1.8.7 and pg is different | ||||
| * | keep the build :green_heart:, #first on 1.8.7 and pg is different | Yves Senn | 2013-02-19 | 1 | -1/+1 |
|/ | | | | | | | | | | | The build only failed for ruby-1.8.7 and pg. The problem was that the statement: ```ruby author = Author.includes(:comments_with_order_and_conditions, :posts).first ``` resulted in Author with ID 2 where on all other rubies / db-engines Author with ID 1 was retunred. Of course this breaks the assertions. | ||||
* | Merge pull request #9322 from senny/backport_9252 | Rafael Mendonça França | 2013-02-19 | 3 | -1/+31 |
|\ | | | | | don't cache invalid subsets when preloading hmt associations. |