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

a8e4f3ed

Commit a8e4f3ed authored 12 years ago by Valery Sizov

Downloads
- Patches
- Plain Diff

Auto-merge: 'already can not be merged' alert

parent 8269a3a7

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/merge_requests.js 7 additions, 1 deletion

app/assets/javascripts/merge_requests.js
app/controllers/merge_requests_controller.rb 6 additions, 2 deletions

app/controllers/merge_requests_controller.rb
app/views/merge_requests/automerge.js.haml 7 additions, 2 deletions

app/views/merge_requests/automerge.js.haml
app/views/merge_requests/show.html.haml 5 additions, 0 deletions

app/views/merge_requests/show.html.haml

with 25 additions and 5 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