Merge branch 'fix/profile-settings-content-width' into 'master'

Adjust content width for User Settings, GPG Keys See merge request gitlab-org/gitlab-ce!16093

Merge branch 'fix/profile-settings-content-width' into 'master'
ff077cf7 · Robert Speicher · 1b447b16 · d0156ec0 · ff077cf7 · ff077cf7
Commit ff077cf7 authored Dec 29, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

index.html.haml app/views/profiles/gpg_keys/index.html.haml +1 -0

fix-profile-settings-content-width.yml changelogs/unreleased/fix-profile-settings-content-width.yml +5 -0

No files found.
--- a/app/views/profiles/gpg_keys/index.html.haml
+++ b/app/views/profiles/gpg_keys/index.html.haml
 - page_title "GPG Keys"
+- @content_class = "limit-container-width" unless fluid_layout
 = render 'profiles/head'

 .row.prepend-top-default

--- a/changelogs/unreleased/fix-profile-settings-content-width.yml
+++ b/changelogs/unreleased/fix-profile-settings-content-width.yml
+---
+title: Adjust content width for User Settings, GPG Keys
+merge_request: 16093
+author: George Tsiolis
+type: fixed