aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge pull request #15339 from sgrif/sg-mysql-booleansRafael Mendonça França2014-05-262-13/+18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Refactor the type casting of booleans in MySQLSean Griffin2014-05-262-13/+18
|/ / / / /
* | | | | Merge pull request #15336 from sgrif/sg-quotingMatthew Draper2014-05-275-54/+33
|\ \ \ \ \
| * | | | | Remove checks against `column.type` in abstract adapter quotingSean Griffin2014-05-265-54/+33
| |/ / / /
* | | | | Merge pull request #15335 from sgrif/sg-missing-test-caseRafael Mendonça França2014-05-262-0/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing test case for quoting behaviorSean Griffin2014-05-262-0/+11
|/ / / /
* | | | Merge pull request #15307 from sgrif/sg-type-cast-for-writeYves Senn2014-05-266-10/+19
|\ \ \ \
| * | | | Add an interface for type objects to control Ruby => SQLSean Griffin2014-05-266-10/+19
| |/ / /
* | | | pg, add missing `:nodoc:` to adapter.Yves Senn2014-05-261-8/+8
* | | | pg, remove unused code. Use `extract_schema_and_table` instead.Yves Senn2014-05-261-10/+0
* | | | Merge pull request #15325 from tgxworld/no_need_to_call_to_sYves Senn2014-05-262-2/+2
|\ \ \ \
| * | | | Remove duplicated to_s method call.Guo Xiang Tan2014-05-252-2/+2
| | |/ / | |/| |
* | | | Merge pull request #15316 from akshay-vishnoi/test-casesYves Senn2014-05-261-7/+8
|\ \ \ \
| * | | | Fix test cases for inflector.rbAkshay Vishnoi2014-05-251-7/+8
* | | | | Merge pull request #15324 from andriytyurnikov/simple_rake_stats_for_everythingYves Senn2014-05-261-18/+22
|\ \ \ \ \
| * | | | | simple solution that brings rake stats task to every kind of rails projectAndriy Tyurnikov2014-05-261-18/+22
| | |/ / / | |/| | |
* | | | | Merge pull request #15328 from kuldeepaggarwal/remove-warningsYves Senn2014-05-261-1/+1
|\ \ \ \ \
| * | | | | remove unused variable warningKuldeep Aggarwal2014-05-261-1/+1
* | | | | | Fix docs for ActionController::Renderers.addGuillermo Iguaran2014-05-261-1/+1
|/ / / / /
* | | | | Merge pull request #15310 from tgxworld/small_refactor_get_routes_as_headCarlos Antonio da Silva2014-05-251-3/+1
|\ \ \ \ \ | |/ / / / |/| | | |