Download as
Browse Code »

Commit 9afd04842f6658dcd1dc02cda17247c321ff6a67

Authored by Marin Jankovski
1 parent 4dc09e5c
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Update Changelog

Showing 3 changed files with 4 additions and 3 deletions   Show diff stats
@@ -29,6 +29,7 @@ v 6.7.0 @@ -29,6 +29,7 @@ v 6.7.0
29 - Better API responses for access_levels (sponsored by O'Reilly Media) 29 - Better API responses for access_levels (sponsored by O'Reilly Media)
30 - Requires at least 2 unicorn workers 30 - Requires at least 2 unicorn workers
31 - Requires gitlab-shell v1.9+ 31 - Requires gitlab-shell v1.9+
  32 + - Replaced gemoji(due to closed licencing problem) with Phantom Open Emoji library(combined SIL Open Font License, MIT License and the CC 3.0 License)
32 33
33 v 6.6.5 34 v 6.6.5
34 - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard) 35 - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)
@@ -165,7 +165,7 @@ gem "modernizr", "2.6.2" @@ -165,7 +165,7 @@ gem "modernizr", "2.6.2"
165 gem "raphael-rails", "~> 2.1.2" 165 gem "raphael-rails", "~> 2.1.2"
166 gem 'bootstrap-sass', '~> 3.0' 166 gem 'bootstrap-sass', '~> 3.0'
167 gem "font-awesome-rails", '~> 3.2' 167 gem "font-awesome-rails", '~> 3.2'
168 -gem "gitlab_emoji", "~> 0.0.1" 168 +gem "gitlab_emoji", "~> 0.0.1.1"
169 gem "gon", '~> 5.0.0' 169 gem "gon", '~> 5.0.0'
170 gem 'nprogress-rails' 170 gem 'nprogress-rails'
171 171
@@ -191,7 +191,7 @@ GEM @@ -191,7 +191,7 @@ GEM
191 charlock_holmes (~> 0.6.6) 191 charlock_holmes (~> 0.6.6)
192 escape_utils (~> 0.2.4) 192 escape_utils (~> 0.2.4)
193 mime-types (~> 1.19) 193 mime-types (~> 1.19)
194 - gitlab_emoji (0.0.1) 194 + gitlab_emoji (0.0.1.1)
195 emoji (~> 1.0.1) 195 emoji (~> 1.0.1)
196 gitlab_git (5.7.1) 196 gitlab_git (5.7.1)
197 activesupport (~> 4.0.0) 197 activesupport (~> 4.0.0)
@@ -601,7 +601,7 @@ DEPENDENCIES @@ -601,7 +601,7 @@ DEPENDENCIES
601 gitlab-gollum-lib (~> 1.1.0) 601 gitlab-gollum-lib (~> 1.1.0)
602 gitlab-grack (~> 2.0.0.pre) 602 gitlab-grack (~> 2.0.0.pre)
603 gitlab-linguist (~> 3.0.0) 603 gitlab-linguist (~> 3.0.0)
604 - gitlab_emoji (~> 0.0.1) 604 + gitlab_emoji (~> 0.0.1.1)
605 gitlab_git (~> 5.7.1) 605 gitlab_git (~> 5.7.1)
606 gitlab_meta (= 6.0) 606 gitlab_meta (= 6.0)
607 gitlab_omniauth-ldap (= 1.0.4) 607 gitlab_omniauth-ldap (= 1.0.4)