aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22826 from timrogers/actiondispatch-ssl-configRafael França2015-12-312-2/+9
|\
| * Flexible configuration for ActionDispatch::SSLTim Rogers2015-12-292-2/+9
* | [ci skip] Space out framework names in USAGEKasper Timm Hansen2015-12-302-5/+5
* | Add sass-rails back to the default GemfileRafael Mendonça França2015-12-302-0/+9
|/
* Changed default value of `:rc` option to `nil`Prathamesh Sonpatki2015-12-251-1/+1
* :scissors: whitespace in generated config files [skip ci]Jon Atack2015-12-242-2/+2
* Merge pull request #22750 from nettofarah/patch-1Sean Griffin2015-12-231-1/+26
|\
| * Plugin Usage and Installation instructionsNetto Farah2015-12-231-1/+26
* | Move test coloring closer to where it's used.Kasper Timm Hansen2015-12-231-15/+9
* | Remove local variable color.Kasper Timm Hansen2015-12-231-5/+5
* | Rename color to color_output.Kasper Timm Hansen2015-12-231-6/+5
* | Remove unused blue color.Kasper Timm Hansen2015-12-231-2/+1
* | Color failure line by result code.Kasper Timm Hansen2015-12-231-1/+1
* | Rewrite aggregated results suppression.Kasper Timm Hansen2015-12-231-10/+4
* | [ci skip] Clarify why we're clearing reporters.Kasper Timm Hansen2015-12-231-1/+1
* | Merge pull request #22756 from lucasmazza/lm-test-reporter-colored-outputKasper Timm Hansen2015-12-233-4/+82
|\ \
| * | Add colored output to the new test reporter.Lucas Mazza2015-12-223-4/+82
* | | Merge pull request #22757 from paulkogel/patch-1Rafael França2015-12-221-1/+1
|\ \ \
| * | | seeds.rb.tt: fix English.Paul Kögel2015-12-221-1/+1
* | | | Merge pull request #22755 from y-yagi/remove_cors_initializer_from_rails_appSean Griffin2015-12-222-0/+12
|\ \ \ \ | |/ / / |/| | |
| * | | remove cors initializer from rails appyuuji.yaginuma2015-12-222-0/+12
* | | | release notes, extract notable changes from Railties CHANGELOG.Yves Senn2015-12-221-4/+4
|/ / /
* | | Merge pull request #22753 from gwincr11/keeps-options-breaks-assetsMatthew Draper2015-12-221-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix .keep file issue with ActionCableCory Gwin2015-12-211-1/+1
* | | Fix Rails tutorial linkclaudiob2015-12-211-1/+1
| |/ |/|
* | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cableRafael França2015-12-212-0/+11
|\ \
| * | Ensure Action Cable files are removed when `skip_action_cable` is set.Jey Balachandran2015-12-212-0/+11
* | | Use the generators options to not generate channel assetsRafael Mendonça França2015-12-211-6/+2
* | | Merge pull request #22727 from prathamesh-sonpatki/fix-masterKasper Timm Hansen2015-12-211-1/+4
|\ \ \
| * | | Ensure that assets are enabled back after the test that tests assets are disa...Prathamesh Sonpatki2015-12-211-1/+4
* | | | [ci skip] No more no changes entries in the CHANGELOGs (cases left in #22718)Akshay Vishnoi2015-12-221-3/+0
* | | | Merge pull request #22684 from teknofire/fix-using-add_resource-with-a-block-...Yves Senn2015-12-213-1/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes using `add_source` with a block after using `gem` in a custom railsWill Fisher2015-12-213-1/+14
| |/ /
* | | Merge pull request #22692 from ryohashimoto/22669_api_generatorDavid Heinemeier Hansson2015-12-211-0/+30
|\ \ \
| * | | Action Cable channel generator should not create JS assets in --api modeRyo Hashimoto2015-12-191-0/+30
| |/ /
* | | Merge pull request #22698 from y-yagi/display_detail_info_on_inline_reportKasper Timm Hansen2015-12-215-7/+19
|\ \ \
| * | | display detailed information in inline reportingyuuji.yaginuma2015-12-215-7/+19
| | |/ | |/|
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-12-201-2/+2
|\ \ \ | |/ / |/| |
| * | remove extra spaces in fixtures doc partGaurav Sharma2015-12-131-2/+2
* | | Merge pull request #22683 from gwincr11/No-Doc-Rails__Generators__Actions__Cr...Richard Schneeman2015-12-181-1/+1
|\ \ \
| * | | Add No DocCory Gwin2015-12-181-1/+1
* | | | Merge pull request #22690 from claudiob/remove-blank-lineRichard Schneeman2015-12-181-1/+1
|\ \ \ \
| * | | | Remove blank line generated in config.ruclaudiob2015-12-181-1/+1
* | | | | Explain what initializer/config_serializer doesclaudiob2015-12-181-0/+2
|/ / / /
* | | / initializers/cookies_serializer is not new to 5.0claudiob2015-12-181-1/+0
| |_|/ |/| |
* | | Add CHANGELOG headers for Rails 5.0.0.beta1eileencodes2015-12-181-0/+5
* | | Change `alpha` to `beta1` to prep for release of Rails 5eileencodes2015-12-181-1/+1
* | | Don't need to use `Array.wrap`Rafael Mendonça França2015-12-182-2/+2
* | | Do not check the version anymoreRafael Mendonça França2015-12-181-2/+2
* | | Merge pull request #22657 from matthewd/loosen-versionRafael Mendonça França2015-12-184-3/+32
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 03:55:35 +0000