aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Added wiki link for RESTsandeepravi2011-12-061-1/+1
| |
| * Use do end for multiline block.Uģis Ozols2011-12-051-2/+2
| |
| * .rhtml and .rxml was removed in Rails 3.Uģis Ozols2011-12-051-2/+2
| |
| * Merge branch 'master' of github.com:lifo/docrailsSergey Parizhskiy2011-12-051-1/+1
| |\
| | * Remove redundant orJason Noble2011-12-051-1/+1
| | |
| * | changes in the way of how the stylesheets_link_tag worksSergey Parizhskiy2011-12-051-5/+9
| |/
* | Sync AP CHANGELOG with 3-1-stableSantiago Pastorino2011-12-061-0/+8
| |
* | Merge pull request #3428 from adrianpike/asset_path_conflictsSantiago Pastorino2011-12-062-8/+66
|\ \ | | | | | | Issue #3427 - asset_path_conflicts
| * | Let's do the same trick for asset_path that we do for ↵Adrian Pike2011-12-052-8/+66
| | | | | | | | | | | | | | | | | | [image,javascript,stylesheet]_path to avoid namespace conflicts on named routes. Closes #3427
* | | Ensure length validator also works on 1.8.7.José Valim2011-12-061-6/+17
| | |
* | | Merge pull request #3876 from tvdeyen/string_as_url_for_expire_actionJosé Valim2011-12-062-3/+22
|\ \ \ | | | | | | | | Allow string as url for expire_action
| * | | Allowing string as url argument for expire_actionThomas von Deyen2011-12-062-3/+22
|/ / /
* | | Merge pull request #3872 from marcandre/i18n_keyJosé Valim2011-12-062-2/+22
|\ \ \ | | | | | | | | ActiveModel::Name#i18n_key: Fix doc and add tests
| * | | ActiveModel::Name#i18n_key: Fix doc and add testsMarc-Andre Lafortune2011-12-052-2/+22
| |/ /
* | | Merge pull request #3873 from iangreenleaf/no_default_tokenizerJosé Valim2011-12-061-2/+1
|\ \ \ | | | | | | | | Don't tokenize string when counting characters
| * | | Don't tokenize string when counting charactersIan Young2011-12-041-2/+1
| | | |
* | | | make method signatures match the superclass signatureAaron Patterson2011-12-051-2/+2
| | | |
* | | | return value is never tested, so stop calling `presence`Aaron Patterson2011-12-051-1/+1
| |/ / |/| |
* | | Quitoting the table name before querying.Aaron Patterson2011-12-051-1/+1
| | |
* | | Merge pull request #3867 from jadeforrest/masterAaron Patterson2011-12-051-1/+6
|\ \ \ | | | | | | | | Increase performance for table_exists?
| * | | Speed up table_exists? for databases with a large number of tablesJade Rubick2011-12-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | At New Relic, we have hundreds of thousands of tables, and our migrations took 30 minutes without this similar patch. This cuts it down to a more reasonable amount of time. The rescue false part is ugly, but necessary as far as I can tell. I don't know of a cross-database statement you can make that will work without trapping errors.
* | | | Merge pull request #3866 from ugisozols/masterJosé Valim2011-12-051-5/+5
|\ \ \ \ | |/ / / |/| | | Remove .rxml, .rjs and .rhtml from source annotation regexp.
| * | | Remove .rxml, .rjs and .rhtml from source annotation regexp.Uģis Ozols2011-12-051-5/+5
|/ / /
* | | Merge pull request #3861 from andyjeffries/masterJosé Valim2011-12-052-3/+3
|\ \ \ | | | | | | | | Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match)
| * | | Named Routes shouldn't override existing ones (currently route recognition ↵Andy Jeffries2011-12-052-3/+3
| | | | | | | | | | | | | | | | goes with the earliest match, named routes use the latest match)
* | | | Merge pull request #3863 from lest/params-wrapper-inflectionsJosé Valim2011-12-052-1/+36
|\ \ \ \ | |/ / / |/| | | use classify in ParamsWrapper to derive model name from controller name
| * | | use classify in ParamsWrapper to derive model name from controller namelest2011-12-052-1/+36
|/ / /
* | | Namespaced attribute lookup now works as 'model/association.attribute'.José Valim2011-12-052-11/+19
| | |
* | | Merge pull request #3859 from kuroda/human_attribute_nameJosé Valim2011-12-052-2/+16
|\ \ \ | | | | | | | | Fix human_attribute_name to handle names with dots
| * | | Fix human_attribute_name to handle names with dotsTsutomu Kuroda2011-12-052-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nested I18n namespace lookup under activerecord.models is deprecated now (c19bd4f). But when a model uses accepts_nested_attributes_for, its Errors object can have an attribute name with "addresses.street" style. In this case, the dots should be substituted with slashes so that we can provide the translation under the "activemodel.attributes.person.addresses/street" key.
* | | | Merge pull request #3858 from ↵Xavier Noria2011-12-051-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Overbryd/redirect_to_url_with_network_path_reference redirect_to url with network path reference: Do not escape forward slashes within a curly regexp
| * | | | Minor enhancement by not unnecessarely escaping forward slashing within a ↵Overbryd2011-12-051-1/+2
| | | | | | | | | | | | | | | | | | | | curly regexp and by mentoining the protocol relative scheme in the internal comment
* | | | | Merge pull request #3857 from ↵José Valim2011-12-052-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 ↵Overbryd2011-12-052-2/+12
|/ / / | | | | | | | | | "//asset.host.com/resources/1235" see issue #3856
* | | Merge pull request #3854 from exviva/validates_associated_marked_for_destructionJosé Valim2011-12-042-2/+13
|\ \ \ | | | | | | | | Do not validate associated records marked for destruction
| * | | Do not validate associated records marked for destructionOlek Janiszewski2011-12-052-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_nameJon Leighton2011-12-042-2/+12
|\ \ \ \ | |/ / / |/| | | Fix sequence name with abstract classes.
| * | | Fix sequence name with abstract classes.Edgars Beigarts2011-12-042-2/+12
| | | |
* | | | moves some auto explain logic to the subscriber [José Valim & Xavier Noria]Xavier Noria2011-12-042-19/+12
| | | |
* | | | simplifies ActiveRecord::ExplainSubscriber [José Valim & Xavier Noria]Xavier Noria2011-12-041-8/+6
| | | |
* | | | Merge branch 'explain'Xavier Noria2011-12-046-84/+93
|\ \ \ \
| * | | | implements a much faster auto EXPLAIN, closes #3843 [José Valim & Xavier Noria]Xavier Noria2011-12-046-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_optionJosé Valim2011-12-043-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 idVasiliy Ermolovich2011-12-043-13/+25
| | | | | |
* | | | | | Merge pull request #3845 from sumbach/test-return-value-from-requireAaron Patterson2011-12-041-0/+79
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add tests for the return value of require
| * | | | | Simplify load and require testsSam Umbach2011-12-031-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 foundSam Umbach2011-12-031-0/+16
| | | | | |
| * | | | | Test return value of ActiveSupport::Dependencies::Loadable#loadSam Umbach2011-12-031-0/+16
| | | | | |
| * | | | | Test return value of ActiveSupport::Dependencies::Loadable#requireSam Umbach2011-12-031-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/docrailsVijay Dev2011-12-042-158/+422
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:39:54 +0000