Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
223041fa
Commit
223041fa
authored
Sep 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix environments handling
parent
99f1385e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+1
-2
lib/gitlab/regex.rb
lib/gitlab/regex.rb
+2
-2
No files found.
doc/ci/yaml/README.md
View file @
223041fa
...
@@ -547,7 +547,7 @@ GitLab.
...
@@ -547,7 +547,7 @@ GitLab.
If
`environment`
is specified and no environment under that name exists, a new
If
`environment`
is specified and no environment under that name exists, a new
one will be created automatically.
one will be created automatically.
The
`environment`
name must
be a valid
[
Git reference name
][
gitref
]
. Common
The
`environment`
name must
contain only letters, digits, '-', '_', '/', '$', '{', '}' and spaces
. Common
names are
`qa`
,
`staging`
, and
`production`
, but you can use whatever name works
names are
`qa`
,
`staging`
, and
`production`
, but you can use whatever name works
with your workflow.
with your workflow.
...
@@ -1083,5 +1083,4 @@ CI with various languages.
...
@@ -1083,5 +1083,4 @@ CI with various languages.
[
examples
]:
../examples/README.md
[
examples
]:
../examples/README.md
[
ce-6323
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6323
[
ce-6323
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6323
[
gitref
]:
https://git-scm.com/docs/git-check-ref-format
[
environment
]:
../environments.md
[
environment
]:
../environments.md
lib/gitlab/regex.rb
View file @
223041fa
...
@@ -96,11 +96,11 @@ module Gitlab
...
@@ -96,11 +96,11 @@ module Gitlab
end
end
def
environment_name_regex
def
environment_name_regex
git_reference_regex
@environment_name_regex
||=
/\A[a-zA-Z0-9_\\\/\${} -]+\z/
.
freeze
end
end
def
environment_name_regex_message
def
environment_name_regex_message
"
be a valid git reference name
"
"
can contain only letters, digits, '-', '_', '/', '$', '{', '}' and spaces
"
end
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment