| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #22703 from joshsoftware/rake-log-clear | Kasper Timm Hansen | 2016-01-09 | 1 | -6/+19 |
|\ |
|
| * | rake log:clear task updated refs[#22544] | Pramod | 2016-01-09 | 1 | -6/+19 |
* | | [ci skip] Clarify some Minitest origins. | Kasper Timm Hansen | 2016-01-09 | 1 | -0/+2 |
* | | Extract line filtering to Railties. | Kasper Timm Hansen | 2016-01-09 | 2 | -0/+69 |
|/ |
|
* | Default new apps to tag logs with `request_id` | schneems | 2016-01-06 | 1 | -1/+1 |
* | Merge pull request #22933 from schneems/schneems/fix-broadcast | Richard Schneeman | 2016-01-06 | 1 | -2/+4 |
|\ |
|
| * | [close #22917] Don't output to `STDOUT` twice | schneems | 2016-01-06 | 1 | -2/+4 |
* | | Merge pull request #22939 from y-yagi/make_generated_controller_test_file_wor... | Rafael França | 2016-01-06 | 2 | -1/+5 |
|\ \ |
|
| * | | make generated controller test work correctly | yuuji.yaginuma | 2016-01-06 | 2 | -1/+5 |
| |/ |
|
* | | Merge pull request #22275 from mastahyeti/per-form-csrf | Rafael França | 2016-01-06 | 1 | -0/+4 |
|\ \ |
|
| * | | add option for per-form CSRF tokens | Ben Toews | 2016-01-04 | 1 | -0/+4 |
* | | | Provide a better error message if a user mistypes the name of script with runner | Stephen Blackstone | 2016-01-05 | 1 | -1/+7 |
| |/
|/| |
|
* | | :scissors: Unnecessary spacing in the generated code | Akira Matsuda | 2016-01-05 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #22874 from prathamesh-sonpatki/create-application-model-u... | Rafael França | 2016-01-01 | 2 | -0/+0 |
|\ |
|
| * | Create application_record under namespaced directory in plugin | Prathamesh Sonpatki | 2016-01-01 | 2 | -0/+0 |
* | | Remove a wasted space | Shota Iguchi | 2016-01-01 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #22826 from timrogers/actiondispatch-ssl-config | Rafael França | 2015-12-31 | 1 | -1/+1 |
|\ |
|
| * | Flexible configuration for ActionDispatch::SSL | Tim Rogers | 2015-12-29 | 1 | -1/+1 |
* | | [ci skip] Space out framework names in USAGE | Kasper Timm Hansen | 2015-12-30 | 2 | -5/+5 |
* | | Add sass-rails back to the default Gemfile | Rafael Mendonça França | 2015-12-30 | 1 | -0/+2 |
|/ |
|
* | Changed default value of `:rc` option to `nil` | Prathamesh Sonpatki | 2015-12-25 | 1 | -1/+1 |
* | :scissors: whitespace in generated config files [skip ci] | Jon Atack | 2015-12-24 | 2 | -2/+2 |
* | Merge pull request #22750 from nettofarah/patch-1 | Sean Griffin | 2015-12-23 | 1 | -1/+26 |
|\ |
|
| * | Plugin Usage and Installation instructions | Netto Farah | 2015-12-23 | 1 | -1/+26 |
* | | Move test coloring closer to where it's used. | Kasper Timm Hansen | 2015-12-23 | 1 | -15/+9 |
* | | Remove local variable color. | Kasper Timm Hansen | 2015-12-23 | 1 | -5/+5 |
* | | Rename color to color_output. | Kasper Timm Hansen | 2015-12-23 | 1 | -6/+5 |
* | | Remove unused blue color. | Kasper Timm Hansen | 2015-12-23 | 1 | -2/+1 |
* | | Color failure line by result code. | Kasper Timm Hansen | 2015-12-23 | 1 | -1/+1 |
* | | Rewrite aggregated results suppression. | Kasper Timm Hansen | 2015-12-23 | 1 | -10/+4 |
* | | [ci skip] Clarify why we're clearing reporters. | Kasper Timm Hansen | 2015-12-23 | 1 | -1/+1 |
* | | Merge pull request #22756 from lucasmazza/lm-test-reporter-colored-output | Kasper Timm Hansen | 2015-12-23 | 2 | -1/+47 |
|\ \ |
|
| * | | Add colored output to the new test reporter. | Lucas Mazza | 2015-12-22 | 2 | -1/+47 |
| |/ |
|
* | | Merge pull request #22757 from paulkogel/patch-1 | Rafael França | 2015-12-22 | 1 | -1/+1 |
|\ \ |
|
| * | | seeds.rb.tt: fix English. | Paul Kögel | 2015-12-22 | 1 | -1/+1 |
* | | | remove cors initializer from rails app | yuuji.yaginuma | 2015-12-22 | 1 | -0/+6 |
|/ / |
|
* | | Merge pull request #22753 from gwincr11/keeps-options-breaks-assets | Matthew Draper | 2015-12-22 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Fix .keep file issue with ActionCable | Cory Gwin | 2015-12-21 | 1 | -1/+1 |
* | | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cable | Rafael França | 2015-12-21 | 1 | -0/+8 |
|\ \ |
|
| * | | Ensure Action Cable files are removed when `skip_action_cable` is set. | Jey Balachandran | 2015-12-21 | 1 | -0/+8 |
* | | | Merge pull request #22684 from teknofire/fix-using-add_resource-with-a-block-... | Yves Senn | 2015-12-21 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fixes using `add_source` with a block after using `gem` in a custom rails | Will Fisher | 2015-12-21 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge pull request #22698 from y-yagi/display_detail_info_on_inline_report | Kasper Timm Hansen | 2015-12-21 | 1 | -1/+7 |
|\ \ \ |
|
| * | | | display detailed information in inline reporting | yuuji.yaginuma | 2015-12-21 | 1 | -1/+7 |
| | |/
| |/| |
|
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-12-20 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | remove extra spaces in fixtures doc part | Gaurav Sharma | 2015-12-13 | 1 | -2/+2 |
* | | | Merge pull request #22683 from gwincr11/No-Doc-Rails__Generators__Actions__Cr... | Richard Schneeman | 2015-12-18 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Add No Doc | Cory Gwin | 2015-12-18 | 1 | -1/+1 |
* | | | | Merge pull request #22690 from claudiob/remove-blank-line | Richard Schneeman | 2015-12-18 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Remove blank line generated in config.ru | claudiob | 2015-12-18 | 1 | -1/+1 |