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

2a868635

There was a problem fetching the pipeline summary.

Commit 2a868635 authored 7 years ago by Fatih Acet

Downloads
- Plain Diff

Merge branch '32178-prevent-merge-on-sha-change' into 'master'

Add "SHA mismatch" state to the MR widget

Closes #32178

See merge request !11316

parents e012427c b6122aa9

2 merge requests!12073Add RC2 changes to 9-3-stable,!11316Add "SHA mismatch" state to the MR widget

Pipeline #

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js 16 additions, 0 deletions

...equest_widget/components/states/mr_widget_sha_mismatch.js
app/assets/javascripts/vue_merge_request_widget/dependencies.js 1 addition, 0 deletions

...sets/javascripts/vue_merge_request_widget/dependencies.js
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js 2 additions, 0 deletions

...javascripts/vue_merge_request_widget/mr_widget_options.js
app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js 2 additions, 0 deletions

...ascripts/vue_merge_request_widget/stores/get_state_key.js
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js 2 additions, 0 deletions

...cripts/vue_merge_request_widget/stores/mr_widget_store.js
app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js 1 addition, 0 deletions

...javascripts/vue_merge_request_widget/stores/state_maps.js
changelogs/unreleased/32178-prevent-merge-on-sha-change.yml 4 additions, 0 deletions

changelogs/unreleased/32178-prevent-merge-on-sha-change.yml
spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js 16 additions, 0 deletions

...r_widget/components/states/mr_widget_sha_mismatch_spec.js
spec/javascripts/vue_mr_widget/stores/get_state_key_spec.js 3 additions, 0 deletions

spec/javascripts/vue_mr_widget/stores/get_state_key_spec.js
spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js 22 additions, 0 deletions

.../javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

with 69 additions and 0 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