Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't create fibers just to iterate | Nicholas Jakobsen | 2013-08-30 | 1 | -3/+3 |
| | |||||
* | Merge pull request #12085 from valk/master | Santiago Pastorino | 2013-08-30 | 1 | -1/+3 |
|\ | | | | | FIX reload! within rails console --sandbox causes undefined method rollb... | ||||
| * | FIX reload! within rails console --sandbox causes undefined method rollback ↵ | Val Kotlarov Hoffman | 2013-08-30 | 1 | -1/+3 |
| | | | | | | | | upon exiting [https://github.com/rails/rails/issues/11834] | ||||
* | | add missing fixtures file | Aaron Patterson | 2013-08-30 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #12078 from prathamesh-sonpatki/typo | Guillermo Iguaran | 2013-08-29 | 1 | -1/+1 |
|\ | | | | | Fix typo in generators test helpr -> helper [ci skip] | ||||
| * | Fix typo in generators test helpr -> helper [ci skip] | Prathamesh Sonpatki | 2013-08-30 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #12076 from dabit/master | Carlos Antonio da Silva | 2013-08-29 | 3 | -3/+3 |
|\ | | | | | Fix broken link to Fixtures documentation on guides and activerecord tests [ci skip] | ||||
| * | Fix broken link to Fixtures documentation on guides | David Padilla | 2013-08-29 | 3 | -3/+3 |
| | | | | | | | | | | | | and activerecord tests [ci skip] | ||||
* | | Stop messing up with instance variables, use protected as it was meant for | Carlos Antonio da Silva | 2013-08-30 | 1 | -2/+7 |
| | | |||||
* | | Remove not necessary AR changelog entry, fix markup [ci skip] | Carlos Antonio da Silva | 2013-08-30 | 1 | -6/+1 |
| | | |||||
* | | make sure there are actually some categories when running the test | Aaron Patterson | 2013-08-29 | 1 | -0/+1 |
| | | |||||
* | | pk should not be required for hm:t associations | Aaron Patterson | 2013-08-29 | 3 | -1/+15 |
|/ | |||||
* | Merge pull request #12062 from strzalek/default-protected-vars | José Valim | 2013-08-29 | 5 | -19/+21 |
|\ | | | | | Port all remaining self.protected_instance_variables to class methods | ||||
| * | Port all remaining self.protected_instance_variables to class methods | Łukasz Strzałkowski | 2013-08-29 | 5 | -19/+21 |
| | | |||||
* | | Merge pull request #12051 from bcherry/preserve_datetime_milliseconds | Andrew White | 2013-08-28 | 2 | -0/+9 |
|\ \ | | | | | | | ActiveRecord: Include usecs when quoting DateTime in PostgreSQL adapter | ||||
| * | | Test that PostgreSQL adapter includes `usec` when quoting `DateTime` | Ben Cherry | 2013-08-28 | 2 | -0/+9 |
| | | | |||||
* | | | Merge branch 'typecast' | Aaron Patterson | 2013-08-28 | 2 | -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 allocations | Aaron Patterson | 2013-08-28 | 2 | -7/+11 |
| | | | | |||||
| * | | | no need to to_a the scope | Aaron Patterson | 2013-08-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove extra flat_map array | Aaron Patterson | 2013-08-28 | 1 | -8/+9 |
| | | | | |||||
| * | | | avoid extra empty array allocation | Aaron Patterson | 2013-08-28 | 1 | -10/+10 |
| | | | | |||||
| * | | | extract owner id calculation to a method | Aaron Patterson | 2013-08-28 | 1 | -1/+5 |
| | | | | |||||
| * | | | only call to_a when we have to | Aaron Patterson | 2013-08-28 | 2 | -2/+6 |
| | | | | |||||
* | | | | Merge pull request #12061 from wangjohn/refactoring_generators_base | Rafael Mendonça França | 2013-08-28 | 1 | -14/+17 |
|\ \ \ \ | | | | | | | | | | | Refactoring Generators::Base. | ||||
| * | | | | Refactoring Generators::Base. | wangjohn | 2013-08-28 | 1 | -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-doc | Rafael Mendonça França | 2013-08-28 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Add nodoc to ActiveModel::SecurePassword.min_cost | ||||
| * | | | | Add :nodoc: to ActiveModel::SecurePassword.min_cost | Gaurish Sharma | 2013-08-29 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge pull request #12053 from schuetzm/doc_sqlite3_mem | Yves Senn | 2013-08-28 | 1 | -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ütz | 2013-08-28 | 1 | -0/+1 |
|/ / / / | | | | | | | | | | | | | skip] | ||||
* | | | | Merge pull request #12033 from alexaltair/patch-1 | Yves Senn | 2013-08-27 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | change reference of `Test::Unit` to `Minitest` [ci skip] | ||||
| * | | | Update Test::Unit to Minitest | Alex Altair | 2013-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Previous was misleading; current is more up to date. [ci skip] | ||||
* | | | | use consistent keys between cache get / set | Aaron Patterson | 2013-08-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | remove intermediate variable | Aaron Patterson | 2013-08-27 | 1 | -3/+1 |
| | | | | |||||
* | | | | cache association reset calculation | Aaron Patterson | 2013-08-27 | 1 | -4/+4 |
| | | | | |||||
* | | | | query the association rather than send the method for the association name | Aaron Patterson | 2013-08-27 | 2 | -11/+10 |
| | | | | |||||
* | | | | Merge pull request #12048 from tjouan/app_generator-bin_perms-umask | Aaron Patterson | 2013-08-27 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | Comply with current umask when generating new app | ||||
| * | | | Comply with current umask when generating new app: | Thibault Jouan | 2013-08-27 | 1 | -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ça | 2013-08-27 | 1 | -4/+2 |
| | | | |||||
* | | | Merge pull request #11768 from cloudspace/cache_template_loading | Rafael Mendonça França | 2013-08-27 | 3 | -5/+24 |
|\ \ \ | | | | | | | | | Only cache template digests if !config.cache_template_loading | ||||
| * | | | Only cache template digests if config.cache_template_loading | Josh Lauer | 2013-08-06 | 3 | -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ça | 2013-08-27 | 1 | -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 section | Paul Nikitochkin | 2013-08-27 | 1 | -34/+36 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Remove gist link from the code | Rafael Mendonça França | 2013-08-27 | 1 | -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-decorator | Rafael Mendonça França | 2013-08-27 | 3 | -1/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | check class hierarchy with is_a? in PredicateBuilder.expand | ||||
| * | | | | | check class hierarchy with is_a? in PredicateBuilder.expand | Mikhail Dieterle | 2013-08-27 | 3 | -1/+32 |
| |/ / / / | | | | | | | | | | | | | | | | add changelog entry for #11945 | ||||
* | | | | | Fix misspelling on README.md | Prem Sichanugrist | 2013-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge pull request #12028 from egilburg/patch-1 | Rafael Mendonça França | 2013-08-27 | 1 | -15/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Updating Rails README.md to reflect current state [ci skip] | ||||
| * | | | | | Updating README.md [ci skip] | Eugene Gilburg | 2013-08-26 | 1 | -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/master | Yves Senn | 2013-08-27 | 1 | -0/+6 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | adding more finder deprecation info in upgrade documentation [ci skip] | ||||
| * | | | | | adding more finder migration information to upgrade guide [ci skip] | Gary S. Weaver | 2013-08-27 | 1 | -0/+6 |
|/ / / / / |