From ad381c5d0b90ff2962a63dd2281d3c41c14dadf3 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 7 Mar 2019 14:48:03 +0100 Subject: Add Android template --- app/assets/javascripts/projects/project_new.js | 4 ++++ .../unreleased/58649-project-template-for-android.yml | 5 +++++ lib/gitlab/project_template.rb | 1 + locale/gitlab.pot | 3 +++ spec/lib/gitlab/project_template_spec.rb | 1 + vendor/project_templates/android.tar.gz | Bin 0 -> 132152 bytes 6 files changed, 14 insertions(+) create mode 100644 changelogs/unreleased/58649-project-template-for-android.yml create mode 100644 vendor/project_templates/android.tar.gz diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 1ade1811033..2385e66ea69 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -129,6 +129,10 @@ const bindEvents = () => { text: '.NET Core', icon: '.template-option .icon-dotnet', }, + android: { + text: 'Android', + icon: '.template-option svg.icon-android', + }, gomicro: { text: 'Go Micro', icon: '.template-option .icon-gomicro', diff --git a/changelogs/unreleased/58649-project-template-for-android.yml b/changelogs/unreleased/58649-project-template-for-android.yml new file mode 100644 index 00000000000..130992272ec --- /dev/null +++ b/changelogs/unreleased/58649-project-template-for-android.yml @@ -0,0 +1,5 @@ +--- +title: Add project template for Android +merge_request: 25870 +author: +type: changed diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 9b6ff602fcd..9fa956bbd12 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -29,6 +29,7 @@ module Gitlab 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('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('android', 'Android', _('A ready-to-go template for use with Android apps.'), 'https://gitlab.com/gitlab-org/project-templates/android', 'illustrations/logos/android.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'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), diff --git a/locale/gitlab.pot b/locale/gitlab.pot index cfab870ce24..df449eb5d61 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 Android 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..f2de1c367d8 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -8,6 +8,7 @@ describe Gitlab::ProjectTemplate do 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('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('android', 'Android', 'A ready-to-go template for use with Android apps.', 'https://gitlab.com/gitlab-org/project-templates/android'), 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'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz new file mode 100644 index 00000000000..3df17a0d9a6 Binary files /dev/null and b/vendor/project_templates/android.tar.gz differ -- cgit v1.2.1