Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge pull request #15356 from deeeki/activesupport_loading | Yves Senn | 2014-05-27 | 3 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove `require 'active_support'` from individual modules | deeeki | 2014-05-27 | 3 | -4/+0 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Fix syntax error from 5eae77c | Zachary Scott | 2014-05-26 | 1 | -1/+1 | |
* | | | | | | | | | | | Move test to the proper file | Rafael Mendonça França | 2014-05-26 | 2 | -7/+7 | |
* | | | | | | | | | | | Add test case for b13d260 | Rafael Mendonça França | 2014-05-26 | 1 | -0/+9 | |
* | | | | | | | | | | | Merge pull request #15301 from zzak/issue_15212 | Rafael Mendonça França | 2014-05-26 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Skip if the association was already loaded. | Zachary Scott | 2014-05-24 | 1 | -0/+1 | |
* | | | | | | | | | | | | Merge pull request #15353 from sgrif/sg-mysql-condition | Rafael Mendonça França | 2014-05-26 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove unnecessary branch from quoting in Mysql | Sean Griffin | 2014-05-26 | 1 | -2/+0 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Typo in AR CHANGELOG [ci skip] | Zachary Scott | 2014-05-26 | 1 | -1/+1 | |
| |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #15284 from sgrif/sg-properties | Rafael Mendonça França | 2014-05-26 | 17 | -22/+194 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add a public API to allow users to specify column types | Sean Griffin | 2014-05-26 | 17 | -22/+194 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Pass through AM documentation re: 02d048d [ci skip] | Zachary Scott | 2014-05-26 | 2 | -5/+7 | |
* | | | | | | | | | | | Use "Action Mailer" as canonical name in documentation [ci skip] | Zachary Scott | 2014-05-26 | 1 | -1/+1 | |
* | | | | | | | | | | | Add description of ActionMailer::TestHelper module [ci skip] | Zachary Scott | 2014-05-26 | 1 | -0/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #15352 from sgrif/sg-allow-empty-array-where | Rafael Mendonça França | 2014-05-26 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Allow empty arrays in where predicates | Sean Griffin | 2014-05-26 | 1 | -0/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #15351 from sgrif/sg-allowed-types | Rafael Mendonça França | 2014-05-26 | 1 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Extract types which don't require additional typecasting to a method | Sean Griffin | 2014-05-26 | 1 | -4/+9 | |
* | | | | | | | | | | | Merge pull request #15347 from JuanitoFatas/benchmark-in-contributing-to-ror | Zachary Scott | 2014-05-26 | 1 | -0/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [ci skip] Add benchmark your code section to contributing to ruby on rails gu... | Juanito Fatas | 2014-05-27 | 1 | -0/+30 | |
* | | | | | | | | | | | | Merge pull request #15300 from arthurnn/refactor_reflections | Rafael Mendonça França | 2014-05-26 | 16 | -34/+85 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Refactoring .reflections public method. | Arthur Neves | 2014-05-26 | 4 | -9/+28 | |
| * | | | | | | | | | | | | Use .to_s on _reflections lookup | Arthur Neves | 2014-05-24 | 2 | -2/+2 | |
| * | | | | | | | | | | | | Merge pull request #15210 from arthurnn/fix_hbtm_reflection | Arthur Neves | 2014-05-24 | 16 | -30/+62 | |
* | | | | | | | | | | | | | Merge pull request #15350 from sgrif/sg-refactor-predicate-builder | Rafael Mendonça França | 2014-05-26 | 1 | -11/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Refactor the handling of arrays in where predicates | Sean Griffin | 2014-05-26 | 1 | -11/+14 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #15323 from JohnKellyFerguson/getting-started-app | Rafael Mendonça França | 2014-05-26 | 30 | -142/+147 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Rename Posts to Articles in Guides' Getting Started App, continuation of #152... | John Kelly Ferguson | 2014-05-25 | 30 | -142/+147 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #15346 from aditya-kapoor/correct-doc-for-path | Rafael Mendonça França | 2014-05-26 | 1 | -14/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | correct docs for (asset|image)_path [ci skip] | Aditya Kapoor | 2014-05-27 | 1 | -14/+14 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #15345 from matthewd/skip-dalli-errors | Guillermo Iguaran | 2014-05-26 | 1 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Skip individual tests upon Dalli::RingError | Matthew Draper | 2014-05-27 | 1 | -0/+18 | |
* | | | | | | | | | | | | | Merge pull request #15342 from aditya-kapoor/correct-tag-docs | Rafael Mendonça França | 2014-05-26 | 1 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | correct doc for (audio|video)_tag [ci skip] | Aditya Kapoor | 2014-05-27 | 1 | -10/+10 | |
* | | | | | | | | | | | | | Escape user input before showing in the page. | Rafael Mendonça França | 2014-05-26 | 1 | -2/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #15333 from ShunsukeAida/update_ruby_version | Rafael Mendonça França | 2014-05-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | update the recommended ruby version | ShunsukeAida | 2014-05-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #15294 from schneems/schneems/generator-output-in-error2 | Rafael Mendonça França | 2014-05-26 | 2 | -14/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | print generators on failed generate | schneems | 2014-05-26 | 2 | -14/+20 | |
* | | | | | | | | | | | | | | Merge pull request #15340 from aditya-kapoor/correct-docs | Rafael Mendonça França | 2014-05-26 | 1 | -15/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Correct Documentation for asset_tag_helpers | Aditya Kapoor | 2014-05-26 | 1 | -15/+16 | |
* | | | | | | | | | | | | | | Merge pull request #15339 from sgrif/sg-mysql-booleans | Rafael Mendonça França | 2014-05-26 | 2 | -13/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Refactor the type casting of booleans in MySQL | Sean Griffin | 2014-05-26 | 2 | -13/+18 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #15336 from sgrif/sg-quoting | Matthew Draper | 2014-05-27 | 5 | -54/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Remove checks against `column.type` in abstract adapter quoting | Sean Griffin | 2014-05-26 | 5 | -54/+33 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #15335 from sgrif/sg-missing-test-case | Rafael Mendonça França | 2014-05-26 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add missing test case for quoting behavior | Sean Griffin | 2014-05-26 | 2 | -0/+11 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #15307 from sgrif/sg-type-cast-for-write | Yves Senn | 2014-05-26 | 6 | -10/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add an interface for type objects to control Ruby => SQL | Sean Griffin | 2014-05-26 | 6 | -10/+19 | |
| |/ / / / / / / / / / / |