aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8219 from nikitug/threadsafe_xmlmini_with_backendRafael Mendonça França2012-11-153-9/+104
|\ | | | | | | | | | | | | Make XmlMini.with_backend usable with threads Conflicts: activesupport/CHANGELOG.md
| * Make XmlMini.with_backend usable with threadsNikita Afanasenko2012-11-153-9/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | `XmlMini.with_backend` now may be safely used with threads: Thread.new do XmlMini.with_backend("REXML") { rexml_power } end Thread.new do XmlMini.with_backend("LibXML") { libxml_power } end Each thread will use it's own backend.
* | let remove_constant still delete Kernel#autoload constants [rounds #8213]Xavier Noria2012-11-153-13/+25
|/ | | | | The method #remove_const does not load the file, so we can still remove the constant.
* Merge pull request #8222 from marcandre/avoid_slashRafael Mendonça França2012-11-142-1/+6
|\ | | | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlib
| * Avoid using Integer#/, as it is redefined by the 'mathn' stdlibMarc-Andre Lafortune2012-11-142-1/+6
| |
* | dependencies no longer trigger Kernel#autoload in remove_const [fixes #8213]Xavier Noria2012-11-154-13/+44
| |
* | Merge pull request #8216 from trevorturk/masterRafael Mendonça França2012-11-145-2/+52
|\ \ | | | | | | Use BCrypt's MIN_COST in the test environment for speedier tests
| * | Use BCrypt's MIN_COST in the test environment for speedier testsTrevor Turk2012-11-145-2/+52
| | |
* | | Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | [ci skip] Correct examples for form_tag helper. Conflicts: actionpack/lib/action_view/helpers/form_tag_helper.rb
* | | asset compilation should not require a database connectionAaron Patterson2012-11-131-0/+26
| | |
* | | lazily calculate name in the options objectAaron Patterson2012-11-131-14/+18
| | |
* | | move include calculation to include method on the options objectAaron Patterson2012-11-131-9/+24
| | |
* | | model name is lazily evaluated in the options objectAaron Patterson2012-11-131-27/+37
| | |
* | | move the controller class to the options objectAaron Patterson2012-11-131-9/+12
| | |
* | | attribute_names will always return a list, so just use any?Aaron Patterson2012-11-131-1/+1
| | |
* | | wrap up hash conversion in the constructorAaron Patterson2012-11-131-5/+5
| | |
* | | use the options object in the wrapper defaultsAaron Patterson2012-11-131-13/+12
| | |
* | | start using options objectAaron Patterson2012-11-132-10/+21
| | |
* | | only do hash lookups on options onceAaron Patterson2012-11-131-13/+15
| | |
* | | replace present? with any? to reduce dependency on ASAaron Patterson2012-11-132-1/+2
| | |
* | | Merge pull request #8169 from nicolasdespres/robust_git_repository_checkRafael Mendonça França2012-11-133-1/+32
|\ \ \ | | | | | | | | Rake test:uncommitted finds git directory in ancestors.
| * | | Add ChangeLog entry.Nicolas Despres2012-11-131-0/+2
| | | |
| * | | Rake test:uncommitted finds git directory in ancestors.Nicolas Despres2012-11-102-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes your git directory is an ancestor of your application root directory. For example: ./repo/.git/ ./repo/app/Rakefile In this case rake test:uncommitted will be unable to detect your SCM. This patch fixes this and add a test.
* | | | backporting Struct#to_h from ruby 2.0Aaron Patterson2012-11-132-0/+16
| | | |
* | | | Assert the query result instead of checking for nothing raisedCarlos Antonio da Silva2012-11-131-4/+2
| |/ / |/| | | | | | | | | | | | | | | | | Nothing should be raised anyway :smile: Thanks @spastorino :heart: https://github.com/rails/rails/pull/8202/files#r2112067
* | | Merge pull request #8202 from nikitug/regression_test_on_dynamic_finder_resultCarlos Antonio da Silva2012-11-132-0/+13
|\ \ \ | | | | | | | | Regression test for #7238
| * | | Regression test for #7238Nikita Afanasenko2012-11-132-0/+13
| | | |
* | | | Merge pull request #8176 from senny/7551_pluck_with_selectRafael Mendonça França2012-11-133-2/+19
|\ \ \ \ | | | | | | | | | | `#pluck` can be used on a relation with `select` clause (#7551)
| * | | | `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-123-1/+18
| | | | | | | | | | | | | | | | | | | | Closes #7551
| * | | | cleanup, removed whitespace from CHANGELOGYves Senn2012-11-121-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #8201 from nikitug/regression_test_on_ar_cache_key_precisionRafael Mendonça França2012-11-131-0/+7
|\ \ \ \ | | | | | | | | | | Add a regression test on #8195
| * | | | Add a regression test on #8195Nikita Afanasenko2012-11-131-0/+7
| | |/ / | |/| |
* | | | Use new mocha version and add changelog entry for #8180Carlos Antonio da Silva2012-11-132-1/+3
| | | |
* | | | Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0.13-onwardsCarlos Antonio da Silva2012-11-132-25/+5
|\ \ \ \ | |/ / / |/| | | Simplify code by taking advantage of latest mocha (v0.13.0).
| * | | Simplify code by taking advantage of latest mocha (v0.13.0).James Mead2012-11-122-25/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only works with mocha v0.13.0 or later. Note that this also fixes a few subtle bugs present in the current implementation :- * Mocha was raising a `MiniTest::Assertion` instead of a `Mocha::ExpectationError` as intended. The latter is not recognized by MiniTest as an assertion failure and so it is recorded as a test *error*, not a test *failure* as it ought to. This leads to potentially confusing output in the test results. * Mocha verification should happen as part of the test. The verification of expectations is equivalent to a set of assertions. These assertions should happen as *part of* the test so that they have a chance to cause the test to fail, and not just as part of the teardown. Also if an assertion fails during the test, then there is no need to verify expectations, because only the first assertion failure is normally reported and all subsequent bets are off. * Expectation verification should be counted as an assertion. Mocha cannot record each expectation verification as an assertion, because we weren't passing in an assertion counter to `#mocha_verify`.
* | | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag ↵Aaron Patterson2012-11-121-0/+1
| | | | | | | | | | | | this file with us-ascii
* | | Merge pull request #8185 from senny/8182_as_json_options_stick_aroundCarlos Antonio da Silva2012-11-123-1/+24
|\ \ \ | | | | | | | | `#as_json` isolates options when encoding a hash. Closes #8182
| * | | `#as_json` isolates options when encoding a hash. Closes #8182Yves Senn2012-11-123-1/+24
| |/ / | | | | | | | | | | | | | | | Setting options in a custom `#as_json` method had side effects. Modifications of the `options` hash leaked outside and influenced the conversion of other objects contained in the hash.
* | | only clear caches if we are actually connected to the databaseAaron Patterson2012-11-121-2/+4
| | |
* | | depend on voloko/sdoc againXavier Noria2012-11-121-1/+1
| | | | | | | | | | | | | | | voloko/sdoc seems to be maintained again, in particular the issues that made us fork it are resolved.
* | | Merge pull request #8184 from vipulnsward/add_merge_testsCarlos Antonio da Silva2012-11-123-18/+25
|\ \ \ | | | | | | | | Merge and add tests related to #5215
| * | | Merge and add tests related to 5215Vipul A M2012-11-123-18/+25
| |/ /
* / / Debugger gem doesn't work with patchlevel < 327Santiago Pastorino2012-11-121-1/+2
|/ /
* | Remove duplicated ConnectionHandling extension in AR::BaseCarlos Antonio da Silva2012-11-111-1/+0
| | | | | | | | | | Thanks @toretore. https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#commitcomment-2134706
* | Merge pull request #8173 from nikitug/match_classes_without_to_sCarlos Antonio da Silva2012-11-111-10/+10
|\ \ | | | | | | Match classes without to_s conversions.
| * | Match classes without to_s conversions.Nikita Afanasenko2012-11-111-10/+10
| | | | | | | | | | | | There is no need in `value_under_case.class.to_s` conversion since case already matches classes with `Class === value_under_case`.
* | | Merge pull request #8172 from nikitug/silent_diff_deprecationSantiago Pastorino2012-11-111-1/+3
|\ \ \ | | | | | | | | Test Hash#diff deprecation, also prevent deprecation message in AS tests
| * | | Test Hash#diff deprecation, also prevent deprecation message in AS testsNikita Afanasenko2012-11-111-1/+3
| |/ /
* | | Merge pull request #8170 from arunagw/warning_removed_railtiesSantiago Pastorino2012-11-111-2/+2
|\ \ \ | |/ / |/| | Removing warning : ambiguous first argument
| * | Removing warning : ambiguous first argumentArun Agrawal2012-11-111-2/+2
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-19 07:31:28 +0000