diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-04 16:35:47 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-04 16:35:47 +0300 |
| commit | 873a1d9364337b4de4665032a5841a162706d1d4 (patch) | |
| tree | d220fc7dccc7a930a5cd8dae298e96e8cd8262f3 | |
| parent | e43c01e6b818a807abef110ec485f92cae396632 (diff) | |
| parent | 695684c8d9a1e5c0b611a6e800d5462f15131e4a (diff) | |
Merge branch 'zj-revert-bad-grouping' into 'master'
Revert "Allow CI/CD Jobs being grouped on version strings"
Closes #44615
See merge request gitlab-org/gitlab-ce!18170
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/models/commit_status.rb | 2 | ||||
| -rw-r--r-- | spec/models/commit_status_spec.rb | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a90a7fcdc2..6491905a1ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -191,7 +191,6 @@ entry. - Enable privileged mode for GitLab Runner. !17528 - Expose GITLAB_FEATURES as CI/CD variable (fixes #40994). - Upgrade GitLab Workhorse to 4.0.0. -- Allow CI/CD Jobs being grouped on version strings. - Add discussions API for Issues and Snippets. - Add one group board to Libre. - Add support for filtering by source and target branch to merge requests API. 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| |