aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update mapper documenation for match helper [ci skip]Earl St Sauver2013-08-301-2/+3
| | | | | | | | This piece of documentation is out of date. The use of match without any via option is prevented, now the HTTP verbs have to be explicitly set. If they're not set then the error message in normalize_conditions! (around line 186) is shown.
* Merge pull request #12076 from dabit/masterCarlos Antonio da Silva2013-08-293-3/+3
|\ | | | | Fix broken link to Fixtures documentation on guides and activerecord tests [ci skip]
| * Fix broken link to Fixtures documentation on guidesDavid Padilla2013-08-293-3/+3
| | | | | | | | | | | | and activerecord tests [ci skip]
* | Stop messing up with instance variables, use protected as it was meant forCarlos Antonio da Silva2013-08-301-2/+7
| |
* | Remove not necessary AR changelog entry, fix markup [ci skip]Carlos Antonio da Silva2013-08-301-6/+1
| |
* | make sure there are actually some categories when running the testAaron Patterson2013-08-291-0/+1
| |
* | pk should not be required for hm:t associationsAaron Patterson2013-08-293-1/+15
|/
* Merge pull request #12062 from strzalek/default-protected-varsJosé Valim2013-08-295-19/+21
|\ | | | | Port all remaining self.protected_instance_variables to class methods
| * Port all remaining self.protected_instance_variables to class methodsŁukasz Strzałkowski2013-08-295-19/+21
| |
* | Merge pull request #12051 from bcherry/preserve_datetime_millisecondsAndrew White2013-08-282-0/+9
|\ \ | | | | | | ActiveRecord: Include usecs when quoting DateTime in PostgreSQL adapter
| * | Test that PostgreSQL adapter includes `usec` when quoting `DateTime`Ben Cherry2013-08-282-0/+9
| | |
* | | Merge branch 'typecast'Aaron Patterson2013-08-282-18/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * typecast: correctly typecast keys, remove conditionals, reduce object allocations no need to to_a the scope remove extra flat_map array avoid extra empty array allocation extract owner id calculation to a method only call to_a when we have to
| * | | correctly typecast keys, remove conditionals, reduce object allocationsAaron Patterson2013-08-282-7/+11
| | | |
| * | | no need to to_a the scopeAaron Patterson2013-08-281-1/+1
| | | |
| * | | remove extra flat_map arrayAaron Patterson2013-08-281-8/+9
| | | |
| * | | avoid extra empty array allocationAaron Patterson2013-08-281-10/+10
| | | |
| * | | extract owner id calculation to a methodAaron Patterson2013-08-281-1/+5
| | | |
| * | | only call to_a when we have toAaron Patterson2013-08-282-2/+6
| | | |
* | | | Merge pull request #12061 from wangjohn/refactoring_generators_baseRafael Mendonça França2013-08-281-14/+17
|\ \ \ \ | | | | | | | | | | Refactoring Generators::Base.
| * | | | Refactoring Generators::Base.wangjohn2013-08-281-14/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The defaults hash isn't used unless the +class_options+ hash has a particular key, so we don't need to compute it unless this is true. Also moving some code for extracting a module into its own method.
* | | | Merge pull request #12058 from gaurish/secure-pass-docRafael Mendonça França2013-08-281-1/+3
|\ \ \ \ | | | | | | | | | | Add nodoc to ActiveModel::SecurePassword.min_cost
| * | | | Add :nodoc: to ActiveModel::SecurePassword.min_costGaurish Sharma2013-08-291-1/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #12053 from schuetzm/doc_sqlite3_memYves Senn2013-08-281-0/+1
|\| | | | | | | | | | | | | | Mention the fast `test_sqlite3_mem` option in `RUNNING_UNIT_TESTS.rdoc` [ci skip]
| * | | | Mention the fast `test_sqlite3_mem` option in `RUNNING_UNIT_TESTS.rdoc` [ci ↵Marc Schütz2013-08-281-0/+1
|/ / / / | | | | | | | | | | | | skip]
* | | | Merge pull request #12033 from alexaltair/patch-1Yves Senn2013-08-271-1/+1
|\ \ \ \ | |/ / / |/| | | change reference of `Test::Unit` to `Minitest` [ci skip]
| * | | Update Test::Unit to MinitestAlex Altair2013-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previous was misleading; current is more up to date. [ci skip]
* | | | use consistent keys between cache get / setAaron Patterson2013-08-271-1/+1
| | | |
* | | | remove intermediate variableAaron Patterson2013-08-271-3/+1
| | | |
* | | | cache association reset calculationAaron Patterson2013-08-271-4/+4
| | | |
* | | | query the association rather than send the method for the association nameAaron Patterson2013-08-272-11/+10
| | | |
* | | | Merge pull request #12048 from tjouan/app_generator-bin_perms-umaskAaron Patterson2013-08-271-1/+1
|\ \ \ \ | | |/ / | |/| | Comply with current umask when generating new app
| * | | Comply with current umask when generating new app:Thibault Jouan2013-08-271-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new application using the default rails generator (`rails new my_app`), it will apply some permissions bypassing the current process umask. The `bin' directory and any files inside it will always be set a mode of 0755. This change removes the current umask bits from the mode applied by the generator on the `bin' directory and its content.
* | | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-08-271-4/+2
| | |
* | | Merge pull request #11768 from cloudspace/cache_template_loadingRafael Mendonça França2013-08-273-5/+24
|\ \ \ | | | | | | | | Only cache template digests if !config.cache_template_loading
| * | | Only cache template digests if config.cache_template_loadingJosh Lauer2013-08-063-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | since ActionView::Resolver.caching is set to the same value as config.cache_template_loading only cache template digests if config.cache_template_loading is not falsy fixes issues #10752 and #10791
* | | | Merge pull request #11805 from ↵Rafael Mendonça França2013-08-271-34/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | jetthoughts/11803_update_move_forbidden_exception_description_before_show [Getting Started Guide] Move Forbidden attributes description before show post section [ci skip]
| * | | | #11803: Move Forbidden attributes description before show post sectionPaul Nikitochkin2013-08-271-34/+36
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Remove gist link from the codeRafael Mendonça França2013-08-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not good to include links in the code. These links can be in the future outdated and nobody will upgrade they. [ci skip]
* | | | | Merge pull request #11945 from Mik-die/polymorphic-decoratorRafael Mendonça França2013-08-273-1/+32
|\ \ \ \ \ | | | | | | | | | | | | check class hierarchy with is_a? in PredicateBuilder.expand
| * | | | | check class hierarchy with is_a? in PredicateBuilder.expandMikhail Dieterle2013-08-273-1/+32
| |/ / / / | | | | | | | | | | | | | | | add changelog entry for #11945
* | | | | Fix misspelling on README.mdPrem Sichanugrist2013-08-271-1/+1
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #12028 from egilburg/patch-1Rafael Mendonça França2013-08-271-15/+20
|\ \ \ \ \ | | | | | | | | | | | | Updating Rails README.md to reflect current state [ci skip]
| * | | | | Updating README.md [ci skip]Eugene Gilburg2013-08-261-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating the global Rails README following work by @strzalek et al which extracted Action View to a separate gem, and also some other improvements. Summary of changes: * Reordered the paragraphs from View-Model-Controller to Model-Controller-View, based on how (IMHO) most people think about the structure and hierarchy of the framework and their code in it. * Added references to ActionView's README in the _View_ paragraph * Reworded the _Controller_ paragraph to briefly mentioned routing as handled by Action Dispatch, and that both Action Dispatch and Action Controller work together to form the request-handling Action Pack * Removed paragraph saying Action Pack is coupled with Action View, as this is no longer the case * Added brief references to Action Mailer and Active Support, since they are both major Rails components. Briefly mentioned in the _View_ paragraph that Action View is often used to generate the body of the email, in addition to the other typical of using to build a response body.
* | | | | | Merge pull request #12030 from garysweaver/masterYves Senn2013-08-271-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | adding more finder deprecation info in upgrade documentation [ci skip]
| * | | | | adding more finder migration information to upgrade guide [ci skip]Gary S. Weaver2013-08-271-0/+6
|/ / / / /
* | | | | Merge pull request #11636 from ↵Xavier Noria2013-08-274-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | urbanautomaton/uppercase-nested-const-autoload-marking `ActiveSupport::Dependencies`: consts in uppercase nestings not marked as autoloaded
| * | | | | Ensure all-caps nested consts marked as autoloadedSimon Coffey2013-08-274-1/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, an autoloaded constant `HTML::SomeClass` would not be marked as autoloaded by AS::Dependencies. This is because the `#loadable_constants_for_path` method uses `String#camelize` on the inferred file path, which in turn means that, unless otherwise directed, AS::Dependencies watches for loaded constants in the `Html` namespace. By passing the original qualified constant name to `#load_or_require`, this inference step is avoided, and the new constant is picked up in the correct namespace.
* | | | | Improve AP changelog regarding AV extraction [ci skip]Carlos Antonio da Silva2013-08-261-2/+2
| | | | |
* | | | | Merge pull request #12038 from SamSaffron/memoize_decorate_colsRafael Mendonça França2013-08-261-17/+27
|\ \ \ \ \ | | | | | | | | | | | | Perf: memoize serialized column list and time zone column list
| * | | | | Perf: memoize serialized column list and time zone column listSam2013-08-271-17/+27
| | | | | |