aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* No need to gsub the stringRafael Mendonça França2014-03-263-3/+3
|
* Don't use send when we own the methodRafael Mendonça França2014-03-262-35/+35
|
* Make method privateRafael Mendonça França2014-03-261-5/+6
|
* Improve the methodRafael Mendonça França2014-03-261-5/+6
| | | | | | * cache `o.name` value * Avoid extra `concat` call * Avoid extra `<<` call
* Remove unneeded comments about feature support on the adaptersRafael Mendonça França2014-03-261-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 readRafael Mendonça França2014-03-261-4/+4
| | | | Also improve some of the code conventions
* Merge pull request #14480 from steverice/mysql-indexes-in-create-tableRafael Mendonça França2014-03-266-14/+80
|\ | | | | | | Create indexes inline in CREATE TABLE for MySQL
| * Fixes bugs for using indexes in CREATE TABLE by adding checks for table ↵Steve Rice2014-03-255-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 MySQLCody Cutrer2014-03-255-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-urlRafael Mendonça França2014-03-261-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 Fatas2014-03-271-1/+1
|/ /
* / link to "Schema migration" Wikipedia page. Closes #14479. [ci skip]Yves Senn2014-03-261-3/+4
|/
* Fix task comment to match which file should be changedRafael Mendonça França2014-03-251-1/+1
| | | | [ci skip]
* Fix the update_versions release taskRafael Mendonça França2014-03-252-49/+23
|
* Use rails convetionsRafael Mendonça França2014-03-251-2/+2
|
* Merge pull request #14390 from huoxito/true-touchRafael Mendonça França2014-03-252-0/+13
|\ | | | | | | Still touch associations when theres no timestamp
| * Still touch associations when theres no timestampWashington Luiz2014-03-142-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ç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
* | 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
|/ /