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

17342953

Commit 17342953 authored 7 years ago by Mike Greiling

Downloads
- Plain Diff

Merge branch '34060-simplified-general-project-settings' into 'master'

34060 Simply general project settings to use expanded panels

Closes #34060

See merge request !12620

parents 017550d4 6ec561a2

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/dispatcher.js 2 additions, 0 deletions

app/assets/javascripts/dispatcher.js
app/assets/stylesheets/pages/projects.scss 0 additions, 1 deletion

app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/settings.scss 18 additions, 2 deletions

app/assets/stylesheets/pages/settings.scss
app/views/projects/_merge_request_settings.html.haml 1 addition, 6 deletions

app/views/projects/_merge_request_settings.html.haml
app/views/projects/edit.html.haml 218 additions, 213 deletions

app/views/projects/edit.html.haml
features/steps/project/project.rb 12 additions, 4 deletions

features/steps/project/project.rb
features/steps/shared/project.rb 1 addition, 1 deletion

features/steps/shared/project.rb
spec/features/projects/features_visibility_spec.rb 23 additions, 9 deletions

spec/features/projects/features_visibility_spec.rb
spec/features/projects/project_settings_spec.rb 6 additions, 2 deletions

spec/features/projects/project_settings_spec.rb
spec/features/projects/settings/merge_requests_settings_spec.rb 12 additions, 1 deletion

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

with 293 additions and 239 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