summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2015-12-17 19:45:11 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2015-12-17 19:45:11 -0200
commit05737f6c85619863f1ed15a8f6a6d0f1d72c1f22 (patch)
tree53dfa4246582cea65f03ea6ea5cf8895e2af8e23
parente26d1b47575646f15f1ab3a91878bbb695d3bc65 (diff)
downloadgitlab-ce-05737f6c85619863f1ed15a8f6a6d0f1d72c1f22.tar.gz
Add restriction for single characters in branch name
-rw-r--r--app/assets/javascripts/new_branch_form.js.coffee10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/new_branch_form.js.coffee b/app/assets/javascripts/new_branch_form.js.coffee
index 6b01bb0ce21..23a5b333b8a 100644
--- a/app/assets/javascripts/new_branch_form.js.coffee
+++ b/app/assets/javascripts/new_branch_form.js.coffee
@@ -34,13 +34,19 @@ class @NewBranchForm
conjunction: "or"
}
- characters = {
+ invalid = {
pattern: /(\s|~|\^|:|\?|\*|\[|\\|\.\.|@\{|\/{2,}){1}/g
prefix: "can't contains",
conjunction: ", "
}
- @restrictions = [startsWith, characters, endsWith]
+ single = {
+ pattern: /^@+$/g
+ prefix: "can't be",
+ conjunction: "or"
+ }
+
+ @restrictions = [startsWith, invalid, endsWith, single]
validate: =>
@branchNameError.empty()