Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #18019 from eileencodes/pass-connection-rather-than-alias_... | Aaron Patterson | 2014-12-13 | 1 | -16/+17 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Pass connection rather than alias_tracker | eileencodes | 2014-12-13 | 1 | -16/+17 | |
* | | | | | | | Merge pull request #18020 from binaryberry/handle-positional-args-with-format... | Andrew White | 2014-12-13 | 3 | -2/+42 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix handling of positional url helper arguments when format is false | Tatiana Soukiassian | 2014-12-13 | 3 | -2/+42 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18018 from yuki24/fix-method-name-inconsistency-in-mailer... | Godfrey Chan | 2014-12-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [guides] Fix method name inconsistency in a mailer example | Yuki Nishijima | 2014-12-12 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | redis 3.2.0 doesn't allow tcp protocol anymore | Rafael Mendonça França | 2014-12-13 | 1 | -1/+1 | |
* | | | | | | Merge pull request #18006 from sikachu/add-params-to_unsafe_h | Rafael Mendonça França | 2014-12-12 | 2 | -0/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add AC::Parameters#to_unsafe_h | Prem Sichanugrist | 2014-12-12 | 2 | -0/+12 | |
* | | | | | | | Mention that Action Mailer methods are not deferred [ci skip] | Godfrey Chan | 2014-12-12 | 1 | -0/+35 | |
* | | | | | | | Pass through the `prepend` option to `AS::Callback` | Godfrey Chan | 2014-12-12 | 2 | -2/+38 | |
* | | | | | | | New applications should use sass-rails 5.0 | Rafael Mendonça França | 2014-12-12 | 1 | -6/+1 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Rails master requires arel master | Rafael Mendonça França | 2014-12-12 | 1 | -2/+8 | |
* | | | | | | Align the GemfileEntry API with stable branches | Godfrey Chan | 2014-12-12 | 1 | -5/+9 | |
* | | | | | | Merge pull request #18003 from sikachu/permit_all_parameters-thread-safety | Rafael Mendonça França | 2014-12-12 | 1 | -1/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Make AC::Params.permit_all_parameters thread safe | Prem Sichanugrist | 2014-12-12 | 1 | -1/+10 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #18010 from audionerd/patch-1 | Rafael Mendonça França | 2014-12-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix default queue name prefix delimiter | Eric Skogen | 2014-12-12 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18007 from georgemillo/patch-1 | Rafael Mendonça França | 2014-12-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | English fix [ci skip] | George Millo | 2014-12-12 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #17815 from yuki24/remove-custom-errors-page-section | Zachary Scott | 2014-12-11 | 1 | -58/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove custom errors page section from the guides | Yuki Nishijima | 2014-11-28 | 1 | -58/+1 | |
* | | | | | | Add test case for joined pluck | Sean Griffin | 2014-12-11 | 1 | -0/+7 | |
* | | | | | | Improve the test case introduced by bd0d47e | Sean Griffin | 2014-12-11 | 1 | -19/+10 | |
* | | | | | | Merge pull request #17994 from mfazekas/pluck-bind-values-master | Sean Griffin | 2014-12-11 | 2 | -2/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix ProtocolViolation/bind message supplies for polymorphic + pluck or group | Miklos Fazkeas | 2014-12-11 | 2 | -2/+26 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #18000 from caike/master | Rafael Mendonça França | 2014-12-11 | 1 | -1/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update guides with info about vendor/assets | Carlos Souza | 2014-12-11 | 1 | -1/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #17793 from kamipo/fix_undesirable_range_error | Sean Griffin | 2014-12-11 | 8 | -6/+119 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix undesirable RangeError by Type::Integer. Add Type::UnsignedInteger. | Ryuta Kamizono | 2014-12-12 | 8 | -6/+119 | |
* | | | | | | | Merge pull request #17998 from kamipo/refactor_quoted_date | Sean Griffin | 2014-12-11 | 4 | -25/+13 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Refactor `quoted_date` | Ryuta Kamizono | 2014-12-11 | 4 | -25/+13 | |
| |/ / / / / | ||||||
* / / / / / | Revert "Merge pull request #17943 from jeremywadsack/doc_cache_importability" | Rafael Mendonça França | 2014-12-11 | 1 | -4/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #17970 from ulissesalmeida/foreign-type-has-many-has-one | Rafael Mendonça França | 2014-12-10 | 10 | -3/+53 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add foreign_type option for polymorphic has_one and has_many. | Ulisses Almeida + Kassio Borges | 2014-12-08 | 10 | -3/+53 | |
* | | | | | | Merge pull request #17989 from y-yagi/patch-1 | Zachary Scott | 2014-12-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] fix typo in MessageVerifier#verify docs | yuuji.yaginuma | 2014-12-10 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #17987 from andreynering/ar-validation-doc | Zachary Scott | 2014-12-09 | 1 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Adding information about 'allow_nil' option for 'numericality' [ci skip] | Andrey Nering | 2014-12-09 | 1 | -0/+2 | |
* | | | | | | | Merge pull request #17988 from caike/master | Rafael Mendonça França | 2014-12-09 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add guides for `required` model generator option. | Carlos Souza | 2014-12-09 | 1 | -0/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #17982 from andreynering/testing-documentation | Richard Schneeman | 2014-12-10 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Adding a tip in the guides about possible database permission problems on | andrey.nering@gmail.com | 2014-12-09 | 1 | -0/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #17975 from merongivian/add_test_for_search_field | Rafael Mendonça França | 2014-12-09 | 3 | -11/+15 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix options overwritten by super | Jose Añasco | 2014-12-09 | 3 | -11/+15 | |
|/ / / / / / | ||||||
* | | | | | | Unused csv fixture file | Akira Matsuda | 2014-12-09 | 1 | -1/+0 | |
* | | | | | | Merge pull request #17972 from claudiob/remove-unused-callback-fixtures | Carlos Antonio da Silva | 2014-12-09 | 1 | -46/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove unused "Developer" fixtures from tests | claudiob | 2014-12-08 | 1 | -46/+0 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #17977 from yui-knk/fix/typo | Rafael Mendonça França | 2014-12-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] Fix typo | yui-knk | 2014-12-09 | 1 | -1/+1 | |
|/ / / / / / |