Added public key to gitlab geo admin screen

app/controllers/admin/geo_nodes_controller.rb

@@ -2,10 +2,14 @@ class Admin::GeoNodesController < Admin::ApplicationController
   def index
     @nodes = GeoNode.all
     @node = GeoNode.new
+    @node.build_geo_node_key
   end
 
   def create
-    @node = GeoNode.new(geo_node_params)
+    @node = GeoNode.new
+    @node.build_geo_node_key
+    @node.attributes = geo_node_params
+    @node.geo_node_key.title = "Geo node: #{@node.url}"
 
     if @node.save
       redirect_to admin_geo_nodes_path, notice: 'Node was successfully created.'
@@ -23,6 +27,6 @@ class Admin::GeoNodesController < Admin::ApplicationController
   end
 
   def geo_node_params
-    params.require(:geo_node).permit(:url, :host, :port, :primary, :relative_url_root, :schema)
+    params.require(:geo_node).permit(:url, :primary, geo_node_key_attributes: [:key])
   end
 end

app/models/geo_node.rb

@@ -18,6 +18,8 @@ class GeoNode < ActiveRecord::Base
   default_value_for :relative_url_root, ''
   default_value_for :primary, false
 
+  accepts_nested_attributes_for :geo_node_key
+
   validates :host, host: true, presence: true, uniqueness: { case_sensitive: false, scope: :port }
   validates :primary, uniqueness: { message: 'primary node already exists' }, if: :primary
   validates :schema, inclusion: %w(http https)

app/views/admin/geo_nodes/index.html.haml

@@ -18,6 +18,11 @@
     = f.label :url, 'URL:', class: 'control-label'
     .col-sm-10
       = f.text_field :url, class: 'form-control'
+  = f.fields_for :geo_node_key, @node.geo_node_key do |fg|
+    .form-group
+      = fg.label :key, 'Public Key', class: 'control-label'
+      .col-sm-10
+        = fg.text_area :key, class: 'form-control'
   .form-group
     = f.label :primary, 'Primary', class: 'control-label checkbox'
     .col-sm-10