Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14505 from davefp/patch-1 | Carlos Antonio da Silva | 2014-03-27 | 1 | -0/+7 |
|\ | | | | | Adds explanation of :base attribute to errors.add [ci skip] | ||||
| * | Adds explanation of :base attribute to errors.add | David Underwood | 2014-03-27 | 1 | -0/+7 |
|/ | | | [ci skip] | ||||
* | Merge pull request #14393 from chrisfinne/persisted_exception | Rafael Mendonça França | 2014-03-27 | 4 | -1/+16 |
|\ | | | | | | | | | AR .persisted? throws SystemStackError for an unsaved model with a custom primary_key that didn't save due to validation error | ||||
| * | AR .persisted? throws SystemStackError for an unsaved model with a | chrisfinne | 2014-03-27 | 4 | -1/+16 |
|/ | | | | custom primary_key that didn't save due to validation error | ||||
* | Add CHANGELOG to Active Model too [ci skip] | Rafael Mendonça França | 2014-03-27 | 1 | -0/+6 |
| | |||||
* | Merge pull request #14456 from henrik/add-validate-method | Rafael Mendonça França | 2014-03-27 | 5 | -0/+38 |
|\ | | | | | | | ActiveRecord/ActiveModel '#validate' alias for 'valid?' | ||||
| * | ActiveRecord/ActiveModel '#validate' alias for 'valid?' | Henrik Nyh | 2014-03-27 | 5 | -0/+38 |
|/ | | | | | | | | It's unintuitive to call '#valid?' when you want to run validations but don't care about the return value. The alias in ActiveRecord isn't strictly necessary (the ActiveModel alias is still in effect), but it clarifies. | ||||
* | require dependency to execute a single test from xml_serialization_test | Yves Senn | 2014-03-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When the tests are executed in order, the dependency is loaded at the right time. However this makes it impossible to execute a single test later down the line. Let's require the dependecy at the beginning to get them working independent of the order. This resolves the following error: ``` $ ARCONN=postgresql ruby -Itest /Users/senny/Projects/rails/activerecord/test/cases/xml_serialization_test.rb -n test_to_xml Using postgresql Run options: -n test_to_xml --seed 51819 E Finished in 0.081320s, 12.2971 runs/s, 0.0000 assertions/s. 1) Error: DatabaseConnectedXmlSerializationTest#test_to_xml: NameError: uninitialized constant DatabaseConnectedXmlSerializationTest::REXML /Users/senny/Projects/rails/activerecord/test/cases/xml_serialization_test.rb:226:in `test_to_xml' ``` /cc @tgxworld fyi | ||||
* | only run citext_test if the connection supports_extensions?. | Yves Senn | 2014-03-27 | 1 | -52/+54 |
| | | | | This will keep the test suite passing with older PG installations. | ||||
* | Merge pull request #14494 from laurocaetano/test_case_for_fk_with_validate_false | Rafael Mendonça França | 2014-03-26 | 1 | -1/+15 |
|\ | | | | | Add a test case for save(validate: false) with invalid foreign key. | ||||
| * | Add a test case for save(validate:false) with invalid foreign key. | Lauro Caetano | 2014-03-27 | 1 | -1/+15 |
|/ | | | | | It is supposed to raise ActiveRecord::InvalidForeignKey when the database has a fk constraint. | ||||
* | Fix build with bundler 1.6 | Rafael Mendonça França | 2014-03-26 | 1 | -1/+1 |
| | |||||
* | Edge Rails applications doesn't need to use arel master | Rafael Mendonça França | 2014-03-26 | 1 | -2/+1 |
| | |||||
* | Remove unused method | Rafael Mendonça França | 2014-03-26 | 1 | -5/+0 |
| | | | | | This method is not being called anywhere in our code and a GitHub search show it is not being used in any project. | ||||
* | Merge branch 'rm-create-with-index' | Rafael Mendonça França | 2014-03-26 | 6 | -66/+125 |
|\ | |||||
| * | Improve CHANGELOG entry | Rafael Mendonça França | 2014-03-26 | 1 | -3/+5 |
| | | |||||
| * | No need to use begin/end blocks | Rafael Mendonça França | 2014-03-26 | 2 | -16/+16 |
| | | |||||
| * | No need to gsub the string | Rafael Mendonça França | 2014-03-26 | 3 | -3/+3 |
| | | |||||
| * | Don't use send when we own the method | Rafael Mendonça França | 2014-03-26 | 2 | -35/+35 |
| | | |||||
| * | Make method private | Rafael Mendonça França | 2014-03-26 | 1 | -5/+6 |
| | | |||||
| * | Improve the method | Rafael Mendonça França | 2014-03-26 | 1 | -5/+6 |
| | | | | | | | | | | | | * cache `o.name` value * Avoid extra `concat` call * Avoid extra `<<` call | ||||
| * | Remove unneeded comments about feature support on the adapters | Rafael Mendonça França | 2014-03-26 | 1 | -20/+9 |
| | | | | | | | | | | These comments will likely be outdated with time and doesn't include any information that can't be found in the adapters | ||||
| * | Invert the conditionals to make easier to read | Rafael Mendonça França | 2014-03-26 | 1 | -4/+4 |
| | | | | | | | | Also improve some of the code conventions | ||||
| * | Merge pull request #14480 from steverice/mysql-indexes-in-create-table | Rafael Mendonça França | 2014-03-26 | 6 | -14/+80 |
|/| | | | | | | | Create indexes inline in CREATE TABLE for MySQL | ||||
| * | Fixes bugs for using indexes in CREATE TABLE by adding checks for table ↵ | Steve Rice | 2014-03-25 | 5 | -6/+25 |
| | | | | | | | | | | | | | | | | existence Also: - updates tests by stubbing table_exists? method - adds entry for creating indexes in CREATE TABLE to changelog | ||||
| * | create indexes inline in CREATE TABLE for MySQL | Cody Cutrer | 2014-03-25 | 5 | -11/+58 |
| | | | | | | | | | | | | | | | | This is important, because adding an index on a temporary table after it has been created would commit the transaction Conflicts: activerecord/CHANGELOG.md | ||||
* | | 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 |
| | | |