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
Jérome Perrin
gitlab-ce
Commits
611c2fb0
Commit
611c2fb0
authored
May 17, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix invalid object reference in ee_compat_check script
parent
319cab41
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+1
-1
No files found.
lib/gitlab/ee_compat_check.rb
View file @
611c2fb0
...
@@ -131,7 +131,7 @@ module Gitlab
...
@@ -131,7 +131,7 @@ module Gitlab
def
check_patch
(
patch_path
)
def
check_patch
(
patch_path
)
step
(
"Checking out master"
,
%w[git checkout master]
)
step
(
"Checking out master"
,
%w[git checkout master]
)
step
(
"Resetting to latest master"
,
%w[git reset --hard origin/master]
)
step
(
"Resetting to latest master"
,
%w[git reset --hard origin/master]
)
step
(
"Fetching CE/
#{
branch
}
"
,
%W[git fetch
#{
CE_REPO
}
#{
branch
}
]
)
step
(
"Fetching CE/
#{
ce_branch
}
"
,
%W[git fetch
#{
CE_REPO
}
#{
ce_
branch
}
]
)
step
(
step
(
"Checking if
#{
patch_path
}
applies cleanly to EE/master"
,
"Checking if
#{
patch_path
}
applies cleanly to EE/master"
,
%W[git apply --check --3way
#{
patch_path
}
]
%W[git apply --check --3way
#{
patch_path
}
]
...
...
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