| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | model name is lazily evaluated in the options object | Aaron Patterson | 2012-11-13 | 1 | -27/+37 | |
| | | | | | | ||||||
| * | | | | | move the controller class to the options object | Aaron Patterson | 2012-11-13 | 1 | -9/+12 | |
| | | | | | | ||||||
| * | | | | | attribute_names will always return a list, so just use any? | Aaron Patterson | 2012-11-13 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | wrap up hash conversion in the constructor | Aaron Patterson | 2012-11-13 | 1 | -5/+5 | |
| | | | | | | ||||||
| * | | | | | use the options object in the wrapper defaults | Aaron Patterson | 2012-11-13 | 1 | -13/+12 | |
| | | | | | | ||||||
| * | | | | | start using options object | Aaron Patterson | 2012-11-13 | 2 | -10/+21 | |
| | | | | | | ||||||
| * | | | | | only do hash lookups on options once | Aaron Patterson | 2012-11-13 | 1 | -13/+15 | |
| | | | | | | ||||||
| * | | | | | replace present? with any? to reduce dependency on AS | Aaron Patterson | 2012-11-13 | 2 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #8169 from nicolasdespres/robust_git_repository_check | Rafael Mendonça França | 2012-11-13 | 3 | -1/+32 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Rake test:uncommitted finds git directory in ancestors. | |||||
| | * | | | | | Add ChangeLog entry. | Nicolas Despres | 2012-11-13 | 1 | -0/+2 | |
| | | | | | | | ||||||
| | * | | | | | Rake test:uncommitted finds git directory in ancestors. | Nicolas Despres | 2012-11-10 | 2 | -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.0 | Aaron Patterson | 2012-11-13 | 2 | -0/+16 | |
| | | | | | | | ||||||
| * | | | | | | Assert the query result instead of checking for nothing raised | Carlos Antonio da Silva | 2012-11-13 | 1 | -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_result | Carlos Antonio da Silva | 2012-11-13 | 2 | -0/+13 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Regression test for #7238 | |||||
| | * | | | | | Regression test for #7238 | Nikita Afanasenko | 2012-11-13 | 2 | -0/+13 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #8176 from senny/7551_pluck_with_select | Rafael Mendonça França | 2012-11-13 | 3 | -2/+19 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | `#pluck` can be used on a relation with `select` clause (#7551) | |||||
| | * | | | | | | `#pluck` can be used on a relation with `select` clause. | Yves Senn | 2012-11-12 | 3 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7551 | |||||
| | * | | | | | | cleanup, removed whitespace from CHANGELOG | Yves Senn | 2012-11-12 | 1 | -1/+1 | |
| | | |_|/ / / | |/| | | | | ||||||
| * | | | | | | Merge pull request #8201 from nikitug/regression_test_on_ar_cache_key_precision | Rafael Mendonça França | 2012-11-13 | 1 | -0/+7 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add a regression test on #8195 | |||||
| | * | | | | | | Add a regression test on #8195 | Nikita Afanasenko | 2012-11-13 | 1 | -0/+7 | |
| | | |/ / / / | |/| | | | | ||||||
| * | | | | | | Use new mocha version and add changelog entry for #8180 | Carlos Antonio da Silva | 2012-11-13 | 2 | -1/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0.13-onwards | Carlos Antonio da Silva | 2012-11-13 | 2 | -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 Mead | 2012-11-12 | 2 | -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 Patterson | 2012-11-12 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | this file with us-ascii | |||||
| * | | | | | Merge pull request #8185 from senny/8182_as_json_options_stick_around | Carlos Antonio da Silva | 2012-11-12 | 3 | -1/+24 | |
| |\ \ \ \ \ | | | | | | | | | | | | | `#as_json` isolates options when encoding a hash. Closes #8182 | |||||
| | * | | | | | `#as_json` isolates options when encoding a hash. Closes #8182 | Yves Senn | 2012-11-12 | 3 | -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 database | Aaron Patterson | 2012-11-12 | 1 | -2/+4 | |
| | | | | | | ||||||
| * | | | | | depend on voloko/sdoc again | Xavier Noria | 2012-11-12 | 1 | -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_tests | Carlos Antonio da Silva | 2012-11-12 | 3 | -18/+25 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Merge and add tests related to #5215 | |||||
| | * | | | | | Merge and add tests related to 5215 | Vipul A M | 2012-11-12 | 3 | -18/+25 | |
| | |/ / / / | ||||||
| * / / / / | Debugger gem doesn't work with patchlevel < 327 | Santiago Pastorino | 2012-11-12 | 1 | -1/+2 | |
| |/ / / / | ||||||
| * | | | | Remove duplicated ConnectionHandling extension in AR::Base | Carlos Antonio da Silva | 2012-11-11 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | Thanks @toretore. https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#commitcomment-2134706 | |||||
| * | | | | Merge pull request #8173 from nikitug/match_classes_without_to_s | Carlos Antonio da Silva | 2012-11-11 | 1 | -10/+10 | |
| |\ \ \ \ | | | | | | | | | | | Match classes without to_s conversions. | |||||
| | * | | | | Match classes without to_s conversions. | Nikita Afanasenko | 2012-11-11 | 1 | -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_deprecation | Santiago Pastorino | 2012-11-11 | 1 | -1/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Test Hash#diff deprecation, also prevent deprecation message in AS tests | |||||
| | * | | | | | Test Hash#diff deprecation, also prevent deprecation message in AS tests | Nikita Afanasenko | 2012-11-11 | 1 | -1/+3 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #8170 from arunagw/warning_removed_railties | Santiago Pastorino | 2012-11-11 | 1 | -2/+2 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | Removing warning : ambiguous first argument | |||||
| | * | | | | Removing warning : ambiguous first argument | Arun Agrawal | 2012-11-11 | 1 | -2/+2 | |
| |/ / / / | ||||||
| * / / / | Make ActiveRecord::Delegation#method_missing threadsafe | Jon Leighton | 2012-11-10 | 1 | -3/+21 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two threads may be in method_missing at the same time. If so, they might both try to define the same delegator method. Such a situation probably wouldn't result in a particularly spectacular bug as one method would probably just be overridden by an identical method, but it could cause warnings to pop up. (It could be worse if method definition is non-atomic in a particular implementation.) (We will also need this mutex shortly anyway, see #8127.) | |||||
| * | | | recent railties changes added to the release notes [ci skip] | Vijay Dev | 2012-11-10 | 1 | -0/+39 | |
| | | | | ||||||
| * | | | update turbolinks readme link [ci skip] | Vijay Dev | 2012-11-10 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge pull request #8165 from arunagw/warning_removed_unused_variables | Carlos Antonio da Silva | 2012-11-10 | 2 | -2/+2 | |
| |\ \ \ | | | | | | | | | Removing warning : assigned but unused variable | |||||
| | * | | | Removing warning : assigned but unused variable | Arun Agrawal | 2012-11-10 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #8154 from bogdan/has_one_association_performance | Carlos Antonio da Silva | 2012-11-10 | 3 | -1/+24 | |
| |\ \ \ \ | | | | | | | | | | | Remove unwanted transaction when has one association is built | |||||
| | * | | | | Do not create useless database transaction when building `has_one` association. | Bogdan Gusiev | 2012-11-10 | 3 | -1/+24 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #8164 from nikitug/keep_serialization_in_its_module | Carlos Antonio da Silva | 2012-11-10 | 2 | -9/+13 | |
| |\ \ \ \ | |/ / / |/| | | | Keep the code related to serialization in Serialization module. | |||||
| | * | | | Keep the code related to serialization in Serialization module. | Nikita Afanasenko | 2012-11-10 | 2 | -9/+13 | |
| |/ / / | | | | | | | | | | We should not need any `serialized_attributes` checks outside `ActiveRecord::AttributeMethods::Serialization` module. | |||||
| * | | | Merge pull request #8162 from fimmtiu/master | Rafael Mendonça França | 2012-11-09 | 1 | -2/+2 | |
| |\ \ \ | | | | | | | | | Trivial documentation fix for ActiveModel::Naming comment [ci skip] | |||||
| | * | | | Trivial documentation fix for ActiveModel::Naming comment. | Dennis Taylor | 2012-11-09 | 1 | -2/+2 | |
| |/ / / | ||||||
| * | | | Use get in the redirection doc examples | Carlos Antonio da Silva | 2012-11-09 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | get is the most common usage, and match without an explicit verb was disallowed in 56cdc81c08b1847c5c1f699810a8c3b9ac3715a6. [ci skip] | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |