summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-03-16 05:24:13 -0400
committerUnknown <joe2010xtmf@163.com>2014-03-16 05:24:13 -0400
commitab747f279088c9ed6114c4227c71173ebd1e6f00 (patch)
tree941c225f2aed7933e063e8fb25e98ed6f7b78d50 /conf
parent8de9517862acd77c27da015654fc236a6722d188 (diff)
downloadgitea-ab747f279088c9ed6114c4227c71173ebd1e6f00.tar.gz
gitea-ab747f279088c9ed6114c4227c71173ebd1e6f00.zip
Fix delete SSH key in file
Diffstat (limited to 'conf')
-rw-r--r--conf/app.ini4
-rw-r--r--conf/gitignore/Ruby18
-rw-r--r--conf/license/MIT License21
3 files changed, 41 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini
index 3e5a126f89..f8ff81db74 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -3,8 +3,8 @@ RUN_USER = lunny
[repository]
ROOT = /Users/%(RUN_USER)s/git/gogs-repositories
-LANG_IGNS=Google Go|C|Python
-LICENSES=Apache v2 License|GPL v2|BSD (3-Clause) License
+LANG_IGNS=Google Go|C|Python|Ruby
+LICENSES=Apache v2 License|GPL v2|MIT License|BSD (3-Clause) License
[server]
HTTP_ADDR =
diff --git a/conf/gitignore/Ruby b/conf/gitignore/Ruby
new file mode 100644
index 0000000000..eb76b24855
--- /dev/null
+++ b/conf/gitignore/Ruby
@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/ \ No newline at end of file
diff --git a/conf/license/MIT License b/conf/license/MIT License
new file mode 100644
index 0000000000..be1d1ae048
--- /dev/null
+++ b/conf/license/MIT License
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE. \ No newline at end of file