diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 13:14:03 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-27 13:14:03 +0200 |
| commit | b2cab1c52ad32166c49903d00f25c305aa225ddb (patch) | |
| tree | 5d20eaac9fa2a98a028e13706b96129025b8f2d7 | |
| parent | 981deddfcee1cf01efcf257dad9dae79ab05ca67 (diff) | |
| parent | 4713fc34cf93b2d90a84c735e168a65df83bb4e1 (diff) | |
| download | gitlab-ce-b2cab1c52ad32166c49903d00f25c305aa225ddb.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index c74175afd11..594ddf3f1ce 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -27,7 +27,7 @@ v 6.6.0 - Remove snippet expiration - Mobile UI improvements (Drew Blessing) - Fix block/remove UI for admin::users#show page - - Show users' group membership on users' activity page + - Show users' group membership on users' activity page (Robert Djurasaj) - User pages are visible without login if user is authorized to a public project - Markdown rendered headers have id derived from their name and link to their id - Improve application to work faster with large groups (100+ members) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7fdbd5907b0..33466714681 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -70,7 +70,7 @@ @import "sections/groups.scss"; /** - * Code ighlight + * Code highlight */ @import "highlight/white.scss"; @import "highlight/dark.scss"; |