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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b7588443
Commit
b7588443
authored
Oct 24, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in lib/backup/manager.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
cfd0b420
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
7 deletions
+0
-7
lib/backup/manager.rb
lib/backup/manager.rb
+0
-7
No files found.
lib/backup/manager.rb
View file @
b7588443
...
@@ -137,19 +137,12 @@ module Backup
...
@@ -137,19 +137,12 @@ module Backup
# restoring mismatching backups can lead to unexpected problems
# restoring mismatching backups can lead to unexpected problems
if
settings
[
:gitlab_version
]
!=
Gitlab
::
VERSION
if
settings
[
:gitlab_version
]
!=
Gitlab
::
VERSION
<<<<<<<
HEAD
$progress
.
puts
'GitLab version mismatch:'
.
color
(
:red
)
$progress
.
puts
" Your current GitLab version (
#{
Gitlab
::
VERSION
}
) differs from the GitLab version in the backup!"
.
color
(
:red
)
$progress
.
puts
' Please switch to the following version and try again:'
.
color
(
:red
)
$progress
.
puts
" version:
#{
settings
[
:gitlab_version
]
}
"
.
color
(
:red
)
=======
$progress
.
puts
(
<<~
HEREDOC
.
color
(
:red
))
$progress
.
puts
(
<<~
HEREDOC
.
color
(
:red
))
GitLab version mismatch:
GitLab version mismatch:
Your current GitLab version (
#{
Gitlab
::
VERSION
}
) differs from the GitLab version in the backup!
Your current GitLab version (
#{
Gitlab
::
VERSION
}
) differs from the GitLab version in the backup!
Please switch to the following version and try again:
Please switch to the following version and try again:
version:
#{
settings
[
:gitlab_version
]
}
version:
#{
settings
[
:gitlab_version
]
}
HEREDOC
HEREDOC
>>>>>>>
82446
a2bd009e7d7481c35a142063a3973be77ce
$progress
.
puts
$progress
.
puts
$progress
.
puts
"Hint: git checkout v
#{
settings
[
:gitlab_version
]
}
"
$progress
.
puts
"Hint: git checkout v
#{
settings
[
:gitlab_version
]
}
"
exit
1
exit
1
...
...
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