aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | Revert "Merge pull request #8313 from alan/only_save_changed_has_one_objects"Rafael Mendonça França2014-03-253-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6e3ab3e15faf782f6a937ccf5574a4fb63e3e353, reversing changes made to 39e07b64ce3f4bb55e60ba0266e677f8e4f4893a. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/autosave_association_test.rb
* | | | | | | | | | | | | | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-03-25149-639/+1277
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (96 commits) clarify CHANGELOG [ci skip]. Fix Generation of proper migration when ActiveRecord::Base.pluralize_table_names = false. update comments to reflect that options support is not available synchronize changelogs and 4.1 release notes. [ci skip] do not rely on method_missing hitting arel use ARel factory methods for building AST nodes Fix date_select option overwriting html classes - Rename `increment_or_decrement` to an apt `set_cache_value` since it actually doesn't increment/decrement in localstore. Check if any sqlite files are not included in the gitignore Remove sqlite3 lines from .gitignore if the application is not using sqlite3. Adding active_model in Rails::Info Clean up tables after each test. Swapped parameters of assert_equal in assert_select Update test helper to use latest Digestor API Digestor should just rely on the finder to know about the format and the variant -- trying to pass it back in makes a mess of things (oh, and doesnt work) Log the full path, including variant, that the digestor is trying to find Fix for digestor to consider variants for partials -- this still needs more testing!! fix log_tags request object grammar Extract with_example_table into helper method. test for structure:dump without schema information table. refs eafec46 ... Conflicts: activerecord/test/cases/relation/where_chain_test.rb
| * | | | | | | | | | | | | | | | | clarify CHANGELOG [ci skip].Yves Senn2014-03-251-8/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #13440 from kuldeepaggarwal/pluralize_table_name_issueYves Senn2014-03-254-3/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generating proper migration when ActiveRecord::Base.pluralize_table_names = false
| | * | | | | | | | | | | | | | | | | Fix Generation of proper migration whenKuldeep Aggarwal2014-03-254-3/+74
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Base.pluralize_table_names = false. Previously, generation a migration like this: rails g migration add_column_name_to_user name would not generating the correct table name. Fixes #13426.
| * | | | | | | | | | | | | | | | | Merge pull request #14477 from fcheung/options_test_methodRafael Mendonça França2014-03-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the options methods in tests
| | * | | | | | | | | | | | | | | | | update comments to reflect that options support is not availableFrederick Cheung2014-03-251-2/+2
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | synchronize changelogs and 4.1 release notes. [ci skip]Yves Senn2014-03-251-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
| * | | | | | | | | | | | | | | | | do not rely on method_missing hitting arelAaron Patterson2014-03-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arel methods are not supposed to be public API for ActiveRecord
| * | | | | | | | | | | | | | | | | use ARel factory methods for building AST nodesAaron Patterson2014-03-242-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This abstracts us from the actual construction of the nodes
| * | | | | | | | | | | | | | | | | Merge pull request #14466 from vipulnsward/rename-cache-methodRafael Mendonça França2014-03-241-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename method and stop passing unused arguements.
| | * | | | | | | | | | | | | | | | | - Rename `increment_or_decrement` to an apt `set_cache_value` since it ↵Vipul A M2014-03-241-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actually doesn't increment/decrement in localstore.
| * | | | | | | | | | | | | | | | | | Merge pull request #14468 from izoomi/date_select_helperRafael Mendonça França2014-03-243-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix date_select with_css_classes: true option overwriting other html classes
| | * | | | | | | | | | | | | | | | | | Fix date_select option overwriting html classesIzumi Wong-Horiuchi2014-03-243-1/+21
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with_css_classes: true option overwrites other html classes. Concatenate day month and year classes rather than overwriting.
| * | | | | | | | | | | | | | | | | | Check if any sqlite files are not included in the gitignoreRafael Mendonça França2014-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the sqlite file name change in future version we this regexp should catch
| * | | | | | | | | | | | | | | | | | Merge pull request #14447 from Houdini/gitignoreRafael Mendonça França2014-03-245-2/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip sqlite3 files in .gitignore if no sqlite3 in app
| | * | | | | | | | | | | | | | | | | Remove sqlite3 lines from .gitignore if the application is not using sqlite3.Dmitrii Golub2014-03-245-2/+36
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #14440 from tgxworld/mysql_table_cleanup_after_each_testYves Senn2014-03-242-92/+96
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up tables after each test.
| | * | | | | | | | | | | | | | | | | | Clean up tables after each test.Guo Xiang Tan2014-03-222-92/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-Up to https://github.com/rails/rails/pull/14400 This ensures that all tables are removed after each test and thereby allowing us to run the tests in a random order.
| * | | | | | | | | | | | | | | | | | | Merge pull request #14463 from ankit8898/add_infoGuillermo Iguaran2014-03-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding active_model in Rails::Info
| | * | | | | | | | | | | | | | | | | | | Adding active_model in Rails::InfoAnkit Gupta2014-03-231-1/+1
| |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge pull request #14450 from vlal/vlal-railsGodfrey Chan2014-03-222-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | Incorrect values being printed by assert_select.
| | * | | | | | | | | | | | | | | | | | Swapped parameters of assert_equal in assert_selectVishal Lal2014-03-222-1/+8
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Update test helper to use latest Digestor APIDavid Heinemeier Hansson2014-03-211-8/+8
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Digestor should just rely on the finder to know about the format and the ↵David Heinemeier Hansson2014-03-213-83/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variant -- trying to pass it back in makes a mess of things (oh, and doesnt work)
| * | | | | | | | | | | | | | | | | | Log the full path, including variant, that the digestor is trying to findDavid Heinemeier Hansson2014-03-211-3/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix for digestor to consider variants for partials -- this still needs more ↵David Heinemeier Hansson2014-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing!!
| * | | | | | | | | | | | | | | | | | Merge pull request #14445 from ibroadfo/patch-1Rafael Mendonça França2014-03-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | fix log_tags request object grammar
| | * | | | | | | | | | | | | | | | | fix log_tags request object grammarIain D Broadfoot2014-03-211-1/+1
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge pull request #14400 from tgxworld/ensure_tables_are_dropped_after_testYves Senn2014-03-202-6/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop custom tables after each test.
| | * | | | | | | | | | | | | | | | | Extract with_example_table into helper method.Guo Xiang Tan2014-03-202-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This setups the helper method which other tests can benefit from.
| * | | | | | | | | | | | | | | | | | test for structure:dump without schema information table. refs eafec46Yves Senn2014-03-201-0/+12
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa
| * | | | | | | | | | | | | | | | | Merge pull request #14436 from arunagw/aa-warning-removed-grouped-expressionRafael Mendonça França2014-03-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning removed (...) interpreted as grouped expression
| | * | | | | | | | | | | | | | | | | Warning removed (...) interpreted as grouped expressionArun Agrawal2014-03-201-1/+1
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge pull request #14271 from akshay-vishnoi/fixesCarlos Antonio da Silva2014-03-203-6/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate superclass_delegating_accessor, use class_attribute instead.
| | * | | | | | | | | | | | | | | | | Deprecate Class#superclass_delegating_accessorAkshay Vishnoi2014-03-203-6/+36
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | The digest option is no longer honoured since Rails 3.0 [ci skip]Godfrey Chan2014-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #8513
| * | | | | | | | | | | | | | | | | | Merge pull request #12955 from joshwilliams/masterYves Senn2014-03-203-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres schema: Constrain sequence search classid
| | * | | | | | | | | | | | | | | | | | Postgres schema: Constrain sequence search classidJosh Williams2014-03-203-0/+51
| | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pk_an_sequence_for query previously joined against pg_class's oid for rows in pg_depend, but pg_depend's objid may point to other system tables, such as pg_attrdef. If a row in one of those other tables coincidentally has the same oid as an (unrelated) sequence, that sequence name may be returned instead of the real one. This ensures that only the pg_depend entries pointing to pg_class are considered.
| * | | | | | | | | | | | | | | | | | Remove extra indirection for testing exceptions and messagesCarlos Antonio da Silva2014-03-201-28/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assert_raise + assert_equal on the returned exception message work just fine, there is no need for extra work, specially like this overly complicated helper.
| * | | | | | | | | | | | | | | | | | Remove some indirection in rake dbs testCarlos Antonio da Silva2014-03-201-34/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just pass in the expected database as argument rather than "caching" it in a hash and using the hash in the helper methods.
| * | | | | | | | | | | | | | | | | | Check if the output is empty rather than asserting for equalityCarlos Antonio da Silva2014-03-201-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix indent of test block.
| * | | | | | | | | | | | | | | | | | Improve touch docs with extra attributes passed in [ci skip]Carlos Antonio da Silva2014-03-202-11/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #14423 from yakko/persistence-touches-manyCarlos Antonio da Silva2014-03-203-2/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord#touch should accept multiple attributes Conflicts: activerecord/CHANGELOG.md
| | * | | | | | | | | | | | | | | | | | ActiveRecord#touch should accept multiple attributes #14423Thiago Pinto2014-03-193-2/+27
| | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | only dump schema information if migration table exists. Closes #14217Yves Senn2014-03-202-1/+9
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #14433 from adomokos/cleaning_up_and_adding_session_testsGodfrey Chan2014-03-191-7/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up and adding tests for Session
| | * | | | | | | | | | | | | | | | | | Cleaning and adding tests for SessionAttila Domokos2014-03-191-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding tests for Session `destroy`, `update` and `delete` methods. No changes for code under test.
| * | | | | | | | | | | | | | | | | | | Refactor assertion of line numbers matching 4 spacesCarlos Antonio da Silva2014-03-191-16/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Move booting/loading tasks setup to the rake notes helper methodCarlos Antonio da Silva2014-03-191-15/+3
| | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-25 06:00:28 +0000