Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #8216 from trevorturk/master | Rafael Mendonça França | 2012-11-14 | 5 | -2/+52 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use BCrypt's MIN_COST in the test environment for speedier tests | Trevor Turk | 2012-11-14 | 5 | -2/+52 | |
* | | | | | | Merge pull request #8218 from DawidJanczak/form-tag-doc | Carlos Antonio da Silva | 2012-11-14 | 1 | -1/+1 | |
* | | | | | | asset compilation should not require a database connection | Aaron Patterson | 2012-11-13 | 1 | -0/+26 | |
* | | | | | | lazily calculate name in the options object | Aaron Patterson | 2012-11-13 | 1 | -14/+18 | |
* | | | | | | move include calculation to include method on the options object | Aaron Patterson | 2012-11-13 | 1 | -9/+24 | |
* | | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
* | | | | | | | 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 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | 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 | 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. | Yves Senn | 2012-11-12 | 3 | -1/+18 | |
| * | | | | | | | 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 | 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). | James Mead | 2012-11-12 | 2 | -25/+5 | |
| |/ / / / / | ||||||
* | | | | | | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag t... | Aaron Patterson | 2012-11-12 | 1 | -0/+1 | |
* | | | | | | 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 | Yves Senn | 2012-11-12 | 3 | -1/+24 | |
| |/ / / / / | ||||||
* | | | | | | 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 | |
* | | | | | | 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 | 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 | |
* | | | | | 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. | Nikita Afanasenko | 2012-11-11 | 1 | -10/+10 | |
* | | | | | | 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 | 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 | Arun Agrawal | 2012-11-11 | 1 | -2/+2 | |
|/ / / / / | ||||||
* / / / / | Make ActiveRecord::Delegation#method_missing threadsafe | Jon Leighton | 2012-11-10 | 1 | -3/+21 | |
|/ / / / | ||||||
* | | | | 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 | 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 | |
|\ \ \ \ \ |