aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Revert "Revert "Merge pull request #16059 from jenncoop/json-serialized-attr""Godfrey Chan2014-07-155-2/+76
|/ / / / / / / / / / /
* / / / / / / / / / / Add CHANGELOG entry for #15266Godfrey Chan2014-07-151-0/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #15266 from dv/use_counter_cache_for_empty_callGodfrey Chan2014-07-152-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | If a counter_cache exists, use it for #empty?David Verhasselt2014-06-102-0/+15
* | | | | | | | | | | Merge pull request #16142 from andreychernih/extend-server-optionsRafael Mendonça França2014-07-151-7/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add ability to extend `rails server` command options parserAndrey Chernih2014-07-111-7/+11
* | | | | | | | | | | | Merge pull request #16175 from skorks/log_digestor_as_debugRafael Mendonça França2014-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Log digest as :debug instead of :infoAlan Skorkin2014-07-151-1/+1
* | | | | | | | | | | | Merge pull request #16161 from jpawlyn/masterAndrew White2014-07-153-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Return an absolute instead of relative path from an asset url in the case of ...Jolyon Pawlyn2014-07-153-1/+14
* | | | | | | | | | | | | Merge pull request #16174 from tgxworld/doc_fixZachary Scott2014-07-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | [CI SKIP] Doc fix.Guo Xiang Tan2014-07-151-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #16089 from eileencodes/refactor-reflections-from-sub-clas...Aaron Patterson2014-07-143-101/+158
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Begin refactoring ThroughReflectioneileencodes2014-07-083-101/+158
* | | | | | | | | | | | Merge pull request #16168 from greysteil/stash-path-infoMatthew Draper2014-07-143-2/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Stash original path in `ShowExceptions` middlewareGrey Baker2014-07-143-2/+15
* | | | | | | | | | | | | Merge pull request #16167 from yahonda/ora972_facesMatthew Draper2014-07-143-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Address ORA-00972: identifier is too long when tested with OracleYasuo Honda2014-07-143-4/+5
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #16127 from Envek/fix_16111Matthew Draper2014-07-143-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Dump PostgreSQL primary key with custom function as a default.Andrey Novikov2014-07-113-1/+32
* | | | | | | | | | | | Merge pull request #16156 from mechanicles/document-improvementZachary Scott2014-07-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] Little bit doc code improvement.Santosh Wadghule2014-07-141-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Format pass on 4.2 release notes [ci skip]Godfrey Chan2014-07-131-157/+163
* | | | | | | | | | | | Merge pull request #16155 from mechanicles/fix-typosZachary Scott2014-07-133-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]Santosh Wadghule2014-07-143-4/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #16150 from sferik/fix-testsMatthew Draper2014-07-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix tests broken in https://github.com/rails/rails/pull/16149Erik Michaels-Ober2014-07-121-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #16149 from sferik/refactor-transform_valuesGuillermo Iguaran2014-07-124-2/+50
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Return an Enumerator if no block is givenErik Michaels-Ober2014-07-124-1/+49
| * | | | | | | | | | Don't construct a Proc if no block is givenErik Michaels-Ober2014-07-121-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #16147 from seuros/templatesMatthew Draper2014-07-122-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [Bug report templates] Added rack master to the GemfileAbdelkader Boudih2014-07-122-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-07-121-113/+93
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix mismatched example call [ci skip]Vijay Dev2014-07-121-2/+2
| * | | | | | | | | | Revert "[ci skip] Fix doc for except"Vijay Dev2014-07-121-4/+5
| * | | | | | | | | | Prefer find_by over where.first for recordGaurish Sharma2014-07-071-1/+1
| * | | | | | | | | | [ci skip] remove invalid code from docsschneems2014-06-281-2/+0
| * | | | | | | | | | [ci skip] Fix doc for exceptschneems2014-06-281-5/+4
| * | | | | | | | | | [ci skip] Doc ability to chain in `find_each`schneems2014-06-281-1/+9
| * | | | | | | | | | [ci skip] Consolidate docs for `find`schneems2014-06-281-25/+19
| * | | | | | | | | | [ci skip] Consolidate docs for `last`schneems2014-06-281-16/+21
| * | | | | | | | | | [ci skip] Consolidate docs for `take`schneems2014-06-281-35/+20
| * | | | | | | | | | [ci skip] Consolidate docs for `find_by`schneems2014-06-281-19/+14
| * | | | | | | | | | [ci skip] Consolidate docs for `first`schneems2014-06-281-35/+21
| * | | | | | | | | | [ci skip] Add return values to examplesschneems2014-06-281-1/+10
* | | | | | | | | | | Assert the nature of the original exceptionMatthew Draper2014-07-121-0/+1
* | | | | | | | | | | Merge pull request #16143 from robin850/silence-downloading-outputRafael Mendonça França2014-07-111-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Silence the output downloading a fileRobin Dupret2014-07-111-1/+0
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #16144 from grekko/patch-1Richard Schneeman2014-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixing typo in commentGregory Igelmund2014-07-121-1/+1
|/ / / / / / / / / / /