aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| | | |
* | | | Improve clarity of routing testsAndrew White2012-11-261-634/+1081
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the routes for each test inside the test method so that it's easier to see which routes are applicable to which test. To ensure that each test wasn't invalidated the changes were done by first removing all of the routes, ensuring that all of the tests failed and then adding the routes back to each test one by one. One test for `assert_recognizes` was removed as it wasn't actually testing the defined routes and is now tested more thoroughly in routing_assertions_test.rb. One downside is that the test suite takes about 1s longer due to having to using `method_missing` for handling the url helpers as using `include url_helpers` isn't isolated for each test.
* | | | Require active_model/railtie directly instead of rails/allCarlos Antonio da Silva2012-11-261-3/+3
| |/ / |/| | | | | | | | Use Class.new with a block instead of tap to configure it.
* | | Merge pull request #8316 from roberto/assert_template_validate_optionsCarlos Antonio da Silva2012-11-263-1/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | assert_template: validating option keys It only handles the keys locals, partial, layout and count. assert_template(foo: "bar") # raises ArgumentError assert_template(leiaute: "test") # raises ArgumentError
| * | | assert_template: validating option keysRoberto Soares2012-11-253-1/+11
| | | |
* | | | Merge pull request #8317 from latortuga/cache-digest-opt-outDavid Heinemeier Hansson2012-11-263-1/+38
|\ \ \ \ | | | | | | | | | | Add explicit opt-out for fragment cache digesting
| * | | | Add explicit opt-out for fragment cache digestingDrew Ulmer2012-11-253-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This add support for sending an explicit opt-out of the "Russian-doll" cache digest feature on a case-by-case basis. This is useful when cache- expiration needs to be performed manually and it would be otherwise difficult to know the exact name of a digested cache key. More information: https://github.com/rails/cache_digests/pull/16
* | | | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-252-2/+12
| | | | |
* | | | | speed up fixture loading by querying the schema cache for column namesAaron Patterson2012-11-252-2/+11
| |/ / / |/| | |
* | | | Merge pull request #8302 from roberto/assert_template_empty_stringCarlos Antonio da Silva2012-11-253-1/+19
|\ \ \ \ | |/ / / |/| | | assert_template("") will now fail no matter whether a template has been rendered or not.
| * | | `assert_template` fails with empty string.Roberto Soares2012-11-233-9/+12
| | | |
| * | | `assert_template` fails with empty string when a template has been renderedRoberto Soares2012-11-233-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For instance, it prevents false positive in this case: file = nil get :index assert_template("#{file}")
* | | | Merge pull request #8311 from alisdair/dirty-nullable-datetimeCarlos Antonio da Silva2012-11-253-0/+21
|\ \ \ \ | |_|/ / |/| | | Don't call will_change! for datetime nil->"".
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 16:42:57 +0000