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
16ea3315
Commit
16ea3315
authored
Apr 04, 2018
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Allow CI/CD Jobs being grouped on version strings"
This reverts commit
4f2cdb51
.
parent
eaed588b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
app/models/commit_status.rb
app/models/commit_status.rb
+1
-1
spec/models/commit_status_spec.rb
spec/models/commit_status_spec.rb
+1
-3
No files found.
app/models/commit_status.rb
View file @
16ea3315
...
@@ -141,7 +141,7 @@ class CommitStatus < ActiveRecord::Base
...
@@ -141,7 +141,7 @@ class CommitStatus < ActiveRecord::Base
end
end
def
group_name
def
group_name
name
.
to_s
.
gsub
(
%r{
\d
+[
\
.\
s
:/
\\
]+
\d
+
\s
*}
,
''
).
strip
name
.
to_s
.
gsub
(
%r{
\d
+[
\s
:/
\\
]+
\d
+
\s
*}
,
''
).
strip
end
end
def
failed_but_allowed?
def
failed_but_allowed?
...
...
spec/models/commit_status_spec.rb
View file @
16ea3315
...
@@ -368,9 +368,7 @@ describe CommitStatus do
...
@@ -368,9 +368,7 @@ describe CommitStatus do
'rspec:windows 0 : / 1'
=>
'rspec:windows'
,
'rspec:windows 0 : / 1'
=>
'rspec:windows'
,
'rspec:windows 0 : / 1 name'
=>
'rspec:windows name'
,
'rspec:windows 0 : / 1 name'
=>
'rspec:windows name'
,
'0 1 name ruby'
=>
'name ruby'
,
'0 1 name ruby'
=>
'name ruby'
,
'0 :/ 1 name ruby'
=>
'name ruby'
,
'0 :/ 1 name ruby'
=>
'name ruby'
'golang test 1.8'
=>
'golang test'
,
'1.9 golang test'
=>
'golang test'
}
}
tests
.
each
do
|
name
,
group_name
|
tests
.
each
do
|
name
,
group_name
|
...
...
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