aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* document assert[_not]_empty, assert[_not]_includes, assert[_not]_predicate in...Jonas Baumann2014-07-161-0/+6
* use foreign key DSL in our tests.Yves Senn2014-07-162-5/+4
* Merge pull request #16138 from sgrif/sg-attribute-set-keyYves Senn2014-07-163-10/+10
|\
| * AttributeSet#include? -> AttributeSet#key?Sean Griffin2014-07-113-10/+10
* | Fix 1.9. uggghhhhhh get it together @tenderlove :bomb:Aaron Patterson2014-07-151-2/+2
* | fix for 1.9 kwargs syntaxAaron Patterson2014-07-151-1/+2
* | routed applications will respond to these methodsAaron Patterson2014-07-152-2/+2
* | Merge branch 'rm-uuid'Rafael Mendonça França2014-07-156-78/+78
|\ \
| * | Move uuid_v5 and uuid_v3 to Digest::UUIDRafael Mendonça França2014-07-156-78/+78
* | | stop passing recall to url_forAaron Patterson2014-07-152-37/+48
* | | rack 1.6 encodes the filenames in posts correctly nowAaron Patterson2014-07-151-8/+1
* | | fix warningsAaron Patterson2014-07-151-1/+1
* | | stop calling url_for with recall parameters and actually use a requestAaron Patterson2014-07-152-85/+197
|/ /
* | execute a request and check the path_parametersAaron Patterson2014-07-151-17/+59
* | set `set` in the setup methodAaron Patterson2014-07-151-2/+5
* | remove useless ivar setAaron Patterson2014-07-151-1/+0
* | 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
|/ / / / / / /