summaryrefslogtreecommitdiff
path: root/app/views/projects/settings/repository/show.html.haml
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2018-04-09 08:52:19 +0200
committerJames Lopez <james@jameslopez.es>2018-04-09 08:52:19 +0200
commit88b903c569c8c47433d291c215c43396c297ace8 (patch)
tree2395bc1f468be1d35f09661a87ab84b5fe0d4703 /app/views/projects/settings/repository/show.html.haml
parent99ac00b1fdb29e7fec890567ba9bae3dbd8e9061 (diff)
parent86ca1a77c58b508fc1b037c5fffbfb22fd992b42 (diff)
downloadgitlab-ce-88b903c569c8c47433d291c215c43396c297ace8.tar.gz
Merge remote-tracking branch 'origin/master' into 10-7-stable-prepare-rc310-7-stable-prepare-rc3
Diffstat (limited to 'app/views/projects/settings/repository/show.html.haml')
-rw-r--r--app/views/projects/settings/repository/show.html.haml1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml
index 6bef4d19434..f57590a908f 100644
--- a/app/views/projects/settings/repository/show.html.haml
+++ b/app/views/projects/settings/repository/show.html.haml
@@ -9,3 +9,4 @@
= render "projects/protected_branches/index"
= render "projects/protected_tags/index"
= render @deploy_keys
+= render "projects/deploy_tokens/index"