aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | 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
* | | | | | | debugger 1.4.0 works in Ruby 2.0Santiago Pastorino2013-03-061-1/+1
| | | | | | |
* | | | | | | Merge pull request #9586 from robertomiranda/useless_trRafael Mendonça França2013-03-061-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change useless tr to gsub
| * | | | | | | Change useless tr to gsubrobertomiranda2013-03-061-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #9538 from senny/remove_structure_dumpRafael Mendonça França2013-03-068-37/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | `Connection#structure_dump` is no longer used
| * | | | | | | | rake db:structure:dump warns when `mysqldump` is not in PATH.Yves Senn2013-03-063-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9518. The rake task used to fail silently and left an empty `structure.sql`. It's confusing for users to get to the root of the problem. The warning message tells them where to look.
| * | | | | | | | `Connection#structure_dump` is no longer used. #9518Yves Senn2013-03-066-35/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of ccc6910c we use `mysqldump` to create the `structure.sql`. The old `#structure_dump` code is still in AR but never used. I removed all relevant parts from the code-base.
* | | | | | | | Merge pull request #9507 from senny/9483_migrations_without_transactionsRafael Mendonça França2013-03-065-12/+97
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Transactions can be turned off per Migration
| * | | | | | | | transactions can be turned off per Migration.Yves Senn2013-03-055-9/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9483. There are SQL Queries that can't run inside a transaction. Since the Migrator used to wrap all Migrations inside a transaction there was no way to run these queries within a migration. This patch adds `self.disable_ddl_transaction!` to the migration to turn transactions off when necessary.
| * | | | | | | | transactional migration test-case was broken.Yves Senn2013-03-051-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanup commit a85625d broke the test-case. The schema was no longer modified so there was no way to check that the rollback actually happened.
* | | | | | | | | Merge pull request #9585 from RKushnir/patch-1Carlos Antonio da Silva2013-03-061-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Typo in comment to ActionView::Resolver#find_all
| * | | | | | | | | Typo in comment to ActionView::Resolver#find_allRKushnir2013-03-061-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #9581 from senny/9559_changelog_singularizing_singularXavier Noria2013-03-061-1/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | CHANGELOG entry for improved singularizing of singulars.
| * | | | | | | | CHANGELOG entry for improved singularizing of singulars.Yves Senn2013-03-061-1/+14
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9559. The actual patch was added with #4719
* | | | | | | | Add missing require to debug helper testCarlos Antonio da Silva2013-03-051-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #9574 from robertomiranda/debug_helper_testRafael Mendonça França2013-03-051-0/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Add DebugHelperTest
| * | | | | | | Add DebugHelperTestrobertomiranda2013-03-051-0/+8
|/ / / / / / /
* | | | | | | Merge pull request #9565 from kennyj/remove_unused_return_valueXavier Noria2013-03-053-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused return value, because collecting_queries_for_explain isn't public API.
| * | | | | | | Remove unused return value, because collecting_queries_for_explain isn't ↵kennyj2013-03-063-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public API.
* | | | | | | | Merge pull request #9573 from robertomiranda/useless_gsubGuillermo Iguaran2013-03-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use gsub intead of tr when the to_str is longer than the from_str
| * | | | | | | | Use gsub intead of tr when the to_str is longer than the from_strrobertomiranda2013-03-051-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-058-11/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix typoCarson McDonald2013-03-051-1/+1
| | | | | | | |
| * | | | | | | Remove reference to BugMash. Link hasn't been updated in 4 years.Jonathan Roes2013-03-051-2/+0
| | | | | | | |
| * | | | | | | Fix WhereChain docs to mention only notErnie Miller2013-03-041-1/+1
| | | | | | | |
| * | | | | | | Small TypoLebin Sebastian F2013-03-041-1/+1
| | | | | | | |
| * | | | | | | Add explanation of :dependent => :restrictDavid Deller2013-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Based on information here: http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#method-i-has_many
| * | | | | | | Reverting commit regarding public/index.html (no longer in Rails 4.)Christine Hertzel2013-03-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f8461f73c77c186ad0aa735fe9877990bffe1990.
| * | | | | | | Fixed grammatical error and simplified paragraph concerning controllers.Christine Hertzel2013-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com>
| * | | | | | | Clarified removal of public/index.html fileChelsea Macaluso2013-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Trent Michaels <t.michaels@modcloth.com>
| * | | | | | | Clarified need to remove existing code in welcome index.Trent Michaels2013-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com>
| * | | | | | | fix broken links to README docs in introMike Munroe2013-02-281-2/+2
| | | | | | | |
| * | | | | | | change log4r link to most recent, updated locationMike Munroe2013-02-281-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #9564 from robertomiranda/useless_gsubGuillermo Iguaran2013-03-054-5/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | change useless gsub to tr
| * | | | | | | change useless gsub to trrobertomiranda2013-03-054-5/+5
|/ / / / / / /
* | | | | | | Merge pull request #9042 from senny/9034_float_0_0_is_always_dirtyCarlos Antonio da Silva2013-03-053-1/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning '0.0' to a nullable numeric column does not make it dirty Example: product = Product.create price: 0.0 product.price = '0.0' product.changed? # => false (this used to return true) product.changes # => {} (this used to return { price: [0.0, 0.0] })
| * | | | | | | assigning '0.0' to a nullable numeric column does not make it dirtyYves Senn2013-03-053-1/+32
| | | | | | | |
* | | | | | | | Merge pull request #9561 from ↵Carlos Antonio da Silva2013-03-051-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | inossidabile/explicit_match_via_requirement_exception_message Routing match `via` option requirement exception message made more explicit
| * | | | | | | Routing match `via` option requirement exception message made more explicitBoris Staal2013-03-051-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #9557 from bonsaiben/useless_gsubCarlos Antonio da Silva2013-03-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change useless gsub to delete
| * | | | | | | | change useless gsub to deleteBenjamin Sullivan2013-03-051-1/+1
| | | | | | | | |
* | | | | | | | | Fix typo in AC overview guide [ci skip]Carlos Antonio da Silva2013-03-051-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #9556 from senny/strong_params_examplesXavier Noria2013-03-051-0/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | strong parameters example for default values using `fetch`.
| * | | | | | | example for `accepts_nested_attribtues_for` and strong parameters.Yves Senn2013-03-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9558.
| * | | | | | | strong parameters example for default values using `fetch`. [ci skip]Yves Senn2013-03-051-0/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Origin: #9534.
* | | | | | | Merge pull request #9554 from tmm1/string-gsub-hashJosé Valim2013-03-041-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use 1.9 String#gsub syntax
| * | | | | | | Call String#gsub with Hash directlyAman Gupta2013-03-041-2/+2
|/ / / / / / /
* | | | | | | adds guides/.document to tell rdoc not to process this directoryXavier Noria2013-03-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Rails 4 gem is installed rdoc sees markdown files below the guides directory and processes them. With an empty .document file we prevent that from happening. Thanks to @drbrain for the tip.