diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-04-04 14:10:22 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-04-04 14:10:22 +0200 |
| commit | 16ea3315f2bb2a7764f2c101625422e6a374fa6f (patch) | |
| tree | 6bdeccc83b14c3514f7e0bdc572578134fb02ed1 | |
| parent | eaed588bf228c833cb666a61bc7d25cf21d5f94b (diff) | |
| download | gitlab-ce-16ea3315f2bb2a7764f2c101625422e6a374fa6f.tar.gz | |
Revert "Allow CI/CD Jobs being grouped on version strings"
This reverts commit 4f2cdb51df0f2729055ec4dc6960ae347163da16.
| -rw-r--r-- | app/models/commit_status.rb | 2 | ||||
| -rw-r--r-- | spec/models/commit_status_spec.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 9fb5b7efec6..3469d5d795c 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -141,7 +141,7 @@ class CommitStatus < ActiveRecord::Base end def group_name - name.to_s.gsub(%r{\d+[\.\s:/\\]+\d+\s*}, '').strip + name.to_s.gsub(%r{\d+[\s:/\\]+\d+\s*}, '').strip end def failed_but_allowed? diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb index b7ed8be69fc..c536dab2681 100644 --- a/spec/models/commit_status_spec.rb +++ b/spec/models/commit_status_spec.rb @@ -368,9 +368,7 @@ describe CommitStatus do 'rspec:windows 0 : / 1' => 'rspec:windows', 'rspec:windows 0 : / 1 name' => 'rspec:windows name', '0 1 name ruby' => 'name ruby', - '0 :/ 1 name ruby' => 'name ruby', - 'golang test 1.8' => 'golang test', - '1.9 golang test' => 'golang test' + '0 :/ 1 name ruby' => 'name ruby' } tests.each do |name, group_name| |