summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-08-06 10:36:40 -0700
committerUnknwon <u@gogs.io>2016-08-06 10:36:40 -0700
commit72dd299ca0e0b018b786a7f2668e6161ac411fa6 (patch)
treef133f45886a34e33daa6a07dc4581a4e7cdd31c9
parent30fda0f1aecbb45b0abc67e0fb9fdb806a52cb8c (diff)
downloadgitea-72dd299ca0e0b018b786a7f2668e6161ac411fa6.tar.gz
gitea-72dd299ca0e0b018b786a7f2668e6161ac411fa6.zip
Update .gitattributes
-rw-r--r--.gitattributes11
-rw-r--r--public/config.codekit11
-rw-r--r--public/js/libs/jquery.are-you-sure.js (renamed from public/js/jquery.are-you-sure.js)0
-rw-r--r--templates/base/head.tmpl2
4 files changed, 11 insertions, 13 deletions
diff --git a/.gitattributes b/.gitattributes
index e653d5b4b7..09dfc210fc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,11 @@
+public/conf/gitignore/* linguist-vendored
+public/conf/license/* linguist-vendored
public/assets/* linguist-vendored
-public/plugins/* linguist-vendored \ No newline at end of file
+public/plugins/* linguist-vendored
+public/plugins/* linguist-vendored
+public/css/themes/* linguist-vendored
+public/css/github.min.css linguist-vendored
+public/css/semantic-2.2.1.min.css linguist-vendored
+public/js/libs/* linguist-vendored
+public/js/jquery-1.11.3.min.js linguist-vendored
+public/js/semantic-2.2.1.min.js linguist-vendored \ No newline at end of file
diff --git a/public/config.codekit b/public/config.codekit
index a0a1792e58..5faa5569f1 100644
--- a/public/config.codekit
+++ b/public/config.codekit
@@ -150,17 +150,6 @@
"outputStyle": 1,
"syntaxCheckerStyle": 1
},
- "\/js\/jquery.are-you-sure.js": {
- "fileType": 64,
- "ignore": 1,
- "ignoreWasSetByUser": 1,
- "inputAbbreviatedPath": "\/js\/jquery.are-you-sure.js",
- "outputAbbreviatedPath": "\/js\/min\/jquery.are-you-sure-min.js",
- "outputPathIsOutsideProject": 0,
- "outputPathIsSetByUser": 0,
- "outputStyle": 1,
- "syntaxCheckerStyle": 1
- },
"\/js\/semantic-2.2.1.min.js": {
"fileType": 64,
"ignore": 1,
diff --git a/public/js/jquery.are-you-sure.js b/public/js/libs/jquery.are-you-sure.js
index 3c41e2fccb..3c41e2fccb 100644
--- a/public/js/jquery.are-you-sure.js
+++ b/public/js/libs/jquery.are-you-sure.js
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 5e11e9010c..ea7b7cc1df 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -17,7 +17,7 @@
<link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />
<script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script>
- <script src="{{AppSubUrl}}/js/jquery.are-you-sure.js"></script>
+ <script src="{{AppSubUrl}}/js/libs/jquery.are-you-sure.js"></script>
<link rel="stylesheet" href="{{AppSubUrl}}/assets/font-awesome-4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="{{AppSubUrl}}/assets/octicons-4.3.0/octicons.min.css">