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
2017-12-29 23:53:41 +00:00 · 2017-12-29 23:53:41 +00:00 · ff077cf7dc
parent 1b447b1642 d0156ec0a5
commit ff077cf7dc
2 changed files with 6 additions and 0 deletions
--- a/app/views/profiles/gpg_keys/index.html.haml
+++ b/app/views/profiles/gpg_keys/index.html.haml
@ -1,4 +1,5 @@
 - 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
@ -0,0 +1,5 @@
+---
+title: Adjust content width for User Settings, GPG Keys
+merge_request: 16093
+author: George Tsiolis
+type: fixed