Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name

* upstream/master: (117 commits)
  spec and fix for sanitize method
  remove fix validatable import url migration
  Fix typo in spec
  Update Gemfile.lock after versions were added in !5078
  Add more comments to regex
  Add changelog item
  Add blockquote fence syntax to Markdown
  Fix typo and explain the precedence of STDERR and STDOUT
  Add changelog entry for !4399
  Add reminder to not paste private SSH keys
  Make subnavigation a bit darker color
  Update ui_guide.md with button capitalize rule
  Re-use queries in reference parsers
  Use btn-danger for delete button.
  Update New Snippet buttons.
  Run bundle install.
  Add min attribute to project_limit field on user's form
  Wrong gitlab-shell version
  API: Expose shared projects in a group
  Memoize MR merged/closed events retrieval
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 5c1460b0e75..10b497d05a0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -720,7 +720,7 @@ Rails.application.routes.draw do
           resource :release, only: [:edit, :update]
         end
 
-        resources :protected_branches, only: [:index, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
+        resources :protected_branches, only: [:index, :show, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
         resources :variables, only: [:index, :show, :update, :create, :destroy]
         resources :triggers, only: [:index, :create, :destroy]