aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Avoid shot circuit return.Rafael Mendonça França2013-11-091-8/+20
* Improve changelogs formatting [ci skip]Carlos Antonio da Silva2013-11-093-22/+22
* Don't use Active Support where we don't need toRafael Mendonça França2013-11-093-3/+3
* Fix typo in AR store docs [ci skip]Carlos Antonio da Silva2013-11-091-1/+1
* Merge pull request #12760 from pseidemann/masterYves Senn2013-11-093-2/+11
|\
| * fix simple_format escapes own output when sanitize is set to truepseidemann2013-11-083-2/+11
* | log bind variables after they were type casted.Yves Senn2013-11-095-10/+36
* | Merge pull request #12816 from gaurish/skip-static-testRafael Mendonça França2013-11-081-0/+4
|\ \
| * | Skip test which is broken on jrubyGaurish Sharma2013-11-091-0/+4
* | | Merge pull request #12806 from vipulnsward/extract_common_code_in_number_helperRafael Mendonça França2013-11-081-30/+13
|\ \ \
| * | | Extract common code from number helpers to new delegator method.Vipul A M2013-11-091-30/+13
* | | | Merge pull request #12813 from gaurish/patch-2Rafael Mendonça França2013-11-081-2/+1
|\ \ \ \
| * | | | :scissors: fix broken url [ci skip]Gaurish Sharma2013-11-091-2/+1
| | |/ / | |/| |
* | | | Merge pull request #12814 from gaurish/enable-jruby19-againRafael Mendonça França2013-11-081-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Start Running tests on Stable JRubyGaurish Sharma2013-11-091-2/+2
|/ / /
* | | 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