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

Dmitriy Zaporozhets
2 parents 981deddf 4713fc34
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
CHANGELOG
app/assets/stylesheets/application.scss
@@ -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)
@@ -70,7 +70,7 @@
 @import "sections/groups.scss";
  
 /**
- * Code ighlight
+ * Code highlight
  */
 @import "highlight/white.scss";
 @import "highlight/dark.scss";
...	...	@@ -27,7 +27,7 @@ v 6.6.0
27	27	- Remove snippet expiration
28	28	- Mobile UI improvements (Drew Blessing)
29	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	31	- User pages are visible without login if user is authorized to a public project
32	32	- Markdown rendered headers have id derived from their name and link to their id
33	33	- Improve application to work faster with large groups (100+ members)
...	...
...	...	@@ -70,7 +70,7 @@
70	70	@import "sections/groups.scss";
71	71
72	72	/**
73		- * Code ighlight
	73	+ * Code highlight
74	74	*/
75	75	@import "highlight/white.scss";
76	76	@import "highlight/dark.scss";
...	...