aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix documentation for String#mb_chars.Steve Klabnik2012-11-281-4/+1
| | | | This documentation has been out of date.
* Merge pull request #8355 from steveklabnik/update_7418Rafael Mendonça França2012-11-283-0/+12
|\ | | | | Ensure that associations have a symbol argument.
| * Ensure that associations have a symbol argument.Steve Klabnik2012-11-283-0/+12
| | | | | | | | Fixes #7418.
* | Merge pull request #8352 from steveklabnik/update_7858Rafael Mendonça França2012-11-283-3/+18
|\ \ | | | | | | Specify type of singular assication during serialization
| * | Specify type of singular association during serializationSteve Klabnik2012-11-283-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_pathsJosé Valim2012-11-281-1/+0
|\ \ | |/ |/| Revert "rails gem has no lib directory to require"
| * Revert "rails gem has no lib directory to require"claudiob2012-11-281-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_schemaRafael Mendonça França2012-11-281-9/+9
|
* Add comment to a table without model.Rafael Mendonça França2012-11-281-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_equalRafael Mendonça França2012-11-282-3/+3
|
* Use "refute" instead of "assert !"Carlos Antonio da Silva2012-11-271-6/+5
| | | | Remove FIXME tag from abstract adapter test.
* prevent Dependencies#remove_const from autoloading parents [fixes #8301]Xavier Noria2012-11-282-32/+54
|
* Merge pull request #8318 from Empact/fixture-fileRafael Mendonça França2012-11-272-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 Woosley2012-11-262-5/+19
| |
* | Merge pull request #8339 from latortuga/cache-digest-opt-out-cleanupRafael Mendonça França2012-11-272-2/+10
|\ \ | | | | | | Cache digest opt out cleanup
| * | Cleanup CacheHelper changes allowing opt-out of cache digestsDrew Ulmer2012-11-271-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 digestingDrew Ulmer2012-11-271-0/+8
|/ /
* | Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems"Rafael Mendonça França2012-11-274-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_rubygemsRafael Mendonça França2012-11-274-4/+4
|\ \ | | | | | | default source in Gemfiles to :rubygems rather than hardcoding the URL
| * | default source in Gemfiles to :rubygems rather than hardcoding the URLAkira Matsuda2012-11-284-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ça2012-11-273-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_selectSergey Kojin2012-11-273-7/+7
|/ /
* | Merge pull request #8338 from ugisozols/masterCarlos Antonio da Silva2012-11-271-2/+1
|\ \ | | | | | | Fix Strong Parameters docs [ci skip]
| * | Fix Strong Parameters docs.Uģis Ozols2012-11-271-2/+1
|/ / | | | | | | | | It's only possible to inherit from ActiveRecord::Base and not include it.
* | Merge pull request #8337 from amatsuda/unshift_html_scannerRafael Mendonça França2012-11-271-1/+1
|\ \ | | | | | | unshift html-scanner into $LOAD_PATH rather than append
| * | unshift html-scanner into $LOAD_PATH rather than appendAkira Matsuda2012-11-271-1/+1
| | |
* | | Merge pull request #8336 from rashmi14yadav/warning_removedCarlos Antonio da Silva2012-11-271-1/+0
|\ \ \ | |/ / |/| | Unused variable warning removed
| * | Unused variable warning removedRashmi Yadav2012-11-271-1/+0
|/ /
* | Merge pull request #8333 from amatsuda/rails_gem_empty_require_pathJosé Valim2012-11-271-0/+1
|\ \ | | | | | | empty rails gem's require_paths
| * | rails gem has no lib directory to requireAkira Matsuda2012-11-271-0/+1
|/ /
* | Remove warning of circular requireRafael Mendonça França2012-11-271-1/+1
| | | | | | | | | | | | | | | | | | This file was using mime_types before load the Mime::Type class. When trying to register first Mime::Type it load mime_type that loads mime_types in the end. Requiring mime_type ensure that we have the class definition and the mime types
* | Remove useless check of AR being defined from teardown fixturesCarlos Antonio da Silva2012-11-271-5/+4
| | | | | | | | | | | | | | We are already in the AR namespace, there's no way for it to be undefined. See the cousin commit 13e72db77063f57c3028a906690d42fb068845bb Refactor a bit teardown fixtures to avoid two conditionals.
* | Refactor generators tests to include test helpers in the parent classCarlos Antonio da Silva2012-11-271-4/+3
| |
* | Merge pull request #8329 from elia/fix-send-data-disposition-with-symbols-masterCarlos Antonio da Silva2012-11-263-0/+15
|\ \ | | | | | | Accept symbols as #send_data :disposition value
| * | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-0/+15
|/ /
* | Merge pull request #7282 from xHire/validates_length_of_fixRafael Mendonça França2012-11-263-2/+57
|\ \ | | | | | | | | | | | | | | | | | | Length validation handles correctly nil. Fix #7180 Conflicts: activemodel/CHANGELOG.md
| * | Length validation handles correctly nil. Fix #7180Michal Zima2012-11-263-2/+57
| | | | | | | | | | | | When nil or empty string are not allowed, they are not valid.
* | | Merge pull request #8324 from steveklabnik/changelog_7997Rafael Mendonça França2012-11-261-1/+1
|\ \ \ | | | | | | | | @steveklabnik can't spell 'distance.'
| * | | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
| | | |
* | | | Merge pull request #8323 from steveklabnik/changelog_7997Rafael Mendonça França2012-11-261-0/+2
|\| | | | | | | | | | | Add changelog for #7997.
| * | | Add changelog for #7997.Steve Klabnik2012-11-261-0/+2
|/ / / | | | | | | | | | This was forgotten when we did the merge.
* | | Merge pull request #8319 from alindeman/typoCarlos Antonio da Silva2012-11-261-1/+1
|\ \ \ | | | | | | | | Corrects typo in test name [ci skip]
| * | | Corrects typo in test nameAndy Lindeman2012-11-261-1/+1
| | | |
* | | | Merge pull request #8320 from senny/active_model_log_folderCarlos Antonio da Silva2012-11-261-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log output from activemodel's railtie_test directly to STDOUT. There's no logging going on here, but since we initialize the app, the logger is set and the folder is automatically created. With this change, the default logger is not created, so there is no logging folder anymore. Conflicts: activemodel/test/cases/railtie_test.rb
| * | | | log output from activemodel's railtie_test directly to STDOUTYves Senn2012-11-261-0/+1
| | |/ / | |/| | | | | | | | | | | | | | after this patch, running the tests in activemodel will no longer create an untracked log/ folder inside of activemodel
* | | | Merge pull request #6197 from ↵Xavier Noria2012-11-263-6/+24
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | blakesmith/connection_adapters_without_explain_support Don't run explain on slow queries for database adapters that don't support it
| * | | Don't run explain on slow queries for database adapters that don't support itBlake Smith2012-11-263-6/+24
|/ / /
* | | Merge pull request #8312 from ↵Rafael Mendonça França2012-11-269-21/+14
|\ \ \ | | | | | | | | | | | | | | | | senny/make_active_model_parts_individually_loadable make sure that individual parts `ActiveModel` can be required by itself
| * | | cleanup, removed dispensable `require` statements from `ActiveModel`Yves Senn2012-11-258-12/+5
| | | |
| * | | cleanup, remove broken whitespaceYves Senn2012-11-254-9/+9
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 21:22:25 +0000