Commit 4c87d98f authored by Robert Speicher's avatar Robert Speicher

Merge branch 'update-templates' into 'master'

Update templates.

See merge request !6163
parents c87235a2 0c364695
...@@ -3,5 +3,4 @@ build/ ...@@ -3,5 +3,4 @@ build/
nbbuild/ nbbuild/
dist/ dist/
nbdist/ nbdist/
nbactions.xml
.nb-gradle/ .nb-gradle/
...@@ -9,6 +9,7 @@ gtags.files ...@@ -9,6 +9,7 @@ gtags.files
GTAGS GTAGS
GRTAGS GRTAGS
GPATH GPATH
GSYMS
cscope.files cscope.files
cscope.out cscope.out
cscope.in.out cscope.in.out
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
.LSOverride .LSOverride
# Icon must end with two \r # Icon must end with two \r
Icon Icon
# Thumbnails # Thumbnails
._* ._*
......
...@@ -17,3 +17,4 @@ cabal.sandbox.config ...@@ -17,3 +17,4 @@ cabal.sandbox.config
*.eventlog *.eventlog
.stack-work/ .stack-work/
cabal.project.local cabal.project.local
.HTF/
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini /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.ini
/administrator/language/en-GB/en-GB.plg_content_finder.sys.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.ini
/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini /administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
/administrator/language/en-GB/en-GB.plg_finder_contacts.ini /administrator/language/en-GB/en-GB.plg_finder_contacts.ini
...@@ -64,6 +65,10 @@ ...@@ -64,6 +65,10 @@
/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini /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.ini
/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.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.ini
/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini /administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini /administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
...@@ -72,6 +77,8 @@ ...@@ -72,6 +77,8 @@
/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini /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.ini
/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.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.ini
/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini /administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini /administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
...@@ -249,8 +256,10 @@ ...@@ -249,8 +256,10 @@
/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
/administrator/language/en-GB/en-GB.xml /administrator/language/en-GB/en-GB.xml
/administrator/language/en-GB/index.html /administrator/language/en-GB/index.html
/administrator/language/ru-RU/index.html
/administrator/language/overrides/* /administrator/language/overrides/*
/administrator/language/index.html /administrator/language/index.html
/administrator/logs/index.html
/administrator/manifests/* /administrator/manifests/*
/administrator/modules/mod_custom/* /administrator/modules/mod_custom/*
/administrator/modules/mod_feed/* /administrator/modules/mod_feed/*
...@@ -289,6 +298,7 @@ ...@@ -289,6 +298,7 @@
/components/com_finder/* /components/com_finder/*
/components/com_mailto/* /components/com_mailto/*
/components/com_media/* /components/com_media/*
/components/com_modules/*
/components/com_newsfeeds/* /components/com_newsfeeds/*
/components/com_search/* /components/com_search/*
/components/com_users/* /components/com_users/*
...@@ -407,6 +417,7 @@ ...@@ -407,6 +417,7 @@
/libraries/idna_convert/* /libraries/idna_convert/*
/libraries/joomla/* /libraries/joomla/*
/libraries/legacy/* /libraries/legacy/*
/libraries/php-encryption/*
/libraries/phpass/* /libraries/phpass/*
/libraries/phpmailer/* /libraries/phpmailer/*
/libraries/phputf8/* /libraries/phputf8/*
...@@ -431,9 +442,11 @@ ...@@ -431,9 +442,11 @@
/media/media/* /media/media/*
/media/mod_languages/* /media/mod_languages/*
/media/overrider/* /media/overrider/*
/media/plg_captcha_recaptcha/*
/media/plg_quickicon_extensionupdate/* /media/plg_quickicon_extensionupdate/*
/media/plg_quickicon_joomlaupdate/* /media/plg_quickicon_joomlaupdate/*
/media/plg_system_highlight/* /media/plg_system_highlight/*
/media/plg_system_stats/*
/media/system/* /media/system/*
/media/index.html /media/index.html
/modules/mod_articles_archive/* /modules/mod_articles_archive/*
...@@ -486,6 +499,7 @@ ...@@ -486,6 +499,7 @@
/plugins/editors/none/* /plugins/editors/none/*
/plugins/editors/tinymce/* /plugins/editors/tinymce/*
/plugins/editors/index.html /plugins/editors/index.html
/plugins/editors-xtd/module/*
/plugins/editors-xtd/article/* /plugins/editors-xtd/article/*
/plugins/editors-xtd/image/* /plugins/editors-xtd/image/*
/plugins/editors-xtd/pagebreak/* /plugins/editors-xtd/pagebreak/*
...@@ -523,6 +537,8 @@ ...@@ -523,6 +537,8 @@
/plugins/system/redirect/* /plugins/system/redirect/*
/plugins/system/remember/* /plugins/system/remember/*
/plugins/system/sef/* /plugins/system/sef/*
/plugins/system/stats/*
/plugins/system/updatenotification/*
/plugins/system/index.html /plugins/system/index.html
/plugins/twofactorauth/* /plugins/twofactorauth/*
/plugins/user/contactcreator/* /plugins/user/contactcreator/*
......
...@@ -34,5 +34,8 @@ jspm_packages ...@@ -34,5 +34,8 @@ jspm_packages
# Optional npm cache directory # Optional npm cache directory
.npm .npm
# Optional eslint cache
.eslintcache
# Optional REPL history # Optional REPL history
.node_repl_history .node_repl_history
...@@ -50,7 +50,9 @@ Carthage/Build ...@@ -50,7 +50,9 @@ Carthage/Build
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md # https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
fastlane/report.xml fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots fastlane/screenshots
fastlane/test_output
# Code Injection # Code Injection
# #
......
...@@ -79,6 +79,7 @@ celerybeat-schedule ...@@ -79,6 +79,7 @@ celerybeat-schedule
.env .env
# virtualenv # virtualenv
.venv/
venv/ venv/
ENV/ ENV/
......
...@@ -12,9 +12,11 @@ capybara-*.html ...@@ -12,9 +12,11 @@ capybara-*.html
rerun.txt rerun.txt
pickle-email-*.html pickle-email-*.html
# TODO Comment out these rules if you are OK with secrets being uploaded to the repo # TODO Comment out this rule if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb 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 # dotenv
# TODO Comment out this rule if environment variables can be committed # TODO Comment out this rule if environment variables can be committed
......
...@@ -251,3 +251,10 @@ paket-files/ ...@@ -251,3 +251,10 @@ paket-files/
# JetBrains Rider # JetBrains Rider
.idea/ .idea/
*.sln.iml *.sln.iml
# CodeRush
.cr/
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Official docker image. # Official docker image.
image: docker:latest image: docker:latest
services:
- docker:dind
build: build:
stage: build stage: build
script: 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"
...@@ -43,3 +43,12 @@ rails: ...@@ -43,3 +43,12 @@ rails:
- bundle exec rake db:migrate - bundle exec rake db:migrate
- bundle exec rake db:seed - bundle exec rake db:seed
- bundle exec rake test - 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
# 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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment