diff options
author | Jason Lenny <jlenny@gitlab.com> | 2019-03-07 17:59:38 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-03-07 17:59:38 +0000 |
commit | 010f64fb4249211aae4e2bfe42ffb7b231b175e9 (patch) | |
tree | a1340c6839b17c0659eba55908fb8639690b4957 | |
parent | f469bb8e5c3e7114e35862822087a1479d042a12 (diff) | |
download | gitlab-ce-010f64fb4249211aae4e2bfe42ffb7b231b175e9.tar.gz |
Resolve "Project template for iOS"
-rw-r--r-- | app/assets/javascripts/projects/project_new.js | 4 | ||||
-rw-r--r-- | changelogs/unreleased/58648-project-template-for-ios.yml | 5 | ||||
-rw-r--r-- | lib/gitlab/project_template.rb | 1 | ||||
-rw-r--r-- | locale/gitlab.pot | 3 | ||||
-rw-r--r-- | spec/lib/gitlab/project_template_spec.rb | 1 | ||||
-rw-r--r-- | vendor/project_templates/iosswift.tar.gz | bin | 0 -> 2422200 bytes |
6 files changed, 14 insertions, 0 deletions
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 1ade1811033..796ecbccde7 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -125,6 +125,10 @@ const bindEvents = () => { text: 'Spring', icon: '.template-option .icon-spring', }, + iosswift: { + text: 'iOS (Swift)', + icon: '.template-option svg.icon-gitlab', + }, dotnetcore: { text: '.NET Core', icon: '.template-option .icon-dotnet', diff --git a/changelogs/unreleased/58648-project-template-for-ios.yml b/changelogs/unreleased/58648-project-template-for-ios.yml new file mode 100644 index 00000000000..708ecb4d3dc --- /dev/null +++ b/changelogs/unreleased/58648-project-template-for-ios.yml @@ -0,0 +1,5 @@ +--- +title: Add iOS project template +merge_request: 25872 +author: +type: changed diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 9b6ff602fcd..8a908291637 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,6 +28,7 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), 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('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 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('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a2baf2ad219..05d8ac1a8d0 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -321,6 +321,9 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" +msgid "A ready-to-go template for use with iOS Swift apps." +msgstr "" + msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" msgstr "" diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 115097e0d26..c9b93a84aef 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,6 +7,7 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), 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('iosswift', 'iOS (Swift)', 'A ready-to-go template for use with iOS Swift apps.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 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('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), diff --git a/vendor/project_templates/iosswift.tar.gz b/vendor/project_templates/iosswift.tar.gz Binary files differnew file mode 100644 index 00000000000..76f32a3a681 --- /dev/null +++ b/vendor/project_templates/iosswift.tar.gz |