Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
EndMove committed Feb 9, 2022
2 parents ff992f7 + 47b361c commit 8c84a41
Show file tree
Hide file tree
Showing 7 changed files with 125 additions and 8 deletions.
115 changes: 114 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,114 @@
.idea

# Created by https://www.toptal.com/developers/gitignore/api/intellij
# Edit at https://www.toptal.com/developers/gitignore?templates=intellij

### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/

# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml

# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/

# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$

# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml

# End of https://www.toptal.com/developers/gitignore/api/intellij
4 changes: 4 additions & 0 deletions CONTROL/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version: 1.16.1.r01
- Update Gitea to 1.16.1, release notes (https://github.com/go-gitea/gitea/releases/tag/v1.16.1).
- |-> Security flaw fix (1) & major release bugs fix (17).

Version: 1.16.0.r01
- Update, installation script improvement.
- Gitea 1.16.0 major release notes (https://github.com/go-gitea/gitea/releases/tag/v1.16.0).
Expand Down
2 changes: 1 addition & 1 deletion CONTROL/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"general":{
"package":"gitea-docker",
"name":"Gitea",
"version":"1.16.0.r01",
"version":"1.16.1.r01",
"depends":[
"docker-ce(>=20.10.2.r2)"
],
Expand Down
4 changes: 2 additions & 2 deletions CONTROL/description-fr.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Gitea est une solution Opensource d'hébergement de code léger et rapide écrite en Go. Elle est publiée sous la licence MIT.
Version actuelle de Gitea : 1.16.0 - Fonctionne avec une connexion HTTPS.
Version actuelle de Gitea : 1.16.1 - Fonctionne avec une connexion HTTPS.

!!! NOUVEAU !!! : Supporte maintenant la migration de l'ancien iGi Gitea vers celui-ci.

Expand Down Expand Up @@ -47,4 +47,4 @@ N'hésitez pas à signaler tout problème ou à demander de l'aide en suivant ce

Mais pourquoi utiliser Gitea ?

Gitea est simple, rapide et puissant, c'est garder votre code sur VOTRE SERVEUR, pouvoir travailler avec votre équipe SANS CONNEXION INTERNET, avoir accès à une quantité infinie de dépôts privés sans jamais avoir à payer. Un rêve pour un développeur.
Gitea est simple, rapide et puissant, c'est garder votre code sur VOTRE SERVEUR, pouvoir travailler avec votre équipe SANS CONNEXION INTERNET, avoir accès à une quantité infinie de dépôts privés sans jamais avoir à payer. Un rêve pour un développeur.
4 changes: 2 additions & 2 deletions CONTROL/description.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Gitea is an Opensource solution for lightweight and fast code hosting written in Go. It is published under the MIT license.
Gitea current version: 1.16.0 - Work with an HTTPS connection.
Gitea current version: 1.16.1 - Work with an HTTPS connection.

!!! NEW !!! : Now supports the migration from the old iGi Gitea to this one.

Expand Down Expand Up @@ -47,4 +47,4 @@ Do not hesitate to report any problem or ask for help by following this link: ht

But why use Gitea?

Gitea is simple, fast and powerful, it's keeping your code on YOUR SERVER, being able to work with your team WITHOUT INTERNET CONNECTION, having access to an infinite amount of private repositories without ever having to pay. A dream for a dev.
Gitea is simple, fast and powerful, it's keeping your code on YOUR SERVER, being able to work with your team WITHOUT INTERNET CONNECTION, having access to an infinite amount of private repositories without ever having to pay. A dream for a dev.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gitea-adm

__Gitea version__: _`1.16.0`_
__Gitea version__: _`1.16.1`_

![GitHub license](https://img.shields.io/badge/license-GPL--3.0-%23fe7d37) ![GitHub last commit](https://img.shields.io/github/last-commit/EndMove/gitea-adm)

Expand Down
2 changes: 1 addition & 1 deletion gitea_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.0
1.16.1

0 comments on commit 8c84a41

Please sign in to comment.