Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-02-26 21:06:42 +0300
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-02-26 21:06:42 +0300
commit8c122d65bfed5c5addd3245304895b98f8b83b36 (patch)
tree430ac6f1b2c30d0e0b8f0c6efa494918850e6004 /app/assets/javascripts/pages/projects/settings/repository
parentfd598fd6bda91343d7e271c0fe485ead9e0011d2 (diff)
parent1553a34dbff167978f5dc81cc3a21e0b3b2b2bfa (diff)
Resolved conflicts in app/assets/javascripts/pages/projects/settings/repository/show/index.js
Diffstat (limited to 'app/assets/javascripts/pages/projects/settings/repository')
-rw-r--r--app/assets/javascripts/pages/projects/settings/repository/show/index.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/projects/settings/repository/show/index.js b/app/assets/javascripts/pages/projects/settings/repository/show/index.js
index f46372faed8..001128ead59 100644
--- a/app/assets/javascripts/pages/projects/settings/repository/show/index.js
+++ b/app/assets/javascripts/pages/projects/settings/repository/show/index.js
@@ -3,9 +3,11 @@
import ProtectedTagCreate from '~/protected_tags/protected_tag_create';
import ProtectedTagEditList from '~/protected_tags/protected_tag_edit_list';
import initSettingsPanels from '~/settings_panels';
+import initDeployKeys from '~/deploy_keys';
document.addEventListener('DOMContentLoaded', () => {
new ProtectedTagCreate();
new ProtectedTagEditList();
+ initDeployKeys();
initSettingsPanels();
});