aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #22874 from ↵Rafael França2016-01-012-0/+0
|\ \ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/create-application-model-under-namespaced-dir-in-plugin Create application_record.rb under namespaced directory in plugin
| * | | Create application_record under namespaced directory in pluginPrathamesh Sonpatki2016-01-012-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Earlier it was creating application_record.rb under `app/models`, after this change, it will create application_record.rb under `app/models/plugin_name` similar to other application classes.
* | | | Remove a wasted spaceShota Iguchi2016-01-011-1/+1
| | | |
* | | | Update copyright notices to 2016 [ci skip]Rashmi Yadav2015-12-311-2/+2
|/ / /
* | | Merge pull request #22826 from timrogers/actiondispatch-ssl-configRafael França2015-12-312-2/+9
|\ \ \ | | | | | | | | Configurable redirect and secure cookies for ActionDispatch::SSL
| * | | Flexible configuration for ActionDispatch::SSLTim Rogers2015-12-292-2/+9
| | |/ | |/|
* | | [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-302-0/+9
|/ / | | | | | | 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-233-4/+82
|\ \ \ | | | | | | | | Add colored output to the new test reporter.
| * | | 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.
| * | | | 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 app
| * | | | remove cors initializer from rails appyuuji.yaginuma2015-12-222-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | `rack-cors` gem is defined in Gemfile by default only if the api, not defined by default in rails app.
* | | | | release notes, extract notable changes from Railties CHANGELOG.Yves Senn2015-12-221-4/+4
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | 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.
* | | | Fix Rails tutorial linkclaudiob2015-12-211-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] The old link is 404 not found. The link matches what the rest of the documentation already points to: * https://github.com/rails/rails/blame/2de2263118d6763c11a02db05079a5b7a97a0a34/guides/source/getting_started.md#L2052 * https://github.com/rails/rails/blame/2de2263118d6763c11a02db05079a5b7a97a0a34/README.md#L74
* | | 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.
| * | | Ensure Action Cable files are removed when `skip_action_cable` is set.Jey Balachandran2015-12-212-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | 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 disabled
| * | | | Ensure that assets are enabled back after the test that tests assets are ↵Prathamesh Sonpatki2015-12-211-1/+4
| | | | | | | | | | | | | | | | | | | | disabled
* | | | | [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 ↵Yves Senn2015-12-213-1/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | 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-213-1/+14
| |/ / / | | | | | | | | | | | | generator template.
* | | | Merge pull request #22692 from ryohashimoto/22669_api_generatorDavid Heinemeier Hansson2015-12-211-0/+30
|\ \ \ \ | | | | | | | | | | Action Cable channel generator doesn't create JS assets if options[:rails][:assets] is false
| * | | | 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 reporting
| * | | | display detailed information in inline reportingyuuji.yaginuma2015-12-215-7/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Add CHANGELOG headers for Rails 5.0.0.beta1eileencodes2015-12-181-0/+5
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 10:38:12 +0000