Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Lenny <jlenny@gitlab.com>2019-02-15 11:43:32 +0300
committerJason Lenny <jlenny@gitlab.com>2019-02-27 15:03:37 +0300
commit2c8291352a5863ea8249cd0664aad356436873fb (patch)
tree0ce9d51eea19f04f52f6d91697caa1ed6e0c7f5b
parent9468698cd8f4c13385e0e7a8a932e4eef9b1cd51 (diff)
Remove dash from template name
-rw-r--r--app/assets/javascripts/projects/project_new.js4
-rw-r--r--lib/gitlab/project_template.rb2
-rw-r--r--spec/lib/gitlab/project_template_spec.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index 7659cc6a00b..af4f14347ac 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -121,9 +121,9 @@ const bindEvents = () => {
text: 'NodeJS Express',
icon: '.template-option .icon-express',
},
- ios-swift: {
+ iosswift: {
text: 'iOS (Swift)',
- icon: '.template-option svg.icon-ios-swift',
+ icon: '.template-option svg.icon-iosswift',
},
android: {
text: 'Android',
diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb
index 5275c812ce6..16611fc776a 100644
--- a/lib/gitlab/project_template.rb
+++ b/lib/gitlab/project_template.rb
@@ -30,7 +30,7 @@ module Gitlab
ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'),
ProjectTemplate.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore', 'illustrations/logos/dotnet.svg'),
ProjectTemplate.new('gomicro', 'Go Micro', _('Go Micro is a framework for micro service development.'), 'https://gitlab.com/gitlab-org/project-templates/go-micro'),
- ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'),
+ ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'),
ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'),
ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'),
ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'),
diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb
index ea18ec656f8..3dc40f34495 100644
--- a/spec/lib/gitlab/project_template_spec.rb
+++ b/spec/lib/gitlab/project_template_spec.rb
@@ -9,7 +9,7 @@ describe Gitlab::ProjectTemplate do
described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'),
described_class.new('dotnetcore', '.NET Core', 'A .NET Core console application template, customizable for any .NET Core project', 'https://gitlab.com/gitlab-org/project-templates/dotnetcore'),
described_class.new('gomicro', 'Go Micro', 'Go Micro is a framework for micro service development.', 'https://gitlab.com/gitlab-org/project-templates/go-micro'),
- described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'),
+ described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'),
described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'),
described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'),
described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'),