Merge branch '229677-mr-conflicts' into 'master' (8e2f8b83) · Commits · gitlab-cn / Gitlab · JiHu GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Gitlab
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

gitlab-cn
Gitlab
Commits
8e2f8b83

Commit 8e2f8b83 authored 4 years ago by

Kushal Pandya

Downloads
- Plain Diff

Merge branch '229677-mr-conflicts' into 'master'

Migrate merge conflicts modal

See merge request gitlab-org/gitlab!48370

parents d1823551 089884db

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue 11 additions, 8 deletions

...merge_request_widget/components/mr_widget_status_icon.vue
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue 12 additions, 8 deletions

..._request_widget/components/states/mr_widget_conflicts.vue
changelogs/unreleased/229677-mr-conflicts.yml 5 additions, 0 deletions

changelogs/unreleased/229677-mr-conflicts.yml
spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js 1 addition, 1 deletion

...e_mr_widget/components/states/mr_widget_conflicts_spec.js

with 29 additions and 17 deletions

0% 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