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
aa074632
Commit
aa074632
authored
Dec 08, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
💄
codestyle
parent
61bf916d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
13 deletions
+4
-13
app/assets/javascripts/geo_clone_dialog.js.es6
app/assets/javascripts/geo_clone_dialog.js.es6
+2
-10
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-2
app/views/shared/_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+1
-1
No files found.
app/assets/javascripts/geo_clone_dialog.js.es6
View file @
aa074632
...
...
@@ -10,14 +10,6 @@
mounted() {
$(`#${this.id}`).appendTo('body').modal({ modal: true, show: false });
},
filters: {
emptyRepo: (value) => {
if (!value) {
return '<clone url for primary repository>';
}
return value;
},
},
template: `
<div class="modal in" tabindex="-1" :id="id">
<div class="modal-dialog">
...
...
@@ -33,7 +25,7 @@
<p><strong>Step 2.</strong> Go to the new directory and define <strong>primary node's</strong> repository URL as the <strong>push</strong> remote:</p>
<slot name="clipboard-2"></slot>
<pre class="dark" id="geo-info-2">git remote set-url --push origin {{cloneUrlPrimary |
emptyRepo
}}</pre>
<pre class="dark" id="geo-info-2">git remote set-url --push origin {{cloneUrlPrimary |
| '<clone url for primary repository>'
}}</pre>
<p><strong>Done.</strong> You can now commit and push code as you normally do, but with increased speed.</p>
</div>
</div>
...
...
@@ -46,7 +38,7 @@
const geoClone = document.getElementById('geo-clone');
if (geoClone) {
gl.GeoCloneDialog = new Vue({
el:
'#geo-clone'
,
el:
geoClone
,
data: Object.assign({}, geoClone.dataset),
});
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
aa074632
...
...
@@ -919,11 +919,10 @@ a.allowed-to-push {
}
#modal-geo-info
.modal-dialog
{
width
:
700px
;
max-
width
:
700px
;
.btn-clipboard
{
@extend
.pull-right
;
margin-right
:
20px
;
margin-top
:
5px
;
position
:
absolute
;
...
...
app/views/shared/_clone_panel.html.haml
View file @
aa074632
...
...
@@ -40,7 +40,7 @@
if
(
gl
.
GeoCloneDialog
)
{
gl
.
GeoCloneDialog
.
cloneUrlSecondary
=
$this
.
attr
(
'
href
'
);
gl
.
GeoCloneDialog
.
cloneUrlPrimary
=
$this
.
attr
(
'
data-primary-u
rl
'
);
gl
.
GeoCloneDialog
.
cloneUrlPrimary
=
$this
.
data
(
'
primaryU
rl
'
);
}
});
...
...
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