diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-23 16:52:43 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-23 16:52:43 -0500 |
| commit | af978cd5bcf54bece70a8bf2634172bb8133cc67 (patch) | |
| tree | 0c2a1bca300acc5d1afd010815bafe02bd45e1d9 /app/views/profiles/show.html.haml | |
| parent | 0701b70c9c47e90a96100cefe5b93ec5954f9ec1 (diff) | |
| parent | 9f80118e05e68743d95a83742a1d0a06bba3039c (diff) | |
| download | gitlab-ce-af978cd5bcf54bece70a8bf2634172bb8133cc67.tar.gz | |
Merge branch 'master' into avatar-cropping
Diffstat (limited to 'app/views/profiles/show.html.haml')
| -rw-r--r-- | app/views/profiles/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 04f738c2759..64c4bdceff9 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -1,4 +1,4 @@ -.gray-content-block.top-block +.alert.alert-help.prepend-top-default This information will appear on your profile. - if current_user.ldap_user? Some options are unavailable for LDAP accounts |