From 534ac6431b400b60f52b2edbdaa5ec0ade685235 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 1 Aug 2014 04:33:04 +0200 Subject: [PATCH] Allow to disable ssh_key --- assets/scripts/app/routes.coffee | 2 +- assets/scripts/app/templates/settings.hbs | 4 +++- assets/scripts/travis.coffee | 1 + config.ru | 3 ++- public/index.html | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 4c7faf1b..2b87667e 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -65,7 +65,7 @@ Travis.Router.map -> @route 'index', path: '/' @resource 'env_vars', -> @route 'new' - @resource 'ssh_key' + @resource 'ssh_key' if Travis.config.ssh_key_enabled @route 'first_sync' @route 'insufficient_oauth_permissions' diff --git a/assets/scripts/app/templates/settings.hbs b/assets/scripts/app/templates/settings.hbs index d9d7c616..79ec209b 100644 --- a/assets/scripts/app/templates/settings.hbs +++ b/assets/scripts/app/templates/settings.hbs @@ -1,7 +1,9 @@
diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 207d1657..f950e088 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -81,6 +81,7 @@ $.extend Travis, pusher_key: $('meta[name="travis.pusher_key"]').attr('value') ga_code: $('meta[name="travis.ga_code"]').attr('value') code_climate: $('meta[name="travis.code_climate"]').attr('value') + ssh_key_enabled: $('meta[name="travis.ssh_key_enabled"]').attr('value') == 'true' code_climate_url: $('meta[name="travis.code_climate_url"]').attr('value') show_repos_hint: 'private' avatar_default_url: 'https://travis-ci.org/images/mailer/mascot-avatar-40px.png' diff --git a/config.ru b/config.ru index fff7ffb2..8994c0a3 100644 --- a/config.ru +++ b/config.ru @@ -31,5 +31,6 @@ run Travis::Web::App.build( pusher_key: ENV['PUSHER_KEY'], ga_code: ENV['GA_CODE'], root: File.expand_path('../public', __FILE__), - server_start: Time.now + server_start: Time.now, + ssh_key_enabled: ENV['SSH_KEY_ENABLED'] ) diff --git a/public/index.html b/public/index.html index 4f5bb6dc..8c80fa41 100644 --- a/public/index.html +++ b/public/index.html @@ -4,6 +4,7 @@ +