Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3857 from ↵ | José Valim | 2011-12-05 | 2 | -2/+12 |
|\ | | | | | | | | | Overbryd/redirect_to_url_with_network_path_reference Fix for redirect_to to respect urls with a network path reference like "//asset.host.com/resources/1235" | ||||
| * | Fix for redirect_to to respect urls with a network path reference like ↵ | Overbryd | 2011-12-05 | 2 | -2/+12 |
|/ | | | | "//asset.host.com/resources/1235" see issue #3856 | ||||
* | Merge pull request #3854 from exviva/validates_associated_marked_for_destruction | José Valim | 2011-12-04 | 2 | -2/+13 |
|\ | | | | | Do not validate associated records marked for destruction | ||||
| * | Do not validate associated records marked for destruction | Olek Janiszewski | 2011-12-05 | 2 | -2/+13 |
| | | | | | | | | | | | | The main reason for this change is to fix a bug where `validates_associated` would prevent `accepts_nested_attributes_for` with `allow_destroy: true` from destroying invalid associated records. | ||||
* | | Merge pull request #3851 from ebeigarts/fix_sequence_name | Jon Leighton | 2011-12-04 | 2 | -2/+12 |
|\ \ | |/ |/| | Fix sequence name with abstract classes. | ||||
| * | Fix sequence name with abstract classes. | Edgars Beigarts | 2011-12-04 | 2 | -2/+12 |
| | | |||||
* | | moves some auto explain logic to the subscriber [José Valim & Xavier Noria] | Xavier Noria | 2011-12-04 | 2 | -19/+12 |
| | | |||||
* | | simplifies ActiveRecord::ExplainSubscriber [José Valim & Xavier Noria] | Xavier Noria | 2011-12-04 | 1 | -8/+6 |
| | | |||||
* | | Merge branch 'explain' | Xavier Noria | 2011-12-04 | 6 | -84/+93 |
|\ \ | |||||
| * | | implements a much faster auto EXPLAIN, closes #3843 [José Valim & Xavier Noria] | Xavier Noria | 2011-12-04 | 6 | -84/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit vastly reduces the impact of auto explain logging when enabled, while keeping a negligible cost when disabled. The first implementation was based on the idea of subscribing to "sql.active_record" when needed, and unsubscribing once done. This is the idea behind AR::Relation#explain. Subscribe, collect, unsubscribe. But with the current implementation of notifications unsubscribing is costly, because it wipes an internal cache and that puts a penalty on the next event. So we are switching to an approach where a long-running subscriber is listening. Instead of collecting the queries with a closure in a dedicated subscriber, now we setup a thread local. If the feature is disabled by setting the threshold to nil, the subscriber will call a method that does nothing. That's totally cheap. | ||||
* | | | Merge pull request #3853 from nashby/form_for_as_option | José Valim | 2011-12-04 | 3 | -13/+25 |
|\ \ \ | | | | | | | | | form_for with :as option uses "action_as" as css class and id | ||||
| * | | | form_for with +:as+ option uses "action_as" as css class and id | Vasiliy Ermolovich | 2011-12-04 | 3 | -13/+25 |
| | | | | |||||
* | | | | Merge pull request #3845 from sumbach/test-return-value-from-require | Aaron Patterson | 2011-12-04 | 1 | -0/+79 |
|\ \ \ \ | | | | | | | | | | | Add tests for the return value of require | ||||
| * | | | | Simplify load and require tests | Sam Umbach | 2011-12-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | - These tests don't use autoloading so there's no need to add anything to autoload_paths | ||||
| * | | | | Test that require and load raise LoadError if file not found | Sam Umbach | 2011-12-03 | 1 | -0/+16 |
| | | | | | |||||
| * | | | | Test return value of ActiveSupport::Dependencies::Loadable#load | Sam Umbach | 2011-12-03 | 1 | -0/+16 |
| | | | | | |||||
| * | | | | Test return value of ActiveSupport::Dependencies::Loadable#require | Sam Umbach | 2011-12-03 | 1 | -0/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Add tests to protect from regressions in require's return value behavior - See a10606c490471d8e1483acb3b31d7f2d51e9ebbe (require needs to return true or false) for the original bug fix | ||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-04 | 2 | -158/+422 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | copy edits in the migrations guide | Vijay Dev | 2011-12-04 | 1 | -48/+46 |
| | | | | | |||||
| * | | | | Be explicit about where to add/remove stuff to the migration | Jason Noble | 2011-12-03 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Fix missing /ruby block | Jason Noble | 2011-12-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Be explicit of where the constraints are. | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Improve readability | Jason Noble | 2011-12-03 | 1 | -4/+5 |
| | | | | | |||||
| * | | | | Be more friendly than "shut up" | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | A table format makes this section easier to read | Jason Noble | 2011-12-03 | 1 | -7/+11 |
| | | | | | |||||
| * | | | | This section is more about changing the output of running migrations | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Improve readability | Jason Noble | 2011-12-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Readability improvements | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Move this into a section so that "Resetting the database" will show up in TOC | Jason Noble | 2011-12-03 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Change wording to be more explicit on what migrating with a version does | Jason Noble | 2011-12-03 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Migrations can also run the "change" method | Jason Noble | 2011-12-03 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Reword section to make it more readable. | Jason Noble | 2011-12-03 | 1 | -4/+7 |
| | | | | | |||||
| * | | | | We're using methods, not writing them | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Change wording to be more understandable | Jason Noble | 2011-12-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | We're using the method, not writing it | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Change The other... to Another... | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Reword confusing section | Jason Noble | 2011-12-03 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Correct grammatical errors | Jason Noble | 2011-12-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | It's more that Rails needs to know how to recreate the columns | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added "also" to read better | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Explain the t.timestamps method a little better | Jason Noble | 2011-12-03 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Re-word confusing section | Jason Noble | 2011-12-03 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Rollback is used elsewhere in the tutorial | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Alphabetize fields to make reading easier | Jason Noble | 2011-12-03 | 1 | -8/+31 |
| | | | | | |||||
| * | | | | Improve wording, fix some formatting issues | Jason Noble | 2011-12-03 | 1 | -4/+5 |
| | | | | | |||||
| * | | | | Constrained to 80 chars per line | Jason Noble | 2011-12-03 | 1 | -173/+367 |
| | | | | | |||||
| * | | | | Update layouts and rendering guide javascript_include_tag to bring it in ↵ | Ryan Bigg | 2011-12-04 | 1 | -5/+42 |
| |/ / / | | | | | | | | | | | | | line with Rails 3.1 | ||||
* | | | | Merge pull request #3850 from carlosantoniodasilva/readonly-attributes | José Valim | 2011-12-04 | 1 | -1/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Refactor readonly attributes conditional | ||||
| * | | | Refactor readonly attributes conditional | Carlos Antonio da Silva | 2011-12-04 | 1 | -1/+2 |
|/ / / | |||||
* | | | Merge pull request #3848 from arunagw/sqlite3_bump | Xavier Noria | 2011-12-04 | 2 | -2/+2 |
|\ \ \ | |_|/ |/| | | SQlite3 Bump |