aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Remove a wasted spaceShota Iguchi2016-01-011-1/+1
|/ / /
* | | Merge pull request #22826 from timrogers/actiondispatch-ssl-configRafael França2015-12-311-1/+1
|\ \ \ | | | | | | | | Configurable redirect and secure cookies for ActionDispatch::SSL
| * | | Flexible configuration for ActionDispatch::SSLTim Rogers2015-12-291-1/+1
| |/ /
* | | [ci skip] Space out framework names in USAGEKasper Timm Hansen2015-12-302-5/+5
| | | | | | | | | | | | | | | | | | Two USAGE files were referring to Active Record and Active Model without a space, which is incorrect because we're referring to the framework name and not the constants.
* | | Add sass-rails back to the default GemfileRafael Mendonça França2015-12-301-0/+2
|/ / | | | | | | It was removed by mistake at 877a411d0c16baa4e670dae9a28f5cfcc201adc1
* | Changed default value of `:rc` option to `nil`Prathamesh Sonpatki2015-12-251-1/+1
| | | | | | | | | | | | | | - This fixes an error thrown by Thor because type of default value of `:rc` option which is `:boolean` does not match with it's default type which is `string`. - Ref - https://github.com/erikhuda/thor/blob/master/lib/thor/parser/option.rb#L125
* | :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 instructions
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Didn't like the constant being at the top of the file, gave it overdue importance. Now that `color_output` expects a result we can shorten some of the flexibility from earlier: * Inline COLOR_CODES constant (keep local variable for readability, but don't need names of colors at run time). * Inline color variable in `color_output`. Looks just as clear without it.
* | | Remove local variable color.Kasper Timm Hansen2015-12-231-5/+5
| | | | | | | | | | | | | | | Focus `color_output`'s intent on coloring output by a result. We aren't meant to pass it arbitrary codes to color output.
* | | Rename color to color_output.Kasper Timm Hansen2015-12-231-6/+5
| | | | | | | | | | | | | | | | | | The word color is being thrown all around with slightly different meanings. Right now, I understand it. But I'd like to be more immediately clear.
* | | Remove unused blue color.Kasper Timm Hansen2015-12-231-2/+1
| | | | | | | | | | | | I got the blues because we aren't coloring any lines blue.
* | | Color failure line by result code.Kasper Timm Hansen2015-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | The static red color wouldn't paint skips in their designated yellow. Use the color name we got from the result label earlier, which marks skips as yellow.
* | | Rewrite aggregated results suppression.Kasper Timm Hansen2015-12-231-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | I should have replaced the summary reporter with a subclass the first time I wrote this. For whatever reason, I didn't. Do it right and slim the methods added to Minitest in the process.
* | | [ci skip] Clarify why we're clearing reporters.Kasper Timm Hansen2015-12-231-1/+1
| | | | | | | | | | | | | | | | | | Minitest by default includes a summary reporter and a progress reporter. To print colored output, we have to replace the progress reporter.
* | | Merge pull request #22756 from lucasmazza/lm-test-reporter-colored-outputKasper Timm Hansen2015-12-232-1/+47
|\ \ \ | | | | | | | | Add colored output to the new test reporter.
| * | | Add colored output to the new test reporter.Lucas Mazza2015-12-222-1/+47
| |/ /
* | | Merge pull request #22757 from paulkogel/patch-1Rafael França2015-12-221-1/+1
|\ \ \ | | | | | | | | seeds.rb.tt: fix English.
| * | | seeds.rb.tt: fix English.Paul Kögel2015-12-221-1/+1
| | | |
* | | | remove cors initializer from rails appyuuji.yaginuma2015-12-221-0/+6
|/ / / | | | | | | | | | | | | `rack-cors` gem is defined in Gemfile by default only if the api, not defined by default in rails app.
* | | Merge pull request #22753 from gwincr11/keeps-options-breaks-assetsMatthew Draper2015-12-221-1/+1
|\ \ \ | |/ / |/| | Fix .keep file issue with ActionCable
| * | Fix .keep file issue with ActionCableCory Gwin2015-12-211-1/+1
| | | | | | | | | | | | | | | | | | Fixes #22708 Make sure the channels file is create in assets/javascript/ so require tree works in asset pipeline.
* | | Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cableRafael França2015-12-211-0/+8
|\ \ \ | | | | | | | | Ensure Action Cable files are removed when `skip_action_cable` is set.
| * | | Ensure Action Cable files are removed when `skip_action_cable` is set.Jey Balachandran2015-12-211-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Action Cable generators creates four files which need to be removed if `skip_action_cable` is set. 1. `app/assets/javascripts/cable.coffee` 2. `app/channels/application_cable/channel.rb` 3. `app/channels/application_cable/connection.rb` 4. `config/redis/cable.yml` Fixes #22669.
* | | Merge pull request #22684 from ↵Yves Senn2015-12-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | teknofire/fix-using-add_resource-with-a-block-after-gem-call Fix using add_resource with a block after gem in custom generators
| * | | Fixes using `add_source` with a block after using `gem` in a custom railsWill Fisher2015-12-211-1/+1
| |/ / | | | | | | | | | generator template.
* | | Merge pull request #22698 from y-yagi/display_detail_info_on_inline_reportKasper Timm Hansen2015-12-211-1/+7
|\ \ \ | | | | | | | | display detailed information in inline reporting
| * | | display detailed information in inline reportingyuuji.yaginuma2015-12-211-1/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The errors message only was not displayed, as if it did not use the inline reporting, modified to also information the method name and the like in error are displayed. ``` # before Failed assertion, no message given. bin/rails test test/models/user_test.rb:5 ``` ``` # after Failure: UserTest#test_the_truth: Failed assertion, no message given. bin/rails test test/models/user_test.rb:5 ```
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Every time when a fixture generate, it’s also generating improper doc. one: {} # column: value # two: {} # column: value ```
* | | Merge pull request #22683 from ↵Richard Schneeman2015-12-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | gwincr11/No-Doc-Rails__Generators__Actions__CreateMigration Add No Doc
| * | | Add No DocCory Gwin2015-12-181-1/+1
| | | | | | | | | | | | | | | | In reference to rails/rail#22403 add a :nodoc:
* | | | Merge pull request #22690 from claudiob/remove-blank-lineRichard Schneeman2015-12-181-1/+1
|\ \ \ \ | | | | | | | | | | Remove blank line generated in config.ru
| * | | | Remove blank line generated in config.ruclaudiob2015-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Follow the lines of the other `.tt` files ([example](https://github.com/rails/rails/blob/1611ab4db173a7596a7a94c58dabf1483f070304/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt#L26)) that have the space after the condition to avoid too many white lines in the resulted file.
* | | | | Explain what initializer/config_serializer doesclaudiob2015-12-181-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | In line with the other initializers, add a short comment that explains what happens when you change the value of the initializer. [ci skip]
* | | / initializers/cookies_serializer is not new to 5.0claudiob2015-12-181-1/+0
| |_|/ |/| | | | | | | | | | | | | | | | | [ci skip] The initializer has existed since 4.1, for instance see: https://github.com/rails/rails/blob/v4.1.0/railties/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb
* | | Change `alpha` to `beta1` to prep for release of Rails 5eileencodes2015-12-181-1/+1
| | | | | | | | | | | | :tada: :beers:
* | | Don't need to use `Array.wrap`Rafael Mendonça França2015-12-182-2/+2
| | |
* | | Merge pull request #22657 from matthewd/loosen-versionRafael Mendonça França2015-12-183-3/+17
|\ \ \ | | | | | | | | | | | | Allow normal version updates within a release series
| * | | Allow normal version updates within a release seriesMatthew Draper2015-12-183-3/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We originally chose to apply very strict versioning on the `rails` entry in the Gemfile, because our future versioning policy was not strongly defined. Now it is, and our policy is very much designed on the expectation that people will regularly update to the latest patch level in their release series... so we should encourage that. Of course, Gemfile.lock will do its job and prevent unplanned updates, just as it does for every other gem in the bundle... but if you run `bundle update`, we want to get you the latest bug/security fixes without requiring a manual edit of the Gemfile entry. Our current version could be a few different shapes, so it takes a bit of work to find the right specifier, but in principle, we match anything of the form x.y.*, where x.y matches our current release series.
* | | Refer to rails command instead of rake in a bunch of placesDavid Heinemeier Hansson2015-12-181-1/+1
| | | | | | | | | | | | Still more to do. Please assist!
* | | Explain reason for eager loadingDavid Heinemeier Hansson2015-12-181-0/+1
| | |
* | | Explain Redis' role in Action CableDavid Heinemeier Hansson2015-12-181-0/+1
| | |
* | | Bring comment in line with rest of initializersDavid Heinemeier Hansson2015-12-181-2/+2
| | |
* | | Explain the concept of config initializers for backwards compatibilityDavid Heinemeier Hansson2015-12-183-2/+5
| | |
* | | Fix spacingDavid Heinemeier Hansson2015-12-181-1/+1
| | |
* | | These options are not changed nearly often enough to warrant inclusion like ↵David Heinemeier Hansson2015-12-181-8/+0
| | | | | | | | | | | | this at a high level
* | | Better explanationDavid Heinemeier Hansson2015-12-181-2/+6
| | |
* | | Use the rails command, not rake, for all rails commandsDavid Heinemeier Hansson2015-12-182-6/+6
| | |