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

30daf78d

Commit 30daf78d authored 8 years ago by Sean McGivern

Downloads
- Plain Diff

Merge branch '25171-fix-mr-features-settings-hidden-when-builds-are-disabled' into 'master'

Remove wrong '.builds-feature' class from the MR settings fieldset

Closes #25171

See merge request !7930

parents ecc3f315 9cc19d9b

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/views/projects/_merge_request_merge_settings.html.haml 15 additions, 0 deletions

app/views/projects/_merge_request_merge_settings.html.haml
app/views/projects/_merge_request_settings.html.haml 8 additions, 18 deletions

app/views/projects/_merge_request_settings.html.haml
app/views/projects/edit.html.haml 2 additions, 1 deletion

app/views/projects/edit.html.haml
changelogs/unreleased/25171-fix-mr-features-settings-hidden-when-builds-are-disabled.yml 4 additions, 0 deletions

...-mr-features-settings-hidden-when-builds-are-disabled.yml
spec/features/projects/settings/merge_requests_settings_spec.rb 70 additions, 0 deletions

...eatures/projects/settings/merge_requests_settings_spec.rb

with 99 additions and 19 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