Merge branch 'master' into fe-commit-mr-pipelines

* master:
  fix rack-proxy dependency in production
  Fixed typo

Gemfile

@@ -219,6 +219,8 @@ gem 'chronic', '~> 0.10.2'
 gem 'chronic_duration', '~> 0.10.6'
 
 gem 'webpack-rails', '~> 0.9.9'
+gem 'rack-proxy', '~> 0.6.0'
+
 gem 'sass-rails', '~> 5.0.6'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'uglifier', '~> 2.7.2'
@@ -311,8 +313,6 @@ group :development, :test do
   gem 'activerecord_sane_schema_dumper', '0.2'
 
   gem 'stackprof', '~> 0.2.10'
-
-  gem 'rack-proxy', '~> 0.6.0'
 end
 
 group :test do

changelogs/unreleased/slash-commands-typo.yml

+---
+title: Fixed "substract" typo on /help/user/project/slash_commands
+merge_request: 8976
+author: Jason Aquino

doc/user/project/slash_commands.md

@@ -32,6 +32,6 @@ do.
 | `/wip`                     | Toggle the Work In Progress status |
 | <code>/estimate &lt;1w 3d 2h 14m&gt;</code> | Set time estimate |
 | `/remove_estimate`       | Remove estimated time |
-| <code>/spend &lt;1h 30m &#124; -1h 5m&gt;</code> | Add or substract spent time |
+| <code>/spend &lt;1h 30m &#124; -1h 5m&gt;</code> | Add or subtract spent time |
 | `/remove_time_spent`       | Remove time spent |
 | `/target_branch <Branch Name>` | Set target branch for current merge request |