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
Léo-Paul Géneau
gitlab-ce
Commits
7dc70e0d
Commit
7dc70e0d
authored
Oct 22, 2018
by
Mario de la Ossa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ee-compat-check by not modifying frozen strings
parent
4cf1845e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+6
-4
No files found.
lib/gitlab/ee_compat_check.rb
View file @
7dc70e0d
...
@@ -286,7 +286,7 @@ module Gitlab
...
@@ -286,7 +286,7 @@ module Gitlab
end
end
def
patch_name_from_branch
(
branch_name
)
def
patch_name_from_branch
(
branch_name
)
branch_name
.
parameterize
<<
'.patch'
"
#{
branch_name
.
parameterize
}
.patch"
end
end
def
patch_url
def
patch_url
...
@@ -434,9 +434,11 @@ module Gitlab
...
@@ -434,9 +434,11 @@ module Gitlab
end
end
def
conflicting_files_msg
def
conflicting_files_msg
failed_files
.
reduce
(
"The conflicts detected were as follows:
\n
"
)
do
|
memo
,
file
|
header
=
"The conflicts detected were as follows:
\n
"
memo
<<
"
\n
-
#{
file
}
"
separator
=
"
\n
- "
end
failed_items
=
failed_files
.
join
(
separator
)
"
#{
header
}#{
separator
}#{
failed_items
}
"
end
end
end
end
end
end
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