Merge branch 'fix-milestones-with-slashes' into 'master'

Fix Error 500 when global milestones have slashes

* Closes #4226

* Closes https://github.com/gitlabhq/gitlabhq/issues/9921

See merge request !2182

3 files changed, 14 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 0f9ae1e3b52..168a6e391f4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,9 @@ v 8.4.0 (unreleased)
   - Implement new UI for group page
   - Add project permissions to all project API endpoints (Stan Hu)
 
+v 8.3.1 (unreleased)
+  - Fix Error 500 when global milestones have slashes (Stan Hu)
+
 v 8.3.0
   - Add CAS support (tduehr)
   - Bump rack-attack to 4.3.1 for security fix (Stan Hu)
diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb
index 8bfc79d88f8..af1d7562ebe 100644
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
@@ -16,7 +16,7 @@ class GlobalMilestone
   end
 
   def safe_title
-    @title.to_slug.to_s
+    @title.to_slug.normalize.to_s
   end
 
   def expired?
diff --git a/spec/models/global_milestone_spec.rb b/spec/models/global_milestone_spec.rb
index ba03e6aabd0..197c99cd007 100644
--- a/spec/models/global_milestone_spec.rb
+++ b/spec/models/global_milestone_spec.rb
@@ -62,4 +62,14 @@ describe GlobalMilestone, models: true do
       expect(@global_milestone.milestones.count).to eq(3)
     end
   end
+
+  describe :safe_title do
+    let(:milestone) { create(:milestone, title: "git / test", project: project1) }
+
+    it 'should strip out slashes and spaces' do
+      global_milestone = GlobalMilestone.new(milestone.title, [milestone])
+
+      expect(global_milestone.safe_title).to eq('git-test')
+    end
+  end
 end