aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9621 from sakuro/migration-magic-comment-fixJeremy Kemper2013-03-094-3/+48
|\ | | | | Preserve magic comments and content encoding of copied migrations.
| * Preserve magic comments and content encoding of copied migrations.OZAWA Sakuro2013-03-094-3/+48
| | | | | | | | | | During insertion of "# This migration comes from ... " comment at the beginning of a migration, presence of magic comment was not considered.
* | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-093-1/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrectly appended square brackets to a multiple select box Before: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][][]" ...> After: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][]" ...>
| * | Fix incorrectly appended square brackets to a multiple select boxOlek Janiszewski2013-03-083-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an explicit name has been given and it already ends with "[]" Before: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][][]" ...> After: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][]" ...>
* | | Merge pull request #9623 from Agis-/patch-2Carlos Antonio da Silva2013-03-091-2/+2
|\ \ \ | |_|/ |/| | Remove extra whitespace and fix a comment
| * | Remove extra whitespace and fix a commentAgis Anastasopoulos2013-03-091-2/+2
|/ / | | | | minor comment fix for consistency
* | Fix failing test regarding console change to fix sandboxingCarlos Antonio da Silva2013-03-081-11/+10
| | | | | | | | Introduced in be3e10cd26bc8ec29c6474d03a08a8e733108e7d.
* | Merge pull request #8670 from sanemat/fix/rake-descVijay Dev2013-03-081-0/+2
|\ \ | | | | | | Add rake test description
| * | Add rake test descriptionsanemat2013-01-011-0/+2
| | | | | | | | | | | | No behavior change
* | | Merge pull request #9614 from ↵Rafael Mendonça França2013-03-081-26/+54
|\ \ \ | | | | | | | | | | | | | | | | wangjohn/refactoring_nested_associations_for_readability Refactored nested associations so they are more readable.
| * | | Refactored nested associations so they are more readable. Added commentswangjohn2013-03-081-26/+54
|/ / / | | | | | | | | | which make it clearer about what's going on.
* | | Fix changelog indent, remove self from method call in changelog/doc examplesCarlos Antonio da Silva2013-03-082-4/+6
| | | | | | | | | | | | [ci skip]
* | | The console --sandbox transaction should not be joinableJon Leighton2013-03-082-11/+10
| | | | | | | | | | | | Thanks @neerajdotname for noticing this bug.
* | | Make sure options is a hashRafael Mendonça França2013-03-081-1/+3
| | |
* | | Avoid short-circuit returnRafael Mendonça França2013-03-081-5/+9
| | |
* | | Merge pull request #9497 from route/subclass_from_attrsRafael Mendonça França2013-03-084-2/+22
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix ActiveRecord `subclass_from_attrs` when eager_load is false. Conflicts: activerecord/CHANGELOG.md
| * | Fix ActiveRecord `subclass_from_attrs` when eager_load is false.Dmitry Vorotilin2013-03-064-2/+22
| | | | | | | | | | | | | | | It cannot find subclass because all classes are loaded automatically when it needs.
* | | Merge pull request #9611 from choudhuryanupam/masterRafael Mendonça França2013-03-081-40/+40
|\ \ \ | | | | | | | | Refactored test case with standard variable names
| * | | Refactored test case with standard variable namingAnupam Choudhury2013-03-081-40/+40
|/ / /
* | | Fix rails console --sandboxJon Leighton2013-03-083-11/+79
| | | | | | | | | | | | | | | | | | I've also added a proper acceptance test which reproduced the issue. Closes #9513, #9515.
* | | Merge pull request #8868 from tehgeekmeister/masterRafael Mendonça França2013-03-083-0/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the index name explicitly provided in a migration when reverting. Fixes #8868 Conflicts: activerecord/CHANGELOG.md
| * | | If an index can't be found by column, use the index name.Ezekiel Smithburg2013-03-073-0/+32
| | | | | | | | | | | | | | | | schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858. this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option.
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 11:46:13 +0000