aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #15295 from sgrif/sg-deprecate-decimalsRafael Mendonça França2014-05-277-2/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Deprecate decimal columns being automatically treated as integersSean Griffin2014-05-277-2/+29
* | | | | | | | | Merge pull request #15358 from arthurnn/redefine_habtm_fixRafael Mendonça França2014-05-273-25/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix redefine a has_and_belongs_to_many inside inherited classArthur Neves2014-05-273-25/+46
* | | | | | | | | | Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_symYves Senn2014-05-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove unwanted `to_sym` call.Kuldeep Aggarwal2014-05-261-1/+1
* | | | | | | | | | | Merge pull request #15327 from alexbel/replace_double_quotes_with_single_quotesYves Senn2014-05-273-11/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Replace double quotes with single quotes while adding an entry into Gemfilealexbel2014-05-263-11/+25
* | | | | | | | | | | | Merge pull request #15356 from deeeki/activesupport_loadingYves Senn2014-05-273-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove `require 'active_support'` from individual modulesdeeeki2014-05-273-4/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Fix syntax error from 5eae77cZachary Scott2014-05-261-1/+1
* | | | | | | | | | | Move test to the proper fileRafael Mendonça França2014-05-262-7/+7
* | | | | | | | | | | Add test case for b13d260Rafael Mendonça França2014-05-261-0/+9
* | | | | | | | | | | Merge pull request #15301 from zzak/issue_15212Rafael Mendonça França2014-05-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Skip if the association was already loaded.Zachary Scott2014-05-241-0/+1
* | | | | | | | | | | | Merge pull request #15353 from sgrif/sg-mysql-conditionRafael Mendonça França2014-05-261-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unnecessary branch from quoting in MysqlSean Griffin2014-05-261-2/+0
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Typo in AR CHANGELOG [ci skip]Zachary Scott2014-05-261-1/+1
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #15284 from sgrif/sg-propertiesRafael Mendonça França2014-05-2617-22/+194
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add a public API to allow users to specify column typesSean Griffin2014-05-2617-22/+194
| |/ / / / / / / / / /
* | | | | | | | | | | Pass through AM documentation re: 02d048d [ci skip]Zachary Scott2014-05-262-5/+7
* | | | | | | | | | | Use "Action Mailer" as canonical name in documentation [ci skip]Zachary Scott2014-05-261-1/+1
* | | | | | | | | | | Add description of ActionMailer::TestHelper module [ci skip]Zachary Scott2014-05-261-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #15352 from sgrif/sg-allow-empty-array-whereRafael Mendonça França2014-05-261-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow empty arrays in where predicatesSean Griffin2014-05-261-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #15351 from sgrif/sg-allowed-typesRafael Mendonça França2014-05-261-4/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Extract types which don't require additional typecasting to a methodSean Griffin2014-05-261-4/+9
* | | | | | | | | | | Merge pull request #15347 from JuanitoFatas/benchmark-in-contributing-to-rorZachary Scott2014-05-261-0/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] Add benchmark your code section to contributing to ruby on rails gu...Juanito Fatas2014-05-271-0/+30
* | | | | | | | | | | | Merge pull request #15300 from arthurnn/refactor_reflectionsRafael Mendonça França2014-05-2616-34/+85
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactoring .reflections public method.Arthur Neves2014-05-264-9/+28
| * | | | | | | | | | | | Use .to_s on _reflections lookupArthur Neves2014-05-242-2/+2
| * | | | | | | | | | | | Merge pull request #15210 from arthurnn/fix_hbtm_reflectionArthur Neves2014-05-2416-30/+62
* | | | | | | | | | | | | Merge pull request #15350 from sgrif/sg-refactor-predicate-builderRafael Mendonça França2014-05-261-11/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactor the handling of arrays in where predicatesSean Griffin2014-05-261-11/+14
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #15323 from JohnKellyFerguson/getting-started-appRafael Mendonça França2014-05-2630-142/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Rename Posts to Articles in Guides' Getting Started App, continuation of #152...John Kelly Ferguson2014-05-2530-142/+147
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #15346 from aditya-kapoor/correct-doc-for-pathRafael Mendonça França2014-05-261-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | correct docs for (asset|image)_path [ci skip]Aditya Kapoor2014-05-271-14/+14
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #15345 from matthewd/skip-dalli-errorsGuillermo Iguaran2014-05-261-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Skip individual tests upon Dalli::RingErrorMatthew Draper2014-05-271-0/+18
* | | | | | | | | | | | | Merge pull request #15342 from aditya-kapoor/correct-tag-docsRafael Mendonça França2014-05-261-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | correct doc for (audio|video)_tag [ci skip]Aditya Kapoor2014-05-271-10/+10
* | | | | | | | | | | | | Escape user input before showing in the page.Rafael Mendonça França2014-05-261-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #15333 from ShunsukeAida/update_ruby_versionRafael Mendonça França2014-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update the recommended ruby versionShunsukeAida2014-05-271-1/+1
* | | | | | | | | | | | | Merge pull request #15294 from schneems/schneems/generator-output-in-error2Rafael Mendonça França2014-05-262-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | print generators on failed generateschneems2014-05-262-14/+20
* | | | | | | | | | | | | | Merge pull request #15340 from aditya-kapoor/correct-docsRafael Mendonça França2014-05-261-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Correct Documentation for asset_tag_helpersAditya Kapoor2014-05-261-15/+16