aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-06-222-1/+8
| | | | | | | | | | To test uploading a file without using fixture_file_upload, a posted ActionDispatch::Http::UploadedFile should not be paramified (just like Rack::Test::UploadedFile). (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't share the same API, tempfile is not accessible on Rack::Test::UploadedFile as discussed in https://github.com/brynary/rack-test/issues/30)
* Merge pull request #6426 from pinetops/template_concurrency_masterCarlos Antonio da Silva2012-06-200-0/+0
|\ | | | | Prevent concurrent compilation of templates - closes #6400
| * Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-211-10/+22
| | | | | | | | | | | | | | | | | | | | This addresses an issue where in multi-threaded environments multiple threads can attempt to compile a template at the same time, which occasionally causes particular templates to end up in a bad state. So, add synchronization such that only a single thread can attempt to compile a template at one time.
* | Bump minitest to 3.1.0Santiago Pastorino2012-06-201-1/+1
| |
* | Merge pull request #6789 from takoyakikamen/aptestsAaron Patterson2012-06-191-0/+1
|\ \ | | | | | | Correct the AP test。
| * | Correct the AP test。タコ焼き仮面2012-06-191-0/+1
|/ /
* | Run the logger tests in isolationRafael Mendonça França2012-06-192-1/+3
| |
* | CORES needs to be a integerRafael Mendonça França2012-06-191-1/+1
| |
* | run the notes tests in isolationAaron Patterson2012-06-191-0/+4
| |
* | run railties tests in parallel, default to 2 coresAaron Patterson2012-06-192-2/+39
| |
* | Merge branch 'aderyabin-fix7'Rafael Mendonça França2012-06-193-23/+67
|\ \ | | | | | | | | | Closes #6007
| * | Remove unneeded code since pluck is respecting joins nowRafael Mendonça França2012-06-191-12/+1
| | |
| * | Extract conditional to a method to avoid duplicationRafael Mendonça França2012-06-192-15/+22
| | | | | | | | | | | | Also use if/else block to not use short circuit return
| * | handle joins/includes correctly for pluck and calculation.Andrey Deryabin2012-06-192-1/+49
| | | | | | | | | | | | Fix #5990
* | | Merge pull request #6787 from frodsan/add_nodoc_asset_helpersCarlos Antonio da Silva2012-06-193-4/+4
|\ \ \ | |/ / |/| | | | | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTag [ci skip]
| * | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTagFrancesco Rodriguez2012-06-193-4/+4
| | |
* | | join any extra args to the tmp pathAaron Patterson2012-06-191-0/+1
|/ /
* | expand the tmpdir to the realpath so tests on OS X passAaron Patterson2012-06-192-2/+2
| |
* | Merge branch 'remote'Aaron Patterson2012-06-192-33/+22
|\ \ | | | | | | | | | | | | * remote: move fanout back to a global variable, add a mutex for safety
| * | move fanout back to a global variable, add a mutex for safetyAaron Patterson2012-06-192-33/+22
| | |
* | | use system tmpdir rather than our ownAaron Patterson2012-06-193-13/+26
| | |
* | | make logger a singleton on the classAaron Patterson2012-06-191-3/+7
| | |
* | | listeners are per thread, so remove nested hashAaron Patterson2012-06-191-6/+4
|/ /
* | Add missing requireRafael Mendonça França2012-06-191-0/+2
| |
* | Merge pull request #6782 from kennyj/db-rake-structure-dumpRafael Mendonça França2012-06-199-14/+147
|\ \ | | | | | | Refactor db:structure:dump task.
| * | Refactor db:structure:dump task.kennyj2012-06-209-14/+147
| | |
* | | Merge pull request #6784 from msgehard/active_support_cleanupCarlos Antonio da Silva2012-06-191-7/+4
|\ \ \ | | | | | | | | Remove extra test case.
| * | | Remove extra test case.Mike Gehard2012-06-191-7/+4
| |/ / | | | | | | | | | Make the test description better reflect what is happening
* | | subscribers are per thread, so remove the nested hash accessAaron Patterson2012-06-191-5/+3
| | |
* | | documenting concurrency rules for the Fanout classAaron Patterson2012-06-191-0/+3
| | |
* | | remove global cacheAaron Patterson2012-06-191-7/+2
| | |
* | | reduce thread localsAaron Patterson2012-06-191-3/+20
| | |
* | | make the fanout notifier local to the current threadAaron Patterson2012-06-191-4/+8
| | |
* | | Merge pull request #6785 from kennyj/rename_testcase_nameCarlos Antonio da Silva2012-06-191-1/+1
|\ \ \ | | | | | | | | Rename testcase name. It's wrong in the context.
| * | | Rename testcase name. It's wrong in the context.kennyj2012-06-201-1/+1
| |/ /
* | | Merge pull request #6783 from kennyj/rename_testnameRafael Mendonça França2012-06-191-1/+1
|\ \ \ | |/ / |/| | Rename MySQLTestPurge to MySQLPurgeTest for consistency.
| * | Rename MySQLTestPurge to MySQLPurgeTest for consistency.kennyj2012-06-201-1/+1
|/ /
* | Merge pull request #6779 from simonjefford/db-rake-charsetCarlos Antonio da Silva2012-06-199-20/+118
|\ \ | | | | | | Refactor db:charset task
| * | Refactor db:charset taskSimon Jefford2012-06-199-20/+118
|/ / | | | | | | | | In a similar vein to Pat's work on create, drop etc, the db:charset task is now a one liner in databases.rake
* | Merge pull request #6777 from route/logger_in_metal_testsCarlos Antonio da Silva2012-06-191-0/+17
|\ \ | | | | | | | | | Added test for case when view doesn't have logger method when using ActionController::Metal controller.
| * | Added test for case when view doesn't have logger method when using ↵Dmitry Vorotilin2012-06-191-0/+17
| | | | | | | | | | | | ActionController::Metal controller.
* | | Merge pull request #6776 from raggi/cache_controlJosé Valim2012-06-182-10/+44
|\ \ \ | |/ / |/| | Ensure that cache-control headers are merged
| * | Ensure that cache-control headers are mergedJames Tucker2012-06-182-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several aspects to this commit, that don't well fit into broken down commits, so they are detailed here: * When a user uses response.headers['Cache-Control'] = some_value, then the documented convention in ConditionalGet is not adhered to, in this case, response.cache_control is ignored due to `return if self[CACHE_CONTROL].present?` * When a middleware sets cache-control headers that would clobber, they're converted to symbols directly, without underscores. This would lead to bugs. * Items that would live in :extras if set through expires_in, are placed directly in the @cache_control hash, and not respected in many cases (somewhat adhering to the aforementioned documentation). * Although quite useless, any directive named 'extras' would be ignored. The general convention applied is that expires_* take precedence, but no longer overwrite everything and expires_* are ALWAYS applied, even if the header is set. I am still unhappy about the contents of this commit, and the code in general. Ideally it should be refactored to no longer use :extras. I'd likely recommend expanding @cache_control into a class, and giving it the power to handle the merge in a more efficient fashion. Such a commit would be a larger change that could have additional semantic changes for other libraries unless they utilize expires_in in very standard ways.
* | | Merge branch 'acapilleri-update_nested_attributes'Rafael Mendonça França2012-06-192-5/+25
|\ \ \ | | | | | | | | | | | | Closes #6675
| * | | Refactor the conditionalsRafael Mendonça França2012-06-191-7/+7
| | | |
| * | | Validates_numericality_of is skipped when changing 0 to to non-empty stringAngelo capilleri2012-06-192-5/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens when A has_many many B and A accepts_nested_attributes B that has a numeric colum with initial 0 value. So a.update_attributes({:b_attributes => { :id => b.id, :numeric => 'foo' }}) passes the validation test but, the value of :numeric doesn't change. his commit forces that the update fails with the above conditions. Fixes #6393 Fixes #2331
* | | Merge pull request #5412 from tilsammans/stored_attributesCarlos Antonio da Silva2012-06-183-2/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `stored_attributes` hash which contains the attributes stored using ActiveRecord::Store. This allows you to retrieve the list of attributes you've defined. class User < ActiveRecord::Base store :settings, accessors: [:color, :homepage] end User.stored_attributes[:settings] # [:color, :homepage]
| * | | Refactor and use class_attributeCarlos Antonio da Silva2012-06-182-7/+15
| | | |
| * | | Remember the stored attributes in a config attribute.Joost Baaij2012-06-183-1/+23
|/ / / | | | | | | | | | | | | | | | This allows you to retrieve the list of attributes you've defined. Usable for e.g. selects in the view, or interators based on the attributes you wish to store in the serialized column.
* | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2012-06-181-2/+19
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 05:30:10 +0000