summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-12-29 23:53:41 +0000
committerRobert Speicher <robert@gitlab.com>2017-12-29 23:53:41 +0000
commitff077cf7dc5cfd7c6c6206d801ea3f326f7af1aa (patch)
tree6f453d02767c0b1ccdaa561920ba9734d55b81c3
parent1b447b1642b4a1b91e595d319d7d90f2b43515ef (diff)
parentd0156ec0a51ab87dd07589f8db864d1878bffbd6 (diff)
downloadgitlab-ce-ff077cf7dc5cfd7c6c6206d801ea3f326f7af1aa.tar.gz
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
-rw-r--r--app/views/profiles/gpg_keys/index.html.haml1
-rw-r--r--changelogs/unreleased/fix-profile-settings-content-width.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/views/profiles/gpg_keys/index.html.haml b/app/views/profiles/gpg_keys/index.html.haml
index 8dbb8aef31b..86ebec0179c 100644
--- 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
diff --git a/changelogs/unreleased/fix-profile-settings-content-width.yml b/changelogs/unreleased/fix-profile-settings-content-width.yml
new file mode 100644
index 00000000000..bf164dc587d
--- /dev/null
+++ 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