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
449b59ec
Commit
449b59ec
authored
Jan 03, 2018
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better English
parent
8d8550c7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+1
-1
No files found.
spec/lib/gitlab/git/repository_spec.rb
View file @
449b59ec
...
@@ -1730,7 +1730,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -1730,7 +1730,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
# This 'nil' signals that the merge was not applied
# This 'nil' signals that the merge was not applied
expect
(
result
).
to
be_nil
expect
(
result
).
to
be_nil
# Our concurrent ref update should not have been
reversed
# Our concurrent ref update should not have been
undone
expect
(
repository
.
find_branch
(
target_branch
).
target
).
to
eq
(
concurrent_update_id
)
expect
(
repository
.
find_branch
(
target_branch
).
target
).
to
eq
(
concurrent_update_id
)
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