aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8966 from ↵Rafael Mendonça França2013-03-086-3/+33
|\ | | | | | | | | | | | | | | | | cfabianski/disable_prepared_statement_when_preparing_a_query Unprepared Visitor + unprepared_statement Conflicts: activerecord/CHANGELOG.md
| * Unprepared Visitor + unprepared_statementCédric FABIANSKI2013-03-086-3/+33
| |
* | Merge pull request #9609 from arunagw/using-latest-arjdbcCarlos Antonio da Silva2013-03-081-3/+3
| | | | | | | | Using latest AR-JDBC for JRuby
* | Update test name to reflect change in how scopes merging worksCarlos Antonio da Silva2013-03-082-3/+2
| | | | | | | | | | | | | | Introduced in f1082b8588a9144eedb34d511f0074031f692d98. Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986. [ci skip]
* | Write a more comprehensive CHANGELOG message [ci skip]Jon Leighton2013-03-081-3/+45
| |
* | Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-whereJon Leighton2013-03-083-6/+22
|\ \ | |/ |/| 7365 merging scopes for where clauses
| * Combine scope conditions using ANDNeeraj Singh and John Leighton2013-03-073-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently Post.active.inactive will result in Post.inactive since the last where clause wins when scopes are merged. This pull request will merge all scopes ( barring defaul scope) using AND. The default scope will be overridden if another scope acts on the same where clause. closes #7365
* | Fix warningsCarlos Antonio da Silva2013-03-071-2/+2
| |
* | Merge pull request #9605 from neerajdotname/sqlite-support-savepointCarlos Antonio da Silva2013-03-071-1/+2
|\ \ | | | | | | SQLite3 3.6.8+ supports savepoints
| * | SQLite3 3.6.8+ supports savepointsNeeraj Singh2013-03-071-1/+2
| |/ | | | | | | | | http://www.sqlite.org/lang_savepoint.html https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132
* | Fix hash spaces and use 1.9 style hash [ci skip]Carlos Antonio da Silva2013-03-071-1/+1
| |
* | Move AP changelog entry to the top [ci skip]Carlos Antonio da Silva2013-03-071-6/+6
|/
* Merge pull request #9464 from jcoyne/assert_template_fileRafael Mendonça França2013-03-075-2/+59
|\ | | | | Allow use of assert_template with the :file option.
| * Allow use of assert_template with the :file option.Justin Coyne2013-03-015-2/+59
| | | | | | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1
* | Merge pull request #9597 from senny/9110_serialized_not_null_defaultRafael Mendonça França2013-03-074-0/+13
|\ \ | | | | | | test case for `serialize` default values.
| * | test case for `serialize` default values.Yves Senn2013-03-074-0/+13
| | | | | | | | | | | | Closes #9110
* | | Merge pull request #9105 from bemurphy/cache_key_updated_onRafael Mendonça França2013-03-075-3/+39
|\ \ \ | |/ / |/| | | | | | | | | | | | | | cache_key consults updated_on timestamp if present Conflicts: activerecord/CHANGELOG.md
| * | cache_key consults updated_on timestamp if presentBrendon Murphy2013-02-265-3/+39
| | | | | | | | | | | | | | | - Extract max timestamp retrieval for cache_key - Update changelog for cache_key changes
* | | Merge pull request #9474 from HonoreDB/masterRafael Mendonça França2013-03-073-0/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | More helpful error message when instantiating an abstract class Conflicts: activerecord/CHANGELOG.md
| * | | More helpful error message when instantiating an abstract classAaron Weiner2013-03-033-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling a literal ActiveRecord::Base.new raises NoMethodError, since it ends up calling Class.abstract_class? which does not exist. Similarly, instantiating an actual abstract class hits the database, when conventionally it should immediately throw NotImplementedError. ActiveRecord::Base can't be made abstract without breaking many, many things, so check for it separately.
* | | | Merge pull request #9545 from senny/9535_secure_password_blankRafael Mendonça França2013-03-075-3/+75
|\ \ \ \ | | | | | | | | | | `has_secure_password` is not invalid when assigning empty Strings
| * | | | `has_secure_password` is not invalid when assigning empty Strings.Yves Senn2013-03-043-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9535. With 692b3b6 the `password=` setter does no longer set blank passwords. This triggered validation errors when assigning empty Strings to `password` and `password_confirmation`. This patch only sets the confirmation if it is not `blank?`.
| * | | | `validates_confirmation_of` does not override writer methods.Yves Senn2013-03-043-1/+51
| | | | |
* | | | | Merge pull request #9595 from senny/remove_non_breaking_spacesRafael Mendonça França2013-03-072-4/+4
|\ \ \ \ \ | | | | | | | | | | | | replace non-breaking spaces with normal spaces [ci skip]
| * | | | | replace non-breaking spaces with normal spaces [ci skip]Yves Senn2013-03-072-4/+4
| | | | | |
* | | | | | Merge pull request #9596 from choudhuryanupam/masterRafael Mendonça França2013-03-071-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Refactored the code to remove irrelevant lines
| * | | | | Refactored and removed unnecessary lines in the test caseAnupam Choudhury2013-03-071-3/+3
|/ / / / /
* | | | | Remove regression test added in 0268b5d8cdc3c5a1337462135f0a326a2654ba1aRafael Mendonça França2013-03-071-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was added because a regression caused by a712e08ebe21f6d8653a0e6602df2e0f5d40d9ca Closes #9255
* | | | | debugger 1.4.0 works in Ruby 2.0Santiago Pastorino2013-03-061-1/+1
| | | | |
* | | | | Merge pull request #9586 from robertomiranda/useless_trRafael Mendonça França2013-03-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Change useless tr to gsub
| * | | | | Change useless tr to gsubrobertomiranda2013-03-061-2/+2
| | | | | |
* | | | | | Merge pull request #9538 from senny/remove_structure_dumpRafael Mendonça França2013-03-068-37/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | `Connection#structure_dump` is no longer used
| * | | | | | rake db:structure:dump warns when `mysqldump` is not in PATH.Yves Senn2013-03-063-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9518. The rake task used to fail silently and left an empty `structure.sql`. It's confusing for users to get to the root of the problem. The warning message tells them where to look.
| * | | | | | `Connection#structure_dump` is no longer used. #9518Yves Senn2013-03-066-35/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of ccc6910c we use `mysqldump` to create the `structure.sql`. The old `#structure_dump` code is still in AR but never used. I removed all relevant parts from the code-base.
* | | | | | Merge pull request #9507 from senny/9483_migrations_without_transactionsRafael Mendonça França2013-03-065-12/+97
|\ \ \ \ \ \ | | | | | | | | | | | | | | Transactions can be turned off per Migration
| * | | | | | transactions can be turned off per Migration.Yves Senn2013-03-055-9/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9483. There are SQL Queries that can't run inside a transaction. Since the Migrator used to wrap all Migrations inside a transaction there was no way to run these queries within a migration. This patch adds `self.disable_ddl_transaction!` to the migration to turn transactions off when necessary.
| * | | | | | transactional migration test-case was broken.Yves Senn2013-03-051-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanup commit a85625d broke the test-case. The schema was no longer modified so there was no way to check that the rollback actually happened.
* | | | | | | Merge pull request #9585 from RKushnir/patch-1Carlos Antonio da Silva2013-03-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Typo in comment to ActionView::Resolver#find_all
| * | | | | | | Typo in comment to ActionView::Resolver#find_allRKushnir2013-03-061-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #9581 from senny/9559_changelog_singularizing_singularXavier Noria2013-03-061-1/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | CHANGELOG entry for improved singularizing of singulars.
| * | | | | | | CHANGELOG entry for improved singularizing of singulars.Yves Senn2013-03-061-1/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9559. The actual patch was added with #4719
* | | | | | | Add missing require to debug helper testCarlos Antonio da Silva2013-03-051-2/+2
| | | | | | |
* | | | | | | Merge pull request #9574 from robertomiranda/debug_helper_testRafael Mendonça França2013-03-051-0/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | Add DebugHelperTest
| * | | | | | Add DebugHelperTestrobertomiranda2013-03-051-0/+8
|/ / / / / /
* | | | | | Merge pull request #9565 from kennyj/remove_unused_return_valueXavier Noria2013-03-053-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused return value, because collecting_queries_for_explain isn't public API.
| * | | | | | Remove unused return value, because collecting_queries_for_explain isn't ↵kennyj2013-03-063-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | public API.
* | | | | | | Merge pull request #9573 from robertomiranda/useless_gsubGuillermo Iguaran2013-03-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use gsub intead of tr when the to_str is longer than the from_str
| * | | | | | | Use gsub intead of tr when the to_str is longer than the from_strrobertomiranda2013-03-051-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-058-11/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix typoCarson McDonald2013-03-051-1/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 03:14:28 +0000