Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

54bfe707

Commit 54bfe707 authored 8 years ago by Alfredo Sumaran

Downloads
- Patches
- Plain Diff

Add more tests to check conflicts resolution

parent c4142cf9

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/merge_conflict_data_provider.js.es6 1 addition, 1 deletion

app/assets/javascripts/merge_conflict_data_provider.js.es6
app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 3 additions, 1 deletion

...s/javascripts/merge_conflicts/merge_conflict_store.js.es6
spec/controllers/projects/merge_requests_controller_spec.rb 1 addition, 0 deletions

spec/controllers/projects/merge_requests_controller_spec.rb
spec/features/merge_requests/conflicts_spec.rb 96 additions, 49 deletions

spec/features/merge_requests/conflicts_spec.rb

with 101 additions and 51 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment