Commit e4175694 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Codestyle changes and trying to simplify solving CE -> EE conflicts

parent 11f6213e
...@@ -31,10 +31,17 @@ ...@@ -31,10 +31,17 @@
var $this = $(this); var $this = $(this);
$('a.clone-dropdown-btn span').text($this.text()); $('a.clone-dropdown-btn span').text($this.text());
$('#project_clone').val($this.attr('href')); $('#project_clone').val($this.attr('href'));
});
// Change URLs in Geo Clone Dialog information text
$('ul.clone-options-dropdown a').on('click',function(e){
e.preventDefault();
var $this = $(this);
if (gl.GeoCloneDialog) { if (gl.GeoCloneDialog) {
gl.GeoCloneDialog.cloneUrlSecondary = $this.attr('href'); gl.GeoCloneDialog.cloneUrlSecondary = $this.attr('href');
gl.GeoCloneDialog.cloneUrlPrimary = $this.attr('data-primary-url'); gl.GeoCloneDialog.cloneUrlPrimary = $this.attr('data-primary-url');
} }
}); });
= render partial: 'shared/geo_info_modal', locals: {project: project} if Gitlab::Geo.secondary? = render 'shared/geo_info_modal', project: project if Gitlab::Geo.secondary?
--- ---
title: 'Geo: Improve project view UI to teach users how to clone from a secondary Geo node and push to a primary.' title: 'Geo: Improve project view UI to teach users how to clone from a secondary Geo node and push to a primary.'
merge_request: 789 merge_request: 905
author: Gabriel Mazetto author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment