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
df232c27
Commit
df232c27
authored
Mar 12, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small improvements and
💄
parent
901f8c5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
app/controllers/admin/geo_nodes_controller.rb
app/controllers/admin/geo_nodes_controller.rb
+5
-3
app/views/admin/geo_nodes/index.html.haml
app/views/admin/geo_nodes/index.html.haml
+1
-1
No files found.
app/controllers/admin/geo_nodes_controller.rb
View file @
df232c27
...
...
@@ -26,12 +26,14 @@ class Admin::GeoNodesController < Admin::ApplicationController
@node
=
GeoNode
.
find
(
params
[
:id
])
if
@node
.
primary?
||
!
@node
.
missing_oauth_application?
redirect_to
admin_geo_nodes_path
,
notice:
"This node doesn't need to be repaired."
flash
[
:notice
]
=
"This node doesn't need to be repaired."
elsif
@node
.
save
redirect_to
admin_geo_nodes_path
,
notice:
'Node Authentication was successfully repaired.'
flash
[
:notice
]
=
'Node Authentication was successfully repaired.'
else
redirect_to
admin_geo_nodes_path
,
alert:
'There was a problem repairing Node Authentication.'
flash
[
:alert
]
=
'There was a problem repairing Node Authentication.'
end
redirect_to
admin_geo_nodes_path
end
private
...
...
app/views/admin/geo_nodes/index.html.haml
View file @
df232c27
...
...
@@ -53,7 +53,7 @@
.pull-right
-
if
node
.
missing_oauth_application?
=
link_to
repair_admin_geo_node_path
(
node
),
method: :post
,
class:
'btn btn-default, btn-sm'
do
=
link_to
repair_admin_geo_node_path
(
node
),
method: :post
,
title:
'OAuth application is missing'
,
class:
'btn btn-default, btn-sm'
do
=
icon
(
'exclamation-triangle fw'
)
Repair authentication
=
link_to
'Remove'
,
admin_geo_node_path
(
node
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-remove btn-sm'
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