aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Skip test which is broken on jrubyGaurish Sharma2013-11-091-0/+4
* Mark broken test as pendingRafael Mendonça França2013-11-082-0/+4
* Remove more skipRafael Mendonça França2013-11-084-13/+7
* Don't skip tests if we don't need to.Rafael Mendonça França2013-11-0830-1023/+966
* removes redundant curly brackets in example code [ci skip]Xavier Noria2013-11-081-1/+1
* Merge pull request #12609 from corwinkelly/patch-1Xavier Noria2013-11-081-3/+1
|\
| * Fix undefined method error for NilClasscorwinkelly2013-10-231-1/+1
| * Update workaround for "Outside the Scope of Strong Parameters" corwinkelly2013-10-221-3/+1
* | Merge pull request #12803 from arunagw/remove-unused-requireRafael Mendonça França2013-11-081-2/+0
|\ \
| * | Removed unused requireArun Agrawal2013-11-081-2/+0
* | | Merge pull request #12292 from bf4/better_database_yamlXavier Noria2013-11-0811-145/+85
|\ \ \ | |/ / |/| |
| * | Extract common database defaults; better use of YAMLBenjamin Fleischer2013-11-0811-145/+85
|/ /
* | Merge pull request #12791 from jasonayre/ja/fix_autoload_errorRafael Mendonça França2013-11-072-0/+6
|\ \
| * | revised changelog comment to be less than 80 charsJason Ayre2013-11-071-2/+2
| * | add autoload :TransactionState to fix Marshal.load issuesJason Ayre2013-11-072-0/+6
* | | Merge pull request #12795 from arunagw/plateform-dependent-gemsRafael Mendonça França2013-11-072-0/+16
|\ \ \
| * | | Added platform dependent gemsArun Agrawal2013-11-072-0/+16
* | | | Merge pull request #12800 from raysrashmi/warning-removed-ruby-trunkRafael Mendonça França2013-11-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Warning removed for ruby-headRashmi Yadav2013-11-071-1/+1
|/ / /
* | | Merge pull request #12799 from arunagw/aa-av-test-fixesJeremy Kemper2013-11-071-1/+1
|\ \ \
| * | | sub! can return nilArun Agrawal2013-11-071-1/+1
|/ / /
* | | Merge pull request #12798 from arunagw/plugin-generators-testGuillermo Iguaran2013-11-071-1/+4
|\ \ \
| * | | Fixed plugin_generator testArun Agrawal2013-11-071-1/+4
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-11-0710-37/+83
|\ \ \ \ | |/ / / |/| | |
| * | | Update Rails initialization guide to explain how bin/rails is executedAlex Johnson2013-11-061-3/+36
| * | | refine usage docs of `store` in combination with `hstore` and `json`.Yves Senn2013-11-061-3/+3
| * | | Fixed code syntax for config.ru [ci skip]Rashmi Yadav2013-11-041-1/+1
| * | | exists? is deprecated in ruby trunk [ci skip]Rashmi Yadav2013-11-012-4/+4
| * | | Hstore and JSON fields are not supported with storeRobin Dupret2013-10-301-0/+4
| * | | guides/rails_on_rack: Fix formatting of _Internal Middleware Stack_ sectionZachary Scott2013-10-281-23/+23
| * | | fix typo introduced when searching in markdown document with vimDamien Mathieu2013-10-241-14/+14
| * | | rephrase the overriding views part about the view pathDamien Mathieu2013-10-241-15/+15
| * | | Fixed URL link to rendered_component plugin [ci skip]Harshad Sabne2013-10-231-1/+1
| * | | warning about saving models with dirty attributesDamien Mathieu2013-10-231-0/+3
| * | | Update 4_0_release_notes.mdHarshad Sabne2013-10-221-2/+2
| * | | Fixes typoJay Hayes2013-10-201-1/+1
| * | | Update 3_2_release_notes.mdHarshad Sabne2013-10-201-1/+1
| * | | Update I18n guide to note the additional features of the `translate` view helperJay Hayes2013-10-191-1/+7
| * | | Updated 3.2.x link [ci skip]Rashmi Yadav2013-10-181-1/+1
* | | | Merge pull request #12228 from ersatzryan/standardize-json-time-formatsAndrew White2013-11-075-7/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Standardize all JSON encoded times to use 3 decimal fractional secondsRyan Glover2013-11-075-7/+12
|/ / /
* | | AestheticsRafael Mendonça França2013-11-071-13/+13
* | | Merge pull request #12787 from notalex/extract_methodRafael Mendonça França2013-11-071-23/+34
|\ \ \
| * | | Move interrupt information to print_boot_information methodAlex Johnson2013-11-071-4/+1
| * | | Extract method refactoring for Rails::Server#startAlex Johnson2013-11-071-24/+38
* | | | Merge pull request #12771 from bogdan/patch-1Yves Senn2013-11-071-4/+4
|\ \ \ \
| * | | | Fix AS::TimeWithZone#as_json docsBogdan Gusiev2013-11-071-4/+4
* | | | | only ask for these ivars if the target responds to themAaron Patterson2013-11-061-3/+3
* | | | | Merge pull request #12792 from chancancode/move_json_requiresRafael Mendonça França2013-11-062-8/+7
|\ \ \ \ \
| * | | | | Move the JSON extension require statements to the right place.Godfrey Chan2013-11-062-8/+7
|/ / / / /