Download as
Browse Code »

Commit b2cab1c52ad32166c49903d00f25c305aa225ddb

Authored by Dmitriy Zaporozhets
2 parents 981deddf 4713fc34
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
@@ -27,7 +27,7 @@ v 6.6.0 @@ -27,7 +27,7 @@ v 6.6.0
27 - Remove snippet expiration 27 - Remove snippet expiration
28 - Mobile UI improvements (Drew Blessing) 28 - Mobile UI improvements (Drew Blessing)
29 - Fix block/remove UI for admin::users#show page 29 - Fix block/remove UI for admin::users#show page
30 - - Show users' group membership on users' activity page 30 + - Show users' group membership on users' activity page (Robert Djurasaj)
31 - User pages are visible without login if user is authorized to a public project 31 - User pages are visible without login if user is authorized to a public project
32 - Markdown rendered headers have id derived from their name and link to their id 32 - Markdown rendered headers have id derived from their name and link to their id
33 - Improve application to work faster with large groups (100+ members) 33 - Improve application to work faster with large groups (100+ members)
app/assets/stylesheets/application.scss
  Diff comments   View file @b2cab1c
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 @import "sections/groups.scss"; 70 @import "sections/groups.scss";
71 71
72 /** 72 /**
73 - * Code ighlight 73 + * Code highlight
74 */ 74 */
75 @import "highlight/white.scss"; 75 @import "highlight/white.scss";
76 @import "highlight/dark.scss"; 76 @import "highlight/dark.scss";