kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Revert unnecesarry changes

This commit is contained in:
Shinya Maeda 2017-07-05 21:00:22 +09:00
parent 46076f1599
commit dbd0111390
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/ci/build.rb
View File

@ -176,9 +176,12 @@ module Ci
# * Lowercased # * Lowercased
# * Anything not matching [a-z0-9-] is replaced with a - # * Anything not matching [a-z0-9-] is replaced with a -
# * Maximum length is 63 bytes # * Maximum length is 63 bytes
# * First/Last Character is not a hyphen
def ref_slug def ref_slug
slugified = ref.to_s.downcase ref.to_s
slugified.gsub(/[^a-z0-9]/, '-')[0..62] .downcase
.gsub(/[^a-z0-9]/, '-')[0..62]
.gsub(/(\A-+|-+\z)/, '')
end end
# Variables whose value does not depend on environment # Variables whose value does not depend on environment

6
spec/models/ci/build_spec.rb
View File

@ -1004,7 +1004,11 @@ describe Ci::Build, :models do
'fix-1-foo' => 'fix-1-foo', 'fix-1-foo' => 'fix-1-foo',
'a' * 63 => 'a' * 63, 'a' * 63 => 'a' * 63,
'a' * 64 => 'a' * 63, 'a' * 64 => 'a' * 63,
'FOO' => 'foo' 'FOO' => 'foo',
'-' + 'a' * 61 + '-' => 'a' * 61,
'-' + 'a' * 62 + '-' => 'a' * 62,
'-' + 'a' * 63 + '-' => 'a' * 62,
'a' * 62 + ' ' => 'a' * 62
}.each do |ref, slug| }.each do |ref, slug|
it "transforms #{ref} to #{slug}" do it "transforms #{ref} to #{slug}" do
build.ref = ref build.ref = ref

2
spec/support/matchers/access_matchers_for_controller.rb
View File

@ -65,7 +65,7 @@ module AccessMatchersForController
end end
matcher :be_allowed_for do |role| matcher :be_allowed_for do |role|
match do |action, &block| match do |action|
user = emulate_user(role, @membership) user = emulate_user(role, @membership)
update_owner(@objects, user) update_owner(@objects, user)
action.call action.call