| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Gemfile source url for plugins updated | Amparo Luna | 2012-11-29 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Move instantiation responsibilities from Inheritance to Persistence. Have ↵ | Jeremy Kemper | 2012-11-29 | 2 | -24/+50 | |
| |/ / | | | | | | | Inheritance#discriminate_class_for_record handle STI lookup duties. | |||||
| * | | User assert_kind_of, invert assert_equal expectations | Carlos Antonio da Silva | 2012-11-29 | 4 | -12/+12 | |
| | | | ||||||
| * | | Tiny refactor | Santiago Pastorino | 2012-11-29 | 1 | -4/+1 | |
| | | | ||||||
| * | | Merge pull request #8363 from ↵ | Carlos Antonio da Silva | 2012-11-29 | 1 | -3/+9 | |
| |\ \ | | | | | | | | | | | | | Takehiro-Adachi/add-string-options-examples-to-currentpage-method Added examples to current_page? method [ci skip] | |||||
| | * | | added examples when options is string | Takehiro Adachi | 2012-11-29 | 1 | -3/+9 | |
| | | | | ||||||
| * | | | Merge pull request #8356 from senny/add_links_to_rails4_guide | Xavier Noria | 2012-11-29 | 1 | -5/+26 | |
| |\ \ \ | | | | | | | | | augmented the Rails 4 guides with links back to Github | |||||
| | * | | | augment the rails4 guide with links to PRs | Yves Senn | 2012-11-29 | 1 | -5/+12 | |
| | | | | | ||||||
| | * | | | add list of extracted plugins to rails4 guide | Yves Senn | 2012-11-29 | 1 | -0/+14 | |
| |/ / / | ||||||
| * | | | Added STI support to init and building associations | Jason Rush | 2012-11-29 | 11 | -1/+163 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Allows you to do BaseClass.new(:type => "SubClass") as well as parent.children.build(:type => "SubClass") or parent.build_child to initialize an STI subclass. Ensures that the class name is a valid class and that it is in the ancestors of the super class that the association is expecting. | |||||
| * | | | Merge pull request #7961 from exviva/seconds_until_end_of_day | Andrew White | 2012-11-28 | 5 | -1/+84 | |
| |\ \ \ | | | | | | | | | Add #seconds_until_end_of_day to DateTime and Time | |||||
| | * | | | Add #seconds_until_end_of_day to DateTime and Time | Olek Janiszewski | 2012-11-29 | 5 | -1/+84 | |
| |/ / / | ||||||
| * / / | Add CHANGELOG entries for the observes extraction | Rafael Mendonça França | 2012-11-29 | 3 | -0/+12 | |
| |/ / | | | | | | | [ci skip] | |||||
| * | | Merge pull request #8361 from lucasmazza/typo | Rafael Mendonça França | 2012-11-28 | 1 | -1/+1 | |
| |\ \ | | | | | | | Fix typo in the Observers deprecation message. | |||||
| | * | | Fix typo in the Observers deprecation message. [ci skip] | Lucas Mazza | 2012-11-28 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge branch 'extract_observers' | Rafael Mendonça França | 2012-11-28 | 39 | -1961/+26 | |
| |\ \ | ||||||
| | * | | Gracefully handle upgrading apps with observers | Rafael Mendonça França | 2012-11-28 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | Rather than just raising a NoMethodError when copying the config, this commit adds a warning message until either the rails-observers gem is installed or the relevant config options are removed. | |||||
| | * | | Remove observers and sweepers | Rafael Mendonça França | 2012-11-28 | 39 | -1961/+14 | |
| |/ / | | | | | | | | | | | | | | | They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik] | |||||
| * | | Merge pull request #8261 from steveklabnik/fix_mb_chars | Carlos Antonio da Silva | 2012-11-28 | 3 | -10/+8 | |
| |\ \ | | | | | | | Simplify String#mb_chars and fix documentation. | |||||
| | * | | Simplify String#mb_chars and stop proxying #class | Steve Klabnik | 2012-11-28 | 3 | -6/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This behavior mattered under Ruby 1.8, but that doesn't matter now that we don't support it. In addition, we don't want to proxy the #class method. A test was added to prevent against regressions. | |||||
| | * | | Fix documentation for String#mb_chars. | Steve Klabnik | 2012-11-28 | 1 | -4/+1 | |
| |/ / | | | | | | | This documentation has been out of date. | |||||
| * | | Merge pull request #8355 from steveklabnik/update_7418 | Rafael Mendonça França | 2012-11-28 | 3 | -0/+12 | |
| |\ \ | | | | | | | Ensure that associations have a symbol argument. | |||||
| | * | | Ensure that associations have a symbol argument. | Steve Klabnik | 2012-11-28 | 3 | -0/+12 | |
| | | | | | | | | | | | | | Fixes #7418. | |||||
| * | | | Merge pull request #8352 from steveklabnik/update_7858 | Rafael Mendonça França | 2012-11-28 | 3 | -3/+18 | |
| |\ \ \ | | | | | | | | | Specify type of singular assication during serialization | |||||
| | * | | | Specify type of singular association during serialization | Steve Klabnik | 2012-11-28 | 3 | -3/+18 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When serialising a class, specify the type of any singular associations, if necessary. Rails already correctly specifies the :type of any enumerable association (e.g. a has_many association), but made no attempt to do so for non-enumerables (e.g. a has_one association). We must specify the :type of any STI association. A has_one association to a class which uses single-table inheritance is an example of this type of association. Fixes #7471 | |||||
| * | | | Merge pull request #8350 from claudiob/restore_default_require_paths | José Valim | 2012-11-28 | 1 | -1/+0 | |
| |\ \ \ | |/ / |/| | | Revert "rails gem has no lib directory to require" | |||||
| | * | | Revert "rails gem has no lib directory to require" | claudiob | 2012-11-28 | 1 | -1/+0 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | This reverts commit 6bcbd6046f82c5f0114249a6b725f9679a140b9a. The default value for require_paths is ['lib'], and Rails does not need to include any lib/ file to build the gem, so the previous commit 'makes sense'. However, gems will not be built at all if require_paths is empty (see https://gist.github.com/1065473), so it's better to stick with the default, which does not have any side-effects | |||||
| * | | Fix some indentation in the postgresql_specific_schema | Rafael Mendonça França | 2012-11-28 | 1 | -9/+9 | |
| | | | ||||||
| * | | Add comment to a table without model. | Rafael Mendonça França | 2012-11-28 | 1 | -0/+1 | |
| | | | | | | | | | | | This table is being used to verify if the :limit options is being ignored for text and binary columns | |||||
| * | | Use assert_nil instead of assert_equal | Rafael Mendonça França | 2012-11-28 | 2 | -3/+3 | |
| | | | ||||||
| * | | Use "refute" instead of "assert !" | Carlos Antonio da Silva | 2012-11-27 | 1 | -6/+5 | |
| | | | | | | | | | Remove FIXME tag from abstract adapter test. | |||||
| * | | prevent Dependencies#remove_const from autoloading parents [fixes #8301] | Xavier Noria | 2012-11-28 | 2 | -32/+54 | |
| | | | ||||||
| * | | Merge pull request #8318 from Empact/fixture-file | Rafael Mendonça França | 2012-11-27 | 2 | -5/+19 | |
| |\ \ | | | | | | | Use File.join to better integrate fixture_path in fixture_file_upload. | |||||
| | * | | Use File.join to better integrate fixture_path in fixture_file_upload. | Ben Woosley | 2012-11-26 | 2 | -5/+19 | |
| | | | | ||||||
| * | | | Merge pull request #8339 from latortuga/cache-digest-opt-out-cleanup | Rafael Mendonça França | 2012-11-27 | 2 | -2/+10 | |
| |\ \ \ | | | | | | | | | Cache digest opt out cleanup | |||||
| | * | | | Cleanup CacheHelper changes allowing opt-out of cache digests | Drew Ulmer | 2012-11-27 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of deleting the skip_digest option flag, this changes the method to merely check the key. This change is because of a discussion in this thread: https://github.com/rails/rails/pull/8317 This commit also makes #fragment_name_with_digest private due to its functionality being subsumed by #cache_fragment_name. | |||||
| | * | | | Add CHANGELOG entry for opt-out option of automatic template digesting | Drew Ulmer | 2012-11-27 | 1 | -0/+8 | |
| |/ / / | ||||||
| * | | | Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems" | Rafael Mendonça França | 2012-11-27 | 4 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 33b29e0112db62d3a8c798bb58f51c0a839d9e26, reversing changes made to ac8c729342e6b020a57d0d6887c8a8d5b39f96e0. Reason: https://github.com/rails/rails/pull/4684#commitcomment-920313 | |||||
| * | | | Merge pull request #8341 from amatsuda/bundle_source_rubygems | Rafael Mendonça França | 2012-11-27 | 4 | -4/+4 | |
| |\ \ \ | | | | | | | | | default source in Gemfiles to :rubygems rather than hardcoding the URL | |||||
| | * | | | default source in Gemfiles to :rubygems rather than hardcoding the URL | Akira Matsuda | 2012-11-28 | 4 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | * I guess this would be the preferrable default for Bundler * current version of Bundler converts :rubygems into 'http://rubygems.org', not https://, and that will help those who are working on a very poor network environment that doesn't allow SSL | |||||
| * | | | | Merge pull request #8340 from ↵ | Rafael Mendonça França | 2012-11-27 | 3 | -7/+7 | |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | skojin/grouped_options_for_select_without_hash_sort No sort Hash options in #grouped_options_for_select | |||||
| | * | | | No sort Hash options in #grouped_options_for_select | Sergey Kojin | 2012-11-27 | 3 | -7/+7 | |
| |/ / / | ||||||
| * | | | Merge pull request #8338 from ugisozols/master | Carlos Antonio da Silva | 2012-11-27 | 1 | -2/+1 | |
| |\ \ \ | | | | | | | | | Fix Strong Parameters docs [ci skip] | |||||
| | * | | | Fix Strong Parameters docs. | Uģis Ozols | 2012-11-27 | 1 | -2/+1 | |
| |/ / / | | | | | | | | | | | | | It's only possible to inherit from ActiveRecord::Base and not include it. | |||||
| * | | | Merge pull request #8337 from amatsuda/unshift_html_scanner | Rafael Mendonça França | 2012-11-27 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | unshift html-scanner into $LOAD_PATH rather than append | |||||
| | * | | | unshift html-scanner into $LOAD_PATH rather than append | Akira Matsuda | 2012-11-27 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #8336 from rashmi14yadav/warning_removed | Carlos Antonio da Silva | 2012-11-27 | 1 | -1/+0 | |
| |\ \ \ \ | |/ / / |/| | | | Unused variable warning removed | |||||
| | * | | | Unused variable warning removed | Rashmi Yadav | 2012-11-27 | 1 | -1/+0 | |
| |/ / / | ||||||
| * | | | Merge pull request #8333 from amatsuda/rails_gem_empty_require_path | José Valim | 2012-11-27 | 1 | -0/+1 | |
| |\ \ \ | | | | | | | | | empty rails gem's require_paths | |||||
| | * | | | rails gem has no lib directory to require | Akira Matsuda | 2012-11-27 | 1 | -0/+1 | |
| |/ / / | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |