| Commit message (Expand) | Author | Age | Files | Lines |
* | correct GlobalID mixin name in the guides | Chris Moylan | 2014-10-29 | 1 | -1/+1 |
* | Merge pull request #17431 from hbriggs/upgrade_guide_2.7_2.8 | Rafael Mendonça França | 2014-10-29 | 1 | -3/+3 |
|\ |
|
| * | [ci skip] Fixes typos in section 2.7 "Rails Html Sanitizer", adds content to ... | Hannah Briggs | 2014-10-29 | 1 | -3/+3 |
|/ |
|
* | Merge pull request #17429 from edwinwills/full-height-email-preview | Rafael Mendonça França | 2014-10-29 | 1 | -1/+4 |
|\ |
|
| * | On larger screens the email preview iframe is being limited to a height of 80... | Edwin Wills | 2014-10-29 | 1 | -1/+4 |
|/ |
|
* | Merge pull request #17411 from mcfiredrill/doc-change-column-default-abstract... | Rafael Mendonça França | 2014-10-29 | 1 | -1/+1 |
|\ |
|
| * | :nodoc: for abstract_mysql_adapter | Tony Miller | 2014-10-29 | 1 | -1/+1 |
* | | Merge pull request #17427 from dwo/master | Zachary Scott | 2014-10-29 | 1 | -1/+1 |
|\ \ |
|
| * | | better example for tokenizer lambda [ci skip] | Robin Tweedie | 2014-10-29 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #17423 from lukefx/jruby_windows_tzinfo | Santiago Pastorino | 2014-10-29 | 1 | -2/+2 |
|\ \ |
|
| * | | Added 'tzinfo-data' if we are using jruby | Luca Simone | 2014-10-29 | 1 | -2/+2 |
* | | | fix MySQL enum type lookup with values matching another type. Closes #17402. | Yves Senn | 2014-10-29 | 3 | -6/+17 |
* | | | edit pass over all warnings | Xavier Noria | 2014-10-28 | 20 | -38/+65 |
* | | | Add mysql and pg specific attributes to Column#== and hash | Sean Griffin | 2014-10-28 | 2 | -2/+20 |
* | | | Merge pull request #17421 from rails/warn-with-heredoc | Xavier Noria | 2014-10-28 | 18 | -76/+149 |
|\ \ \ |
|
| * | | | let's warn with heredocs | Xavier Noria | 2014-10-28 | 18 | -76/+149 |
* | | | | 💣 | Sean Griffin | 2014-10-28 | 2 | -2/+5 |
* | | | | Implement hash equality on column | Sean Griffin | 2014-10-28 | 1 | -0/+5 |
* | | | | Implement #== for column | Sean Griffin | 2014-10-28 | 1 | -0/+8 |
* | | | | Remove unneccessary default values from relation merger | Sean Griffin | 2014-10-28 | 1 | -2/+2 |
* | | | | Fix uninitialized ivar warning in tests | Sean Griffin | 2014-10-28 | 1 | -1/+1 |
* | | | | Call value methods when merging relations, rather than accessing keys | Sean Griffin | 2014-10-28 | 1 | -14/+14 |
* | | | | Merge pull request #17039 from zv1n/add_prefix_delimiter | Rafael Mendonça França | 2014-10-28 | 3 | -2/+45 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Added queue_name_delimiter attribute. | Terry Meacham | 2014-10-26 | 3 | -2/+45 |
* | | | | Typos in the deprecation message | Godfrey Chan | 2014-10-28 | 1 | -2/+2 |
* | | | | Mention only_path deprecation in release notes [ci skip] | Godfrey Chan | 2014-10-28 | 1 | -0/+3 |
* | | | | Deprecate the `only_path` option on `*_path` helpers. | Godfrey Chan | 2014-10-28 | 3 | -2/+116 |
* | | | | Merge pull request #17416 from tricknotes/fix-doc-markup | Abdelkader Boudih | 2014-10-28 | 2 | -10/+10 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Fix doc markup for `NumberHelper` [ci skip] | Ryunosuke SATO | 2014-10-29 | 2 | -10/+10 |
|/ / / |
|
* | | | Merge pull request #17408 from bf4/fix_rbx_test | Yves Senn | 2014-10-28 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix rbx generated Gemfile regex | Benjamin Fleischer | 2014-10-27 | 1 | -1/+1 |
* | | | | Merge pull request #17310 from pabloh/optimize_strftime | Andrew White | 2014-10-28 | 3 | -10/+16 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Optimize TimeWithZoneTest#strftime | Pablo Herrero | 2014-10-27 | 3 | -10/+16 |
| |/ / |
|
* | | | Merge pull request #16229 from byroot/stop-swallowing-url-generation-errors | Andrew White | 2014-10-27 | 2 | -1/+16 |
|\ \ \ |
|
| * | | | UrlGenerationError are not catched as 404 anymore | Jean Boussier | 2014-10-27 | 2 | -1/+16 |
* | | | | Merge pull request #17405 from DanOlson/rewhere | Sean Griffin | 2014-10-27 | 2 | -1/+22 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Allow Relation#rewhere to work with infinite range values | Dan Olson | 2014-10-27 | 2 | -1/+22 |
|/ / / |
|
* | | | Merge pull request #17374 from maurogeorge/scope-exception | Yves Senn | 2014-10-27 | 3 | -0/+15 |
|\ \ \ |
|
| * | | | Raises ArgumentError when try to define a scope without a callable | Mauro George | 2014-10-23 | 2 | -0/+9 |
* | | | | Merge pull request #14143 from derekprior/dp-compound-index-ordering | Yves Senn | 2014-10-27 | 5 | -5/+9 |
|\ \ \ \ |
|
| * | | | | Use type column first in multi-column indexes | Derek Prior | 2014-10-24 | 5 | -5/+9 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #17362 from bronzle/fix_debug_exceptions_app | Rafael Mendonça França | 2014-10-26 | 4 | -26/+76 |
|\ \ \ \ |
|
| * | | | | Show the user’s application in the source window and select the correct tra... | Byron Bischoff | 2014-10-23 | 4 | -26/+76 |
* | | | | | Add back --skip-turbolinks and remove --skip-gems | Rafael Mendonça França | 2014-10-26 | 3 | -16/+12 |
* | | | | | Merge pull request #17330 from DanOlson/rewhere | Matthew Draper | 2014-10-27 | 3 | -1/+12 |
|\ \ \ \ \ |
|
| * | | | | | Fix Relation.rewhere to work with Range values | Dan Olson | 2014-10-20 | 3 | -1/+12 |
* | | | | | | Merge pull request #17397 from prathamesh-sonpatki/fix-type-boolean-error-msg... | Rafael Mendonça França | 2014-10-26 | 1 | -1/+1 |
|\ \ \ \ \ \ |
|
| * | | | | | | Fix typo in error message when non-boolean value is assigned to boolean column | Prathamesh Sonpatki | 2014-10-26 | 1 | -1/+1 |
| | |_|_|_|/
| |/| | | | |
|
* | | | | | | Merge branch 'rishijain-update_docs_1' | Zachary Scott | 2014-10-26 | 2 | -3/+6 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Making the actionmailer docs more explicit to understand [ci skip] | Rishi Jain | 2014-10-26 | 2 | -3/+6 |
|/ / / / / |
|