Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
58785e50
Commit
58785e50
authored
Feb 21, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added public key to gitlab geo admin screen
parent
576412e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
app/controllers/admin/geo_nodes_controller.rb
app/controllers/admin/geo_nodes_controller.rb
+6
-2
app/models/geo_node.rb
app/models/geo_node.rb
+2
-0
app/views/admin/geo_nodes/index.html.haml
app/views/admin/geo_nodes/index.html.haml
+5
-0
No files found.
app/controllers/admin/geo_nodes_controller.rb
View file @
58785e50
...
...
@@ -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
View file @
58785e50
...
...
@@ -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
View file @
58785e50
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment