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
e4175694
Commit
e4175694
authored
Nov 30, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Codestyle changes and trying to simplify solving CE -> EE conflicts
parent
11f6213e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
app/views/shared/_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+8
-1
changelogs/unreleased-ee/905-geo-clone-ui.yml
changelogs/unreleased-ee/905-geo-clone-ui.yml
+2
-2
No files found.
app/views/shared/_clone_panel.html.haml
View file @
e4175694
...
@@ -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?
changelogs/unreleased-ee/
789
-geo-clone-ui.yml
→
changelogs/unreleased-ee/
905
-geo-clone-ui.yml
View file @
e4175694
---
---
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
:
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