Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9586 from robertomiranda/useless_tr | Rafael Mendonça França | 2013-03-06 | 1 | -2/+2 |
|\ | | | | | Change useless tr to gsub | ||||
| * | Change useless tr to gsub | robertomiranda | 2013-03-06 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #9538 from senny/remove_structure_dump | Rafael Mendonça França | 2013-03-06 | 8 | -37/+24 |
|\ \ | | | | | | | `Connection#structure_dump` is no longer used | ||||
| * | | rake db:structure:dump warns when `mysqldump` is not in PATH. | Yves Senn | 2013-03-06 | 3 | -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. #9518 | Yves Senn | 2013-03-06 | 6 | -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_transactions | Rafael Mendonça França | 2013-03-06 | 5 | -12/+97 |
|\ \ | | | | | | | Transactions can be turned off per Migration | ||||
| * | | transactions can be turned off per Migration. | Yves Senn | 2013-03-05 | 5 | -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 Senn | 2013-03-05 | 1 | -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-1 | Carlos Antonio da Silva | 2013-03-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Typo in comment to ActionView::Resolver#find_all | ||||
| * | | | Typo in comment to ActionView::Resolver#find_all | RKushnir | 2013-03-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #9581 from senny/9559_changelog_singularizing_singular | Xavier Noria | 2013-03-06 | 1 | -1/+14 |
|\ \ \ | | | | | | | | | CHANGELOG entry for improved singularizing of singulars. | ||||
| * | | | CHANGELOG entry for improved singularizing of singulars. | Yves Senn | 2013-03-06 | 1 | -1/+14 |
|/ / / | | | | | | | | | | | | | | | | Closes #9559. The actual patch was added with #4719 | ||||
* | | | Add missing require to debug helper test | Carlos Antonio da Silva | 2013-03-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #9574 from robertomiranda/debug_helper_test | Rafael Mendonça França | 2013-03-05 | 1 | -0/+8 |
|\ \ \ | | |/ | |/| | Add DebugHelperTest | ||||
| * | | Add DebugHelperTest | robertomiranda | 2013-03-05 | 1 | -0/+8 |
|/ / | |||||
* | | Merge pull request #9565 from kennyj/remove_unused_return_value | Xavier Noria | 2013-03-05 | 3 | -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 ↵ | kennyj | 2013-03-06 | 3 | -5/+4 |
| | | | | | | | | | | | | public API. | ||||
* | | | Merge pull request #9573 from robertomiranda/useless_gsub | Guillermo Iguaran | 2013-03-05 | 1 | -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_str | robertomiranda | 2013-03-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-05 | 8 | -11/+9 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix typo | Carson McDonald | 2013-03-05 | 1 | -1/+1 |
| | | | |||||
| * | | Remove reference to BugMash. Link hasn't been updated in 4 years. | Jonathan Roes | 2013-03-05 | 1 | -2/+0 |
| | | | |||||
| * | | Fix WhereChain docs to mention only not | Ernie Miller | 2013-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Small Typo | Lebin Sebastian F | 2013-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Add explanation of :dependent => :restrict | David Deller | 2013-03-01 | 1 | -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 Hertzel | 2013-03-01 | 1 | -2/+0 |
| | | | | | | | | | | | | This reverts commit f8461f73c77c186ad0aa735fe9877990bffe1990. | ||||
| * | | Fixed grammatical error and simplified paragraph concerning controllers. | Christine Hertzel | 2013-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com> | ||||
| * | | Clarified removal of public/index.html file | Chelsea Macaluso | 2013-03-01 | 1 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: Trent Michaels <t.michaels@modcloth.com> | ||||
| * | | Clarified need to remove existing code in welcome index. | Trent Michaels | 2013-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com> | ||||
| * | | fix broken links to README docs in intro | Mike Munroe | 2013-02-28 | 1 | -2/+2 |
| | | | |||||
| * | | change log4r link to most recent, updated location | Mike Munroe | 2013-02-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9564 from robertomiranda/useless_gsub | Guillermo Iguaran | 2013-03-05 | 4 | -5/+5 |
|\ \ \ | |_|/ |/| | | change useless gsub to tr | ||||
| * | | change useless gsub to tr | robertomiranda | 2013-03-05 | 4 | -5/+5 |
|/ / | |||||
* | | Merge pull request #9042 from senny/9034_float_0_0_is_always_dirty | Carlos Antonio da Silva | 2013-03-05 | 3 | -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 dirty | Yves Senn | 2013-03-05 | 3 | -1/+32 |
| | | | |||||
* | | | Merge pull request #9561 from ↵ | Carlos Antonio da Silva | 2013-03-05 | 1 | -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 explicit | Boris Staal | 2013-03-05 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #9557 from bonsaiben/useless_gsub | Carlos Antonio da Silva | 2013-03-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Change useless gsub to delete | ||||
| * | | | change useless gsub to delete | Benjamin Sullivan | 2013-03-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix typo in AC overview guide [ci skip] | Carlos Antonio da Silva | 2013-03-05 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #9556 from senny/strong_params_examples | Xavier Noria | 2013-03-05 | 1 | -0/+21 |
|\ \ \ | |/ / |/| | | strong parameters example for default values using `fetch`. | ||||
| * | | example for `accepts_nested_attribtues_for` and strong parameters. | Yves Senn | 2013-03-05 | 1 | -0/+9 |
| | | | | | | | | | | | | Closes #9558. | ||||
| * | | strong parameters example for default values using `fetch`. [ci skip] | Yves Senn | 2013-03-05 | 1 | -0/+12 |
|/ / | | | | | | | Origin: #9534. | ||||
* | | Merge pull request #9554 from tmm1/string-gsub-hash | José Valim | 2013-03-04 | 1 | -2/+2 |
|\ \ | | | | | | | Use 1.9 String#gsub syntax | ||||
| * | | Call String#gsub with Hash directly | Aman Gupta | 2013-03-04 | 1 | -2/+2 |
|/ / | |||||
* | | adds guides/.document to tell rdoc not to process this directory | Xavier Noria | 2013-03-04 | 1 | -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. | ||||
* | | Merge pull request #9467 from senny/9459_include_json_root_out_of_sync | Rafael Mendonça França | 2013-03-04 | 3 | -34/+60 |
|\ \ | | | | | | | `ActiveRecord::Base.include_root_in_json` is `false` by default. | ||||
| * | | `ActiveRecord::Base.include_root_in_json` is `false` by default. | Yves Senn | 2013-03-04 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9459. The PR #6597 unified the configuration for `include_root_in_json` in AM and AR to `false`. Later on with the refactoring commit: e030f26 the value in AR was set to `true` but I think this was not on purpose. With this commit both AM and AR will have the same configuration for `include_root_in_json`, which is `false`. | ||||
| * | | rewrite tests to have no side-effects on `include_root_in_json`. | Yves Senn | 2013-03-04 | 1 | -33/+55 |
|/ / | |||||
* | | only calculate next_id when we need a new method defined | Aaron Patterson | 2013-03-04 | 1 | -1/+2 |
| | |