diff options
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/_form.html.haml | 2 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index a31153d..bf14dc5 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -159,7 +159,7 @@ ls -la def skip_ref?(ref_name) if skip_refs.present? skip_refs.delete(" ").split(",").each do |ref| - return true unless ref_name !~ Regexp.new(ref) + return true if File.fnmatch(ref, ref_name) end false diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 1833231..3702f7e 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -107,7 +107,7 @@ .col-sm-10 = f.text_field :skip_refs, class: 'form-control', placeholder: 'branch1, branch2, feature/*' .light - You can specify git references to skip CI builds. Accepts strings and regex values + You can specify git references to skip CI builds. Accepts strings and glob pattern syntax .form-actions = f.submit 'Save changes', class: 'btn btn-save' diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 55740f3..4f7f299 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -134,7 +134,7 @@ describe Project do end describe "#skip_ref?" do - let(:project) { FactoryGirl.create(:project, skip_refs: "master, develop, feature/.*, hotfix/*") } + let(:project) { FactoryGirl.create(:project, skip_refs: "master, develop, feature/*") } it 'returns true when item is not in list' do expect(project.skip_ref?('someotherstring')).to eq false @@ -144,9 +144,8 @@ describe Project do expect(project.skip_ref?('master')).to eq true end - it 'accepts regex values' do + it 'accepts glob pattern syntax' do expect(project.skip_ref?('feature/some_feature')).to eq true - expect(project.skip_ref?('feature/ssh_fix')).to eq true end end end |