Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #24676 from vipulnsward/log-ac-failed-states | Jeremy Daer | 2016-04-21 | 1 | -0/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Log if redis connection is in stale/failed state. | Vipul A M | 2016-04-21 | 1 | -0/+4 | |
* | | | | | | | Make file update checker tests more resilient on Windows | Sean Griffin | 2016-04-21 | 3 | -5/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #24661 from maclover7/fix-22975 | Rafael França | 2016-04-21 | 2 | -1/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix ApplicationController.renderer.defaults.merge! | Jon Moss | 2016-04-20 | 2 | -1/+9 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #24672 from mrkjlchvz/mc-space-bump | Rafael França | 2016-04-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Minor space bump. | Mark | 2016-04-21 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #24664 from y-yagi/use_wrapper_file_to_add_rake_task_for_e... | Rafael França | 2016-04-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | use wrapper file to add rake task for engines | yuuji.yaginuma | 2016-04-21 | 1 | -1/+1 | |
* | | | | | | | restores code comments in String#blank? [ci skip] | Xavier Noria | 2016-04-21 | 1 | -2/+6 | |
* | | | | | | | Merge pull request #24663 from kamipo/remove_unused_blank_re | Jeremy Daer | 2016-04-20 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove unused `BLANK_RE` | Ryuta Kamizono | 2016-04-21 | 1 | -2/+0 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #24657 from maclover7/fix-23643-1 | Rafael França | 2016-04-21 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add #18323 to 5.0 release notes | Jon Moss | 2016-04-20 | 1 | -0/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #24666 from tlynam/patch-1 | Rafael França | 2016-04-20 | 1 | -5/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update delegate to use newer Ruby syntax | Todd Lynam | 2016-04-20 | 1 | -5/+2 | |
* | | | | | | | | Merge pull request #24668 from rails/revert-24667-add_doc_for_type_option | प्रथमेश Sonpatki | 2016-04-21 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Revert "add doc for `:type` option of `#create_join_table` [ci skip]" | प्रथमेश Sonpatki | 2016-04-21 | 1 | -2/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #24667 from y-yagi/add_doc_for_type_option | प्रथमेश Sonpatki | 2016-04-21 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | add doc for `:type` option of `#create_join_table` [ci skip] | yuuji.yaginuma | 2016-04-21 | 1 | -0/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #24662 from tcopeland/autoloading_typo | Jon Moss | 2016-04-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix small typos [ci skip] | Tom Copeland | 2016-04-20 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #24658 from schneems/schneems/faster-regex-blank-string | Xavier Noria | 2016-04-20 | 1 | -6/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Speed up String#blank? Regex | schneems | 2016-04-20 | 1 | -6/+3 | |
* | | | | | | | Merge pull request #24221 from gregmolnar/uuid | Kasper Timm Hansen | 2016-04-20 | 2 | -2/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add column type option to create_join_table to support uuid | Greg Molnar | 2016-03-17 | 2 | -2/+10 | |
* | | | | | | | | Merge pull request #24656 from mohitnatoo/regardless-if-or-not | Rafael França | 2016-04-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | - [ci skip] `regardless` is usually followed by `of` and not by `if .. or not`. | Mohit Natoo | 2016-04-21 | 1 | -2/+2 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #23557 from kamipo/dump_indexes_in_create_for_generates_sq... | Jeremy Daer | 2016-04-20 | 4 | -32/+55 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Dump indexes in `create_table` for generates SQL in one query | Ryuta Kamizono | 2016-04-20 | 4 | -32/+52 | |
* | | | | | | | | ~3.5x speedup of String#blank? for empty strings | Xavier Noria | 2016-04-20 | 1 | -1/+6 | |
* | | | | | | | | Merge pull request #24650 from y-yagi/use_rails_command_in_zones_task_desc | Vipul A M | 2016-04-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | use rails command in `time:zones` task desc [ci skip] | yuuji.yaginuma | 2016-04-20 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #24642 from prathamesh-sonpatki/fix-with-css-classes-example | Rafael França | 2016-04-20 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix example for css_class_attribute and fix indentation | Prathamesh Sonpatki | 2016-04-20 | 1 | -6/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #24644 from abhishekjain16/grammar_date_helper | प्रथमेश Sonpatki | 2016-04-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Small grammar fix | Abhishek Jain | 2016-04-20 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | `undef_method` is not needed | Ryuta Kamizono | 2016-04-19 | 1 | -2/+3 | |
* | | | | | | | Merge pull request #20625 from Envek/add_country_zones_method | Jeremy Daer | 2016-04-19 | 5 | -11/+57 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add ActiveSupport::TimeZone.country_zones helper | Andrey Novikov | 2016-04-19 | 3 | -1/+25 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #24225 from neumayr/date_select_helper_with_css_classes_ac... | Rafael Mendonça França | 2016-04-20 | 3 | -3/+439 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | date_select helper with_css_classes option also accept a hash | neumayr | 2016-04-05 | 3 | -3/+439 | |
* | | | | | | | | Add CHANGELOG entry for #23869 | Rafael Mendonça França | 2016-04-20 | 1 | -0/+4 | |
* | | | | | | | | Merge pull request #23869 from oreoshake/to-sentence-html-safety | Rafael França | 2016-04-20 | 2 | -0/+85 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | mimic ActiveSupport's Array#to_sentence in an html_safe-aware way | Neil Matatall | 2016-03-15 | 2 | -0/+85 | |
* | | | | | | | | Ensure Cache#inspect doesn't block concurrent cache writes | Jeremy Daer | 2016-04-19 | 2 | -0/+11 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #24640 from kamipo/fix_test_blank_columns_created_in_block | Rafael França | 2016-04-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix `test_blank_columns_created_in_block` | Ryuta Kamizono | 2016-04-20 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #24031 from samphilipd/sam/do_not_clobber_options_in_route... | Jeremy Daer | 2016-04-19 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Do not destructively mutate passed options hash in route definitions | Sam Davies | 2016-03-03 | 2 | -2/+14 |