Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Boxiang Sun
gitlab-ce
Repository
d92bd8e2a5ca13d8aac58eab72e715ce792f13fb
Switch branch/tag
gitlab-ce
spec
models
repository_spec.rb
Find file
Blame
History
Permalink
GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
· 0b965528
Ahmad Sherif
authored
Jan 23, 2018
0b965528
repository_spec.rb
78.2 KB
Edit
Web IDE
Replace repository_spec.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace repository_spec.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
