aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* RouteSet should be in charge of constructing the dispatherAaron Patterson2014-07-153-10/+15
* Merge pull request #16180 from rafaelfranca/rm-dirtyRafael Mendonça França2014-07-156-18/+79
|\
| * Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`.Rafael Mendonça França2014-07-155-13/+38
| * Deprecate ActiveModel::Dirty#reset_changes in favor of #clear_changes_informa...Rafael Mendonça França2014-07-154-6/+42
* | Add CHANGELOG entry for #13392 [ci skip]Rafael Mendonça França2014-07-151-0/+7
* | Keep quietly and capture undeprecated on your suiteRafael Mendonça França2014-07-1510-21/+140
* | Deprecate reporting methods for silencing output as they aren't thread safeTom Meier2014-07-151-0/+10
* | Merge pull request #16129 from rafaelfranca/config_forRafael Mendonça França2014-07-153-0/+134
|\ \
| * | Add Rails::Application#config_forRafael Mendonça França2014-07-153-0/+134
| |/
* | Merge branch 'master' of git://github.com/rails/railsGodfrey Chan2014-07-154-6/+24
|\|
| * Merge branch 'jbrowning-fix_mariadb_rename_index'Rafael Mendonça França2014-07-154-6/+24
| |\
| | * Predicate methods don't need to return `true` / `false`Rafael Mendonça França2014-07-151-1/+1
| | * Fix version detection for RENAME INDEX support. Fixes #15931.Jeff Browning2014-07-154-6/+24
* | | Document the change in `nil` handling for serialized attributesGodfrey Chan2014-07-152-9/+17
* | | Fixed SQL syntax for postgresqlGodfrey Chan2014-07-151-1/+1
* | | Merge pull request #16162 from chancancode/fix_json_coderGodfrey Chan2014-07-152-1/+19
* | | 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