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
c0eef344
Commit
c0eef344
authored
8 years ago
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix backfill action and Geo Nodes button spacing
parent
5461d215
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
app/models/geo_node.rb
app/models/geo_node.rb
+6
-4
app/views/admin/geo_nodes/index.html.haml
app/views/admin/geo_nodes/index.html.haml
+3
-3
No files found.
app/models/geo_node.rb
View file @
c0eef344
...
...
@@ -65,6 +65,12 @@ class GeoNode < ActiveRecord::Base
self
.
primary?
?
false
:
!
oauth_application
.
present?
end
def
backfill_repositories
if
Gitlab
::
Geo
.
enabled?
GeoScheduleBackfillWorker
.
perform_async
(
id
)
unless
primary?
end
end
private
def
url_helper_args
...
...
@@ -121,8 +127,4 @@ class GeoNode < ActiveRecord::Base
self
.
system_hook
.
push_events
=
true
self
.
system_hook
.
tag_push_events
=
true
end
def
backfill_repositories
GeoScheduleBackfillWorker
.
perform_async
(
id
)
unless
primary?
end
end
This diff is collapsed.
Click to expand it.
app/views/admin/geo_nodes/index.html.haml
View file @
c0eef344
...
...
@@ -53,13 +53,13 @@
.pull-right
-
if
node
.
missing_oauth_application?
=
link_to
repair_admin_geo_node_path
(
node
),
method: :post
,
title:
'OAuth application is missing'
,
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 prepend-left-10
'
do
=
icon
(
'exclamation-triangle fw'
)
Repair authentication
-
unless
node
.
primary?
=
link_to
backfill_repositories_admin_geo_node_path
(
node
),
method: :post
,
class:
'btn btn-primary btn-sm'
do
=
link_to
backfill_repositories_admin_geo_node_path
(
node
),
method: :post
,
class:
'btn btn-primary btn-sm
prepend-left-10
'
do
=
icon
'map-signs'
Backfill all repositories
=
link_to
admin_geo_node_path
(
node
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-remove btn-sm'
do
=
link_to
admin_geo_node_path
(
node
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
'btn btn-remove btn-sm
prepend-left-10
'
do
=
icon
'trash'
Remove
This diff is collapsed.
Click to expand it.
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