summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2018-01-03 12:54:47 +0100
committerJacob Vosmaer <jacob@gitlab.com>2018-01-03 12:54:47 +0100
commit449b59ec69f7da2be9e75fdaf282592f048b9853 (patch)
treecd1bd0aa7167a9eb9088fead95224f5dc42b757e
parent8d8550c78ba0b7d6ac4a26b77b9b2def203d4eec (diff)
downloadgitlab-ce-449b59ec69f7da2be9e75fdaf282592f048b9853.tar.gz
Better Englishgitaly-merge-nil
-rw-r--r--spec/lib/gitlab/git/repository_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index c8ed0494f68..21379ae0f45 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -1730,7 +1730,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
# This 'nil' signals that the merge was not applied
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)
end
end