Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixes Issue #13466. | Jefferson Lai | 2014-04-23 | 8 | -5/+42 |
| | | | | | | Changed the call to a scope block to be evaluated with instance_eval. The result is that ScopeRegistry can use the actual class instead of base_class when caching scopes so queries made by classes with a common ancestor won't leak scopes. | ||||
* | Merge pull request #14487 from JuanitoFatas/patch/fix-release-note-url | Rafael Mendonça França | 2014-03-26 | 1 | -1/+1 |
|\ | | | | | [ci skip] Fix Pull Request URL in 4.1 release note. | ||||
| * | [ci skip] Fix Pull Request URL in 4.1 release note. | Juanito Fatas | 2014-03-27 | 1 | -1/+1 |
|/ | |||||
* | link to "Schema migration" Wikipedia page. Closes #14479. [ci skip] | Yves Senn | 2014-03-26 | 1 | -3/+4 |
| | |||||
* | Fix task comment to match which file should be changed | Rafael Mendonça França | 2014-03-25 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | Fix the update_versions release task | Rafael Mendonça França | 2014-03-25 | 2 | -49/+23 |
| | |||||
* | Use rails convetions | Rafael Mendonça França | 2014-03-25 | 1 | -2/+2 |
| | |||||
* | Merge pull request #14390 from huoxito/true-touch | Rafael Mendonça França | 2014-03-25 | 2 | -0/+13 |
|\ | | | | | | | Still touch associations when theres no timestamp | ||||
| * | Still touch associations when theres no timestamp | Washington Luiz | 2014-03-14 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | Prior to Rails 4.0.4 when touching a object which doesn't have timestamp attributes (updated_at / updated_on) rails would still touch all associations. After 73ba2c14cd7d7dfb2d132b18c47ade995401736f it updates associations but rollsback because `touch` would return nil since there's no timestamp attribute | ||||
* | | Revert "Merge pull request #8313 from alan/only_save_changed_has_one_objects" | Rafael Mendonça França | 2014-03-25 | 3 | -22/+8 |
| | | | | | | | | | | | | | | | | | | This reverts commit 6e3ab3e15faf782f6a937ccf5574a4fb63e3e353, reversing changes made to 39e07b64ce3f4bb55e60ba0266e677f8e4f4893a. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/autosave_association_test.rb | ||||
* | | clarify CHANGELOG [ci skip]. | Yves Senn | 2014-03-25 | 1 | -8/+2 |
| | | |||||
* | | Merge pull request #13440 from kuldeepaggarwal/pluralize_table_name_issue | Yves Senn | 2014-03-25 | 4 | -3/+74 |
|\ \ | | | | | | | Generating proper migration when ActiveRecord::Base.pluralize_table_names = false | ||||
| * | | Fix Generation of proper migration when | Kuldeep Aggarwal | 2014-03-25 | 4 | -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_method | Rafael Mendonça França | 2014-03-25 | 1 | -2/+2 |
|\ \ | | | | | | | Support the options methods in tests | ||||
| * | | update comments to reflect that options support is not available | Frederick Cheung | 2014-03-25 | 1 | -2/+2 |
|/ / | |||||
* | | synchronize changelogs and 4.1 release notes. [ci skip] | Yves Senn | 2014-03-25 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md | ||||
* | | do not rely on method_missing hitting arel | Aaron Patterson | 2014-03-24 | 1 | -2/+3 |
| | | | | | | | | arel methods are not supposed to be public API for ActiveRecord | ||||
* | | use ARel factory methods for building AST nodes | Aaron Patterson | 2014-03-24 | 2 | -17/+17 |
| | | | | | | | | This abstracts us from the actual construction of the nodes | ||||
* | | Merge pull request #14466 from vipulnsward/rename-cache-method | Rafael Mendonça França | 2014-03-24 | 1 | -4/+5 |
|\ \ | | | | | | | Rename method and stop passing unused arguements. | ||||
| * | | - Rename `increment_or_decrement` to an apt `set_cache_value` since it ↵ | Vipul A M | 2014-03-24 | 1 | -4/+5 |
| | | | | | | | | | | | | actually doesn't increment/decrement in localstore. | ||||
* | | | Merge pull request #14468 from izoomi/date_select_helper | Rafael Mendonça França | 2014-03-24 | 3 | -1/+21 |
|\ \ \ | | | | | | | | | Fix date_select with_css_classes: true option overwriting other html classes | ||||
| * | | | Fix date_select option overwriting html classes | Izumi Wong-Horiuchi | 2014-03-24 | 3 | -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 gitignore | Rafael Mendonça França | 2014-03-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | If the sqlite file name change in future version we this regexp should catch | ||||
* | | | Merge pull request #14447 from Houdini/gitignore | Rafael Mendonça França | 2014-03-24 | 5 | -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 Golub | 2014-03-24 | 5 | -2/+36 |
| | | | |||||
* | | | Merge pull request #14440 from tgxworld/mysql_table_cleanup_after_each_test | Yves Senn | 2014-03-24 | 2 | -92/+96 |
|\ \ \ | | | | | | | | | Clean up tables after each test. | ||||
| * | | | Clean up tables after each test. | Guo Xiang Tan | 2014-03-22 | 2 | -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_info | Guillermo Iguaran | 2014-03-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Adding active_model in Rails::Info | ||||
| * | | | | Adding active_model in Rails::Info | Ankit Gupta | 2014-03-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #14450 from vlal/vlal-rails | Godfrey Chan | 2014-03-22 | 2 | -1/+8 |
|\ \ \ \ | |/ / / |/| | | | Incorrect values being printed by assert_select. | ||||
| * | | | Swapped parameters of assert_equal in assert_select | Vishal Lal | 2014-03-22 | 2 | -1/+8 |
|/ / / | |||||
* | | | Update test helper to use latest Digestor API | David Heinemeier Hansson | 2014-03-21 | 1 | -8/+8 |
| | | | |||||
* | | | Digestor should just rely on the finder to know about the format and the ↵ | David Heinemeier Hansson | 2014-03-21 | 3 | -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 find | David Heinemeier Hansson | 2014-03-21 | 1 | -3/+4 |
| | | | |||||
* | | | Fix for digestor to consider variants for partials -- this still needs more ↵ | David Heinemeier Hansson | 2014-03-21 | 1 | -2/+2 |
| | | | | | | | | | | | | testing!! | ||||
* | | | Merge pull request #14445 from ibroadfo/patch-1 | Rafael Mendonça França | 2014-03-21 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | fix log_tags request object grammar | ||||
| * | | fix log_tags request object grammar | Iain D Broadfoot | 2014-03-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #14400 from tgxworld/ensure_tables_are_dropped_after_test | Yves Senn | 2014-03-20 | 2 | -6/+13 |
|\ \ | | | | | | | Drop custom tables after each test. | ||||
| * | | Extract with_example_table into helper method. | Guo Xiang Tan | 2014-03-20 | 2 | -6/+13 |
| | | | | | | | | | | | | This setups the helper method which other tests can benefit from. | ||||
* | | | test for structure:dump without schema information table. refs eafec46 | Yves Senn | 2014-03-20 | 1 | -0/+12 |
|/ / | | | | | | | This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa | ||||
* | | Merge pull request #14436 from arunagw/aa-warning-removed-grouped-expression | Rafael Mendonça França | 2014-03-20 | 1 | -1/+1 |
|\ \ | | | | | | | Warning removed (...) interpreted as grouped expression | ||||
| * | | Warning removed (...) interpreted as grouped expression | Arun Agrawal | 2014-03-20 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #14271 from akshay-vishnoi/fixes | Carlos Antonio da Silva | 2014-03-20 | 3 | -6/+36 |
|\ \ | | | | | | | Deprecate superclass_delegating_accessor, use class_attribute instead. | ||||
| * | | Deprecate Class#superclass_delegating_accessor | Akshay Vishnoi | 2014-03-20 | 3 | -6/+36 |
| | | | |||||
* | | | The digest option is no longer honoured since Rails 3.0 [ci skip] | Godfrey Chan | 2014-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes #8513 | ||||
* | | | Merge pull request #12955 from joshwilliams/master | Yves Senn | 2014-03-20 | 3 | -0/+51 |
|\ \ \ | | | | | | | | | Postgres schema: Constrain sequence search classid | ||||
| * | | | Postgres schema: Constrain sequence search classid | Josh Williams | 2014-03-20 | 3 | -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 messages | Carlos Antonio da Silva | 2014-03-20 | 1 | -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 test | Carlos Antonio da Silva | 2014-03-20 | 1 | -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 equality | Carlos Antonio da Silva | 2014-03-20 | 1 | -5/+4 |
| | | | | | | | | | | | | Also fix indent of test block. |