Commit dfe00667 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'sh-fix-admin-push-regex' into 'master'

Fix branch name regex not saving in /admin/push_rule page

Closes #3383

See merge request !2877
parents ac3f1632 91c1ab2e
...@@ -25,7 +25,7 @@ class Admin::PushRulesController < Admin::ApplicationController ...@@ -25,7 +25,7 @@ class Admin::PushRulesController < Admin::ApplicationController
def push_rule_params def push_rule_params
params.require(:push_rule).permit(:deny_delete_tag, :delete_branch_regex, params.require(:push_rule).permit(:deny_delete_tag, :delete_branch_regex,
:commit_message_regex, :force_push_regex, :author_email_regex, :member_check, :commit_message_regex, :branch_name_regex, :force_push_regex, :author_email_regex, :member_check,
:file_name_regex, :max_file_size, :prevent_secrets) :file_name_regex, :max_file_size, :prevent_secrets)
end end
......
---
title: Fix branch name regex not saving in /admin/push_rule config
merge_request:
author:
type: fixed
...@@ -10,7 +10,7 @@ describe Admin::PushRulesController do ...@@ -10,7 +10,7 @@ describe Admin::PushRulesController do
describe '#update' do describe '#update' do
let(:params) do let(:params) do
{ {
deny_delete_tag: true, delete_branch_regex: "any", commit_message_regex: "any", deny_delete_tag: true, delete_branch_regex: "any", commit_message_regex: "any", branch_name_regex: "any",
force_push_regex: "any", author_email_regex: "any", member_check: true, file_name_regex: "any", force_push_regex: "any", author_email_regex: "any", member_check: true, file_name_regex: "any",
max_file_size: "0", prevent_secrets: true max_file_size: "0", prevent_secrets: true
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment