Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
4c87d98f
Commit
4c87d98f
authored
Sep 12, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'update-templates' into 'master'
Update templates. See merge request !6163
parents
c87235a2
0c364695
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
82 additions
and
5 deletions
+82
-5
vendor/gitignore/Global/NetBeans.gitignore
vendor/gitignore/Global/NetBeans.gitignore
+0
-1
vendor/gitignore/Global/Tags.gitignore
vendor/gitignore/Global/Tags.gitignore
+1
-0
vendor/gitignore/Global/macOS.gitignore
vendor/gitignore/Global/macOS.gitignore
+2
-1
vendor/gitignore/Haskell.gitignore
vendor/gitignore/Haskell.gitignore
+1
-0
vendor/gitignore/Joomla.gitignore
vendor/gitignore/Joomla.gitignore
+16
-0
vendor/gitignore/Node.gitignore
vendor/gitignore/Node.gitignore
+3
-0
vendor/gitignore/Objective-C.gitignore
vendor/gitignore/Objective-C.gitignore
+2
-0
vendor/gitignore/Python.gitignore
vendor/gitignore/Python.gitignore
+1
-0
vendor/gitignore/Rails.gitignore
vendor/gitignore/Rails.gitignore
+4
-2
vendor/gitignore/VisualStudio.gitignore
vendor/gitignore/VisualStudio.gitignore
+7
-0
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
+6
-1
vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml
vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml
+9
-0
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
+30
-0
No files found.
vendor/gitignore/Global/NetBeans.gitignore
View file @
4c87d98f
...
...
@@ -3,5 +3,4 @@ build/
nbbuild/
dist/
nbdist/
nbactions.xml
.nb-gradle/
vendor/gitignore/Global/Tags.gitignore
View file @
4c87d98f
...
...
@@ -9,6 +9,7 @@ gtags.files
GTAGS
GRTAGS
GPATH
GSYMS
cscope.files
cscope.out
cscope.in.out
...
...
vendor/gitignore/Global/
OSX
.gitignore
→
vendor/gitignore/Global/
macOS
.gitignore
View file @
4c87d98f
...
...
@@ -3,7 +3,8 @@
.LSOverride
# Icon must end with two \r
Icon
Icon
# Thumbnails
._*
...
...
vendor/gitignore/Haskell.gitignore
View file @
4c87d98f
...
...
@@ -17,3 +17,4 @@ cabal.sandbox.config
*.eventlog
.stack-work/
cabal.project.local
.HTF/
vendor/gitignore/Joomla.gitignore
View file @
4c87d98f
...
...
@@ -52,6 +52,7 @@
/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
/administrator/language/en-GB/en-GB.plg_content_finder.ini
/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
/administrator/language/en-GB/en-GB.plg_editors-xtd_module*
/administrator/language/en-GB/en-GB.plg_finder_categories.ini
/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
...
...
@@ -64,6 +65,10 @@
/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
/administrator/language/en-GB/en-GB.plg_installer_folderinstaller*
/administrator/language/en-GB/en-GB.plg_installer_packageinstaller*
/administrator/language/en-GB/en-GB.plg_installer_packageinstaller
/administrator/language/en-GB/en-GB.plg_installer_urlinstaller*
/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
...
...
@@ -72,6 +77,8 @@
/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
/administrator/language/en-GB/en-GB.plg_system_stats*
/administrator/language/en-GB/en-GB.plg_system_updatenotification*
/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
...
...
@@ -249,8 +256,10 @@
/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
/administrator/language/en-GB/en-GB.xml
/administrator/language/en-GB/index.html
/administrator/language/ru-RU/index.html
/administrator/language/overrides/*
/administrator/language/index.html
/administrator/logs/index.html
/administrator/manifests/*
/administrator/modules/mod_custom/*
/administrator/modules/mod_feed/*
...
...
@@ -289,6 +298,7 @@
/components/com_finder/*
/components/com_mailto/*
/components/com_media/*
/components/com_modules/*
/components/com_newsfeeds/*
/components/com_search/*
/components/com_users/*
...
...
@@ -407,6 +417,7 @@
/libraries/idna_convert/*
/libraries/joomla/*
/libraries/legacy/*
/libraries/php-encryption/*
/libraries/phpass/*
/libraries/phpmailer/*
/libraries/phputf8/*
...
...
@@ -431,9 +442,11 @@
/media/media/*
/media/mod_languages/*
/media/overrider/*
/media/plg_captcha_recaptcha/*
/media/plg_quickicon_extensionupdate/*
/media/plg_quickicon_joomlaupdate/*
/media/plg_system_highlight/*
/media/plg_system_stats/*
/media/system/*
/media/index.html
/modules/mod_articles_archive/*
...
...
@@ -486,6 +499,7 @@
/plugins/editors/none/*
/plugins/editors/tinymce/*
/plugins/editors/index.html
/plugins/editors-xtd/module/*
/plugins/editors-xtd/article/*
/plugins/editors-xtd/image/*
/plugins/editors-xtd/pagebreak/*
...
...
@@ -523,6 +537,8 @@
/plugins/system/redirect/*
/plugins/system/remember/*
/plugins/system/sef/*
/plugins/system/stats/*
/plugins/system/updatenotification/*
/plugins/system/index.html
/plugins/twofactorauth/*
/plugins/user/contactcreator/*
...
...
vendor/gitignore/Node.gitignore
View file @
4c87d98f
...
...
@@ -34,5 +34,8 @@ jspm_packages
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Optional REPL history
.node_repl_history
vendor/gitignore/Objective-C.gitignore
View file @
4c87d98f
...
...
@@ -50,7 +50,9 @@ Carthage/Build
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
# Code Injection
#
...
...
vendor/gitignore/Python.gitignore
View file @
4c87d98f
...
...
@@ -79,6 +79,7 @@ celerybeat-schedule
.env
# virtualenv
.venv/
venv/
ENV/
...
...
vendor/gitignore/Rails.gitignore
View file @
4c87d98f
...
...
@@ -12,9 +12,11 @@ capybara-*.html
rerun.txt
pickle-email-*.html
# TODO Comment out th
ese rules
if you are OK with secrets being uploaded to the repo
# TODO Comment out th
is rule
if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb
config/secrets.yml
# Only include if you have production secrets in this file, which is no longer a Rails default
# config/secrets.yml
# dotenv
# TODO Comment out this rule if environment variables can be committed
...
...
vendor/gitignore/VisualStudio.gitignore
View file @
4c87d98f
...
...
@@ -251,3 +251,10 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml
# CodeRush
.cr/
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
View file @
4c87d98f
# Official docker image.
image
:
docker:latest
services
:
-
docker:dind
build
:
stage
:
build
script
:
-
docker build -t test .
-
docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
-
docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" .
-
docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME"
vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml
View file @
4c87d98f
...
...
@@ -43,3 +43,12 @@ rails:
-
bundle exec rake db:migrate
-
bundle exec rake db:seed
-
bundle exec rake test
# This deploy job uses a simple deploy flow to Heroku, other providers, e.g. AWS Elastic Beanstalk
# are supported too: https://github.com/travis-ci/dpl
deploy
:
type
:
deploy
environment
:
production
script
:
-
gem install dpl
-
dpl --provider=heroku --app=$HEROKU_APP_NAME --api-key=$HEROKU_PRODUCTION_KEY
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
0 → 100644
View file @
4c87d98f
# Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/
# This file assumes an own GitLab CI runner, setup on an OS X system.
stages
:
-
build
-
archive
build_project
:
stage
:
build
script
:
-
xcodebuild clean -project ProjectName.xcodeproj -scheme SchemeName | xcpretty
-
xcodebuild test -project ProjectName.xcodeproj -scheme SchemeName -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.2' | xcpretty -s
tags
:
-
ios_9-2
-
xcode_7-2
-
osx_10-11
archive_project
:
stage
:
archive
script
:
-
xcodebuild clean archive -archivePath build/ProjectName -scheme SchemeName
-
xcodebuild -exportArchive -exportFormat ipa -archivePath "build/ProjectName.xcarchive" -exportPath "build/ProjectName.ipa" -exportProvisioningProfile "ProvisioningProfileName"
only
:
-
master
artifacts
:
paths
:
-
build/ProjectName.ipa
tags
:
-
ios_9-2
-
xcode_7-2
-
osx_10-11
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment