summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-17 16:27:40 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-17 16:27:40 -0800
commitff492307b9fb0cd0f016a358cbf1228392f764d1 (patch)
tree54e9a748551b54c63c0bf9772f121c84a3304af8
parent417975ae2f0d5d87915aa448184494e0e8370edb (diff)
downloadgitlab-ce-ff492307b9fb0cd0f016a358cbf1228392f764d1.tar.gz
Dont show gitlab.com import for gitlab.com :)
-rw-r--r--app/views/projects/new.html.haml6
-rw-r--r--safe/public.pem9
2 files changed, 12 insertions, 3 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 61f6a66c386..6f5851d61a1 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -52,7 +52,7 @@
%i.fa.fa-github
Import projects from GitHub
= render 'github_import_modal'
-
+
.project-import.form-group
.col-sm-2
.col-sm-10
@@ -60,7 +60,7 @@
= link_to status_import_gitlab_path do
%i.fa.fa-heart
Import projects from GitLab.com
- - else
+ - elsif request.host != 'gitlab.com'
= link_to '#', class: 'how_to_import_link light' do
%i.fa.fa-heart
Import projects from GitLab.com
@@ -99,4 +99,4 @@
e.preventDefault()
import_modal = $(this).parent().find(".modal").show()
$('.modal-header .close').bind 'click', ->
- $(".modal").hide() \ No newline at end of file
+ $(".modal").hide()
diff --git a/safe/public.pem b/safe/public.pem
new file mode 100644
index 00000000000..c5ffe20a5c7
--- /dev/null
+++ b/safe/public.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnp2mUaLBoHFX127ysonX
+OihiGpI4098eFfH1iAxpKHIof0vs0jFF05IUScNXJZ1U3w8G1U/unY/wGGa3NzAb
+ZfDd22eOF6X2Gfiey6U4w9dFf0/UT5x1bphlpX357yh4O9oWWuNaWD062DTbOOsJ
+U6UW2U/sZAu/QScys0Nw+gJ58t93hb4jFq+nO5IAQc6g4S8ek5YvIXOshFEpF2in
+ZLbSYowx92+9GzfjvdQ7fk0Q2ssg0zfScVa6FY8n019osz0SC3wcSd/qicdfecpu
+7oycpd9YDqk4lufE1qVMOsgE8OO4KXMrByz2f+T0p/bH9zdBa5HYylf1T7i60hIL
+kQIDAQAB
+-----END PUBLIC KEY-----