Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- 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

1b6a671e

There was a problem fetching the pipeline summary.

Commit 1b6a671e authored 8 years ago by Rémy Coutable

Downloads
- Plain Diff

Merge branch '28124-mrs-don-t-show-all-merge-errors' into 'master'

Show merge errors in merge request widget

Closes #28124 and gitlab-ee#1652

See merge request !9229

parents 93ae3063 7a9d3a3c

No related branches found

No related tags found

Loading

Pipeline #

Changes 5
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

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

app/assets/javascripts/merge_request_widget.js.es6
app/services/merge_requests/merge_service.rb 10 additions, 8 deletions

app/services/merge_requests/merge_service.rb
changelogs/unreleased/28124-mrs-don-t-show-all-merge-errors.yml 4 additions, 0 deletions

...logs/unreleased/28124-mrs-don-t-show-all-merge-errors.yml
spec/features/merge_requests/widget_spec.rb 15 additions, 0 deletions

spec/features/merge_requests/widget_spec.rb
spec/services/merge_requests/merge_service_spec.rb 20 additions, 9 deletions

spec/services/merge_requests/merge_service_spec.rb

with 50 additions and 18 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