aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Log if redis connection is in stale/failed state.Vipul A M2016-04-211-0/+4
* Merge pull request #24661 from maclover7/fix-22975Rafael França2016-04-212-1/+9
|\
| * Fix ApplicationController.renderer.defaults.merge!Jon Moss2016-04-202-1/+9
* | Merge pull request #24672 from mrkjlchvz/mc-space-bumpRafael França2016-04-211-1/+1
|\ \
| * | Minor space bump.Mark2016-04-211-1/+1
* | | Merge pull request #24664 from y-yagi/use_wrapper_file_to_add_rake_task_for_e...Rafael França2016-04-211-1/+1
|\ \ \
| * | | use wrapper file to add rake task for enginesyuuji.yaginuma2016-04-211-1/+1
* | | | restores code comments in String#blank? [ci skip]Xavier Noria2016-04-211-2/+6
* | | | Merge pull request #24663 from kamipo/remove_unused_blank_reJeremy Daer2016-04-201-2/+0
|\ \ \ \
| * | | | Remove unused `BLANK_RE`Ryuta Kamizono2016-04-211-2/+0
| | |_|/ | |/| |
* | | | Merge pull request #24657 from maclover7/fix-23643-1Rafael França2016-04-211-0/+3
|\ \ \ \
| * | | | Add #18323 to 5.0 release notesJon Moss2016-04-201-0/+3
| |/ / /
* | | | Merge pull request #24666 from tlynam/patch-1Rafael França2016-04-201-5/+2
|\ \ \ \
| * | | | Update delegate to use newer Ruby syntaxTodd Lynam2016-04-201-5/+2
* | | | | Merge pull request #24668 from rails/revert-24667-add_doc_for_type_optionप्रथमेश Sonpatki2016-04-211-2/+0
|\ \ \ \ \
| * | | | | Revert "add doc for `:type` option of `#create_join_table` [ci skip]"प्रथमेश Sonpatki2016-04-211-2/+0
|/ / / / /
* | | | | Merge pull request #24667 from y-yagi/add_doc_for_type_optionप्रथमेश Sonpatki2016-04-211-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add doc for `:type` option of `#create_join_table` [ci skip]yuuji.yaginuma2016-04-211-0/+2
|/ / / /
* | | | Merge pull request #24662 from tcopeland/autoloading_typoJon Moss2016-04-201-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix small typos [ci skip]Tom Copeland2016-04-201-2/+2
|/ / /
* | | Merge pull request #24658 from schneems/schneems/faster-regex-blank-stringXavier Noria2016-04-201-6/+3
|\ \ \
| * | | Speed up String#blank? Regexschneems2016-04-201-6/+3
* | | | Merge pull request #24221 from gregmolnar/uuidKasper Timm Hansen2016-04-202-2/+10
|\ \ \ \
| * | | | add column type option to create_join_table to support uuidGreg Molnar2016-03-172-2/+10
* | | | | Merge pull request #24656 from mohitnatoo/regardless-if-or-notRafael França2016-04-201-2/+2
|\ \ \ \ \
| * | | | | - [ci skip] `regardless` is usually followed by `of` and not by `if .. or not`.Mohit Natoo2016-04-211-2/+2
* | | | | | Merge pull request #23557 from kamipo/dump_indexes_in_create_for_generates_sq...Jeremy Daer2016-04-204-32/+55
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Dump indexes in `create_table` for generates SQL in one queryRyuta Kamizono2016-04-204-32/+52
* | | | | | ~3.5x speedup of String#blank? for empty stringsXavier Noria2016-04-201-1/+6
* | | | | | Merge pull request #24650 from y-yagi/use_rails_command_in_zones_task_descVipul A M2016-04-201-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | use rails command in `time:zones` task desc [ci skip]yuuji.yaginuma2016-04-201-1/+1
|/ / / / /
* | | | | Merge pull request #24642 from prathamesh-sonpatki/fix-with-css-classes-exampleRafael França2016-04-201-6/+6
|\ \ \ \ \
| * | | | | Fix example for css_class_attribute and fix indentationPrathamesh Sonpatki2016-04-201-6/+6
|/ / / / /
* | | | | Merge pull request #24644 from abhishekjain16/grammar_date_helperप्रथमेश Sonpatki2016-04-201-1/+1
|\ \ \ \ \
| * | | | | [ci skip] Small grammar fixAbhishek Jain2016-04-201-1/+1
|/ / / / /
* | | | | `undef_method` is not neededRyuta Kamizono2016-04-191-2/+3
* | | | | Merge pull request #20625 from Envek/add_country_zones_methodJeremy Daer2016-04-195-11/+57
|\ \ \ \ \
| * | | | | Add ActiveSupport::TimeZone.country_zones helperAndrey Novikov2016-04-193-1/+25
| | |/ / / | |/| | |
* | | | | Merge pull request #24225 from neumayr/date_select_helper_with_css_classes_ac...Rafael Mendonça França2016-04-203-3/+439
|\ \ \ \ \
| * | | | | date_select helper with_css_classes option also accept a hashneumayr2016-04-053-3/+439
* | | | | | Add CHANGELOG entry for #23869Rafael Mendonça França2016-04-201-0/+4
* | | | | | Merge pull request #23869 from oreoshake/to-sentence-html-safetyRafael França2016-04-202-0/+85
|\ \ \ \ \ \
| * | | | | | mimic ActiveSupport's Array#to_sentence in an html_safe-aware wayNeil Matatall2016-03-152-0/+85
* | | | | | | Ensure Cache#inspect doesn't block concurrent cache writesJeremy Daer2016-04-192-0/+11
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #24640 from kamipo/fix_test_blank_columns_created_in_blockRafael França2016-04-191-1/+1
|\ \ \ \ \ \
| * | | | | | Fix `test_blank_columns_created_in_block`Ryuta Kamizono2016-04-201-1/+1
|/ / / / / /
* | | | | | Merge pull request #24031 from samphilipd/sam/do_not_clobber_options_in_route...Jeremy Daer2016-04-192-2/+14
|\ \ \ \ \ \
| * | | | | | Do not destructively mutate passed options hash in route definitionsSam Davies2016-03-032-2/+14
* | | | | | | Merge pull request #24619 from BenMorganIO/use-rails-5-in-rails-engine-binYves Senn2016-04-191-1/+2
|\ \ \ \ \ \ \
| * | | | | | | mention rails 5 instead of rails 4 in bin/rails for pluginsBen A. Morgan2016-04-191-1/+2