Merge branch 'master' into feat/approval

This commit is contained in:
Jonas Franz
2018-05-23 20:33:04 +02:00
committed by GitHub
32 changed files with 141 additions and 47 deletions

View File

@@ -23,14 +23,14 @@
</div>
</h4>
<div class="ui attached segment">
{{template "repo/settings/hook_gitea" .}}
{{template "repo/settings/hook_gogs" .}}
{{template "repo/settings/hook_slack" .}}
{{template "repo/settings/hook_discord" .}}
{{template "repo/settings/hook_dingtalk" .}}
{{template "repo/settings/webhook/gitea" .}}
{{template "repo/settings/webhook/gogs" .}}
{{template "repo/settings/webhook/slack" .}}
{{template "repo/settings/webhook/discord" .}}
{{template "repo/settings/webhook/dingtalk" .}}
</div>
{{template "repo/settings/hook_history" .}}
{{template "repo/settings/webhook/history" .}}
</div>
</div>
</div>

View File

@@ -5,7 +5,7 @@
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "repo/settings/hook_list" .}}
{{template "repo/settings/webhook/list" .}}
</div>
</div>
</div>