Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CaptainJD
Poetry-appreciation-and-communication-platform
提交
c360cf3b
Poetry-appreciation-and-communication-platform
项目概览
CaptainJD
/
Poetry-appreciation-and-communication-platform
与 Fork 源项目一致
从无法访问的项目Fork
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Poetry-appreciation-and-communication-platform
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
c360cf3b
编写于
9月 07, 2020
作者:
T
ToBeADevOps
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge remote-tracking branch 'origin/master' into master
# Conflicts: # Jenkinsfile
上级
0841479e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
29 deletion
+49
-29
.idea/workspace.xml
.idea/workspace.xml
+46
-29
Jenkinsfile
Jenkinsfile
+3
-0
未找到文件。
.idea/workspace.xml
浏览文件 @
c360cf3b
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"b607d0ec-6b80-4527-85ad-7c1c544feb41"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/static/css/blog.css"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/static/css/cover.css"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/templates/blog.html"
afterDir=
"false"
/>
<list
default=
"true"
id=
"b607d0ec-6b80-4527-85ad-7c1c544feb41"
name=
"Default Changelist"
comment=
"Merge remote-tracking branch 'origin/master' into master # Conflicts: #	Jenkinsfile"
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Poetry_AE/urls.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Poetry_AE/urls.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Poetry_AE/views.py"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Poetry_AE/views.py"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/templates/index.html"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/templates/index.html"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/templates/sign_in.html"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/templates/sign_in.html"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/templates/sign_up.html"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/templates/sign_up.html"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/Jenkinsfile"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/Jenkinsfile"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -50,11 +43,20 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/templates/blog.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"480"
>
<caret
line=
"37"
column=
"57"
lean-forward=
"true"
selection-start-line=
"37"
selection-start-column=
"57"
selection-end-line=
"37"
selection-end-column=
"57"
/>
<state
relative-caret-position=
"960"
>
<caret
line=
"32"
column=
"55"
selection-start-line=
"32"
selection-start-column=
"55"
selection-end-line=
"32"
selection-end-column=
"55"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/Jenkinsfile"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"270"
>
<caret
line=
"9"
column=
"9"
lean-forward=
"true"
selection-start-line=
"9"
selection-start-column=
"9"
selection-end-line=
"9"
selection-end-column=
"9"
/>
</state>
</provider>
</entry>
...
...
@@ -86,6 +88,7 @@
</findStrings>
</component>
<component
name=
"Git.Settings"
>
<option
name=
"UPDATE_TYPE"
value=
"MERGE"
/>
<option
name=
"RECENT_GIT_ROOT_PATH"
value=
"$PROJECT_DIR$"
/>
</component>
<component
name=
"IdeDocumentHistory"
>
...
...
@@ -121,6 +124,7 @@
<option
value=
"$PROJECT_DIR$/templates/index.html"
/>
<option
value=
"$PROJECT_DIR$/static/css/bootstrap.css"
/>
<option
value=
"$PROJECT_DIR$/templates/blog.html"
/>
<option
value=
"$PROJECT_DIR$/Jenkinsfile"
/>
</list>
</option>
</component>
...
...
@@ -228,15 +232,15 @@
<property
name=
"list.type.of.created.stylesheet"
value=
"CSS"
/>
<property
name=
"nodejs_interpreter_path.stuck_in_default_project"
value=
"undefined stuck path"
/>
<property
name=
"nodejs_npm_path_reset_for_default_project"
value=
"true"
/>
<property
name=
"settings.editor.selected.configurable"
value=
"
editor.preferences.fonts.defaul
t"
/>
<property
name=
"settings.editor.selected.configurable"
value=
"
vcs.Gi
t"
/>
</component>
<component
name=
"RecentsManager"
>
<key
name=
"MoveFile.RECENT_KEYS"
>
<key
name=
"CopyFile.RECENT_KEYS"
>
<recent
name=
"C:\Users\hell\Desktop\Github\Poetry-appreciation-and-communication-platform\static"
/>
<recent
name=
"C:\Users\hell\Desktop\Github\Poetry-appreciation-and-communication-platform\static\css"
/>
<recent
name=
"C:\Users\hell\Desktop\Github\Poetry-appreciation-and-communication-platform\templates"
/>
</key>
<key
name=
"CopyFile.RECENT_KEYS"
>
<recent
name=
"C:\Users\hell\Desktop\Github\Poetry-appreciation-and-communication-platform\static"
/>
<key
name=
"MoveFile.RECENT_KEYS"
>
<recent
name=
"C:\Users\hell\Desktop\Github\Poetry-appreciation-and-communication-platform\static\css"
/>
<recent
name=
"C:\Users\hell\Desktop\Github\Poetry-appreciation-and-communication-platform\templates"
/>
</key>
...
...
@@ -314,17 +318,19 @@
<workItem
from=
"1599200783662"
duration=
"598000"
/>
<workItem
from=
"1599458281378"
duration=
"72000"
/>
<workItem
from=
"1599458392581"
duration=
"314000"
/>
<workItem
from=
"1599465199343"
duration=
"1541000"
/>
<workItem
from=
"1599480675310"
duration=
"85000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"
18240
000"
/>
<option
name=
"totallyTimeSpent"
value=
"
20473
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"1433"
y=
"528"
width=
"2062"
height=
"1136"
extended-state=
"
7
"
/>
<frame
x=
"1433"
y=
"528"
width=
"2062"
height=
"1136"
extended-state=
"
6
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.16
467066
"
/>
<window_info
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.16
766468
"
/>
<window_info
id=
"Structure"
order=
"1"
side_tool=
"true"
weight=
"0.25"
/>
<window_info
id=
"Favorites"
order=
"2"
side_tool=
"true"
/>
<window_info
anchor=
"bottom"
id=
"Message"
order=
"0"
/>
...
...
@@ -337,8 +343,8 @@
<window_info
anchor=
"bottom"
id=
"Docker"
order=
"7"
show_stripe_button=
"false"
/>
<window_info
anchor=
"bottom"
id=
"Version Control"
order=
"8"
weight=
"0.32968128"
/>
<window_info
anchor=
"bottom"
id=
"Database Changes"
order=
"9"
/>
<window_info
a
nchor=
"bottom"
id=
"Event Log"
order=
"10"
sideWeight=
"0.501996
"
side_tool=
"true"
visible=
"true"
weight=
"0.32968128"
/>
<window_info
a
ctive=
"true"
anchor=
"bottom"
id=
"Terminal"
order=
"11"
sideWeight=
"0.498004
"
visible=
"true"
weight=
"0.32968128"
/>
<window_info
a
ctive=
"true"
anchor=
"bottom"
id=
"Event Log"
order=
"10"
sideWeight=
"0.503493
"
side_tool=
"true"
visible=
"true"
weight=
"0.32968128"
/>
<window_info
a
nchor=
"bottom"
id=
"Terminal"
order=
"11"
sideWeight=
"0.496507
"
visible=
"true"
weight=
"0.32968128"
/>
<window_info
anchor=
"bottom"
id=
"Python Console"
order=
"12"
weight=
"0.32968128"
/>
<window_info
anchor=
"right"
id=
"Commander"
internal_type=
"SLIDING"
order=
"0"
type=
"SLIDING"
weight=
"0.4"
/>
<window_info
anchor=
"right"
id=
"Ant Build"
order=
"1"
weight=
"0.25"
/>
...
...
@@ -350,6 +356,10 @@
<component
name=
"TypeScriptGeneratedFilesManager"
>
<option
name=
"version"
value=
"1"
/>
</component>
<component
name=
"VcsManagerConfiguration"
>
<MESSAGE
value=
"Merge remote-tracking branch 'origin/master' into master # Conflicts: #	Jenkinsfile"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"Merge remote-tracking branch 'origin/master' into master # Conflicts: #	Jenkinsfile"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$USER_HOME$/AppData/Local/Programs/Python/Python38-32/Lib/threading.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -395,12 +405,12 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/js/bootstrap.min.js"
/>
<entry
file=
"file://$PROJECT_DIR$/static/js/bootstrap.js.map"
>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"388"
>
<caret
line=
"23"
column=
"742"
selection-start-line=
"23"
selection-start-column=
"742"
selection-end-line=
"23"
selection-end-column=
"742"
/>
</state>
</provider>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/js/bootstrap.min.js.map"
/>
<entry
file=
"file://$PROJECT_DIR$/static/js/bootstrap.js"
>
...
...
@@ -413,27 +423,27 @@
<entry
file=
"file://$PROJECT_DIR$/static/js/bootstrap.bundle.min.js.map"
/>
<entry
file=
"file://$PROJECT_DIR$/static/js/bootstrap.bundle.min.js"
/>
<entry
file=
"file://$PROJECT_DIR$/static/js/bootstrap.bundle.js.map"
>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"722"
>
<caret
line=
"20"
column=
"4603"
lean-forward=
"true"
selection-start-line=
"20"
selection-start-column=
"4603"
selection-end-line=
"20"
selection-end-column=
"4603"
/>
</state>
</provider>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/css/bootstrap-grid.css.map"
>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/css/bootstrap-grid.css"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/css/bootstrap.css.map"
>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2550"
>
<caret
line=
"85"
column=
"47"
lean-forward=
"true"
selection-start-line=
"85"
selection-start-column=
"47"
selection-end-line=
"85"
selection-end-column=
"47"
/>
</state>
</provider>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/css/bootstrap.min.css"
/>
<entry
file=
"file://$PROJECT_DIR$/static/css/bootstrap.min.css.map"
/>
...
...
@@ -459,12 +469,12 @@
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/css/bootstrap-reboot.css.map"
>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"300"
>
<caret
line=
"10"
column=
"3"
lean-forward=
"true"
selection-start-line=
"10"
selection-start-column=
"3"
selection-end-line=
"10"
selection-end-column=
"3"
/>
</state>
</provider>
<provider
editor-type-id=
"sourcemapFileViewerProvider"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/css/signup.css"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
...
...
@@ -551,6 +561,13 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/templates/blog.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"960"
>
<caret
line=
"32"
column=
"55"
selection-start-line=
"32"
selection-start-column=
"55"
selection-end-line=
"32"
selection-end-column=
"55"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/static/css/cover.css"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"300"
>
...
...
@@ -558,10 +575,10 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
templates/blog.html
"
>
<entry
file=
"file://$PROJECT_DIR$/
Jenkinsfile
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
48
0"
>
<caret
line=
"
37"
column=
"57"
lean-forward=
"true"
selection-start-line=
"37"
selection-start-column=
"57"
selection-end-line=
"37"
selection-end-column=
"57
"
/>
<state
relative-caret-position=
"
27
0"
>
<caret
line=
"
9"
column=
"9"
lean-forward=
"true"
selection-start-line=
"9"
selection-start-column=
"9"
selection-end-line=
"9"
selection-end-column=
"9
"
/>
</state>
</provider>
</entry>
...
...
Jenkinsfile
浏览文件 @
c360cf3b
...
...
@@ -5,6 +5,9 @@ pipeline {
}
stages
{
stage
(
'Build'
)
{
steps
{
sh
'py manage.py runserver'
}
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录