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
81f2bdfc
Commit
81f2bdfc
authored
Nov 10, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed tooltip from clone dropdown
parent
24fadd7c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
26 deletions
+56
-26
app/assets/javascripts/project.js
app/assets/javascripts/project.js
+31
-0
app/helpers/button_helper.rb
app/helpers/button_helper.rb
+20
-26
changelogs/unreleased/39455-clone-dropdown-should-not-have-a-tooltip.yml
...leased/39455-clone-dropdown-should-not-have-a-tooltip.yml
+5
-0
No files found.
app/assets/javascripts/project.js
View file @
81f2bdfc
...
@@ -14,6 +14,37 @@ export default class Project {
...
@@ -14,6 +14,37 @@ export default class Project {
$
(
`a:contains('
${
selectedCloneOption
}
')`
,
$cloneOptions
).
addClass
(
'
is-active
'
);
$
(
`a:contains('
${
selectedCloneOption
}
')`
,
$cloneOptions
).
addClass
(
'
is-active
'
);
}
}
$
(
'
a
'
,
$cloneOptions
).
on
(
'
click
'
,
(
e
)
=>
{
const
$this
=
$
(
e
.
currentTarget
);
const
url
=
$this
.
attr
(
'
href
'
);
const
activeText
=
$this
.
find
(
'
.dropdown-menu-inner-title
'
).
text
();
e
.
preventDefault
();
$
(
'
.is-active
'
,
$cloneOptions
).
not
(
$this
).
removeClass
(
'
is-active
'
);
$this
.
toggleClass
(
'
is-active
'
);
$projectCloneField
.
val
(
url
);
$cloneBtnText
.
text
(
activeText
);
return
$
(
'
.clone
'
).
text
(
url
);
});
// Ref switcher
this
.
initRefSwitcher
();
$
(
'
.project-refs-select
'
).
on
(
'
change
'
,
function
()
{
return
$
(
this
).
parents
(
'
form
'
).
submit
();
});
$
(
'
.hide-no-ssh-message
'
).
on
(
'
click
'
,
function
(
e
)
{
Cookies
.
set
(
'
hide_no_ssh_message
'
,
'
false
'
);
$
(
this
).
parents
(
'
.no-ssh-key-message
'
).
remove
();
return
e
.
preventDefault
();
});
$
(
'
.hide-no-password-message
'
).
on
(
'
click
'
,
function
(
e
)
{
Cookies
.
set
(
'
hide_no_password_message
'
,
'
false
'
);
$
(
this
).
parents
(
'
.no-password-message
'
).
remove
();
return
e
.
preventDefault
();
});
this
.
projectSelectDropdown
();
$
(
'
a
'
,
$cloneOptions
).
on
(
'
click
'
,
(
e
)
=>
{
$
(
'
a
'
,
$cloneOptions
).
on
(
'
click
'
,
(
e
)
=>
{
const
$this
=
$
(
e
.
currentTarget
);
const
$this
=
$
(
e
.
currentTarget
);
const
url
=
$this
.
attr
(
'
href
'
);
const
url
=
$this
.
attr
(
'
href
'
);
...
...
app/helpers/button_helper.rb
View file @
81f2bdfc
...
@@ -57,41 +57,35 @@ module ButtonHelper
...
@@ -57,41 +57,35 @@ module ButtonHelper
end
end
def
http_clone_button
(
project
,
placement
=
'right'
,
append_link:
true
)
def
http_clone_button
(
project
,
placement
=
'right'
,
append_link:
true
)
klass
=
'http-selector'
klass
<<
' has-tooltip'
if
current_user
.
try
(
:require_extra_setup_for_git_auth?
)
protocol
=
gitlab_config
.
protocol
.
upcase
protocol
=
gitlab_config
.
protocol
.
upcase
tooltip_title
=
protocol_description
=
if
current_user
.
try
(
:require_password_creation
_for_git
?
)
if
current_user
.
try
(
:require_password_creation?
)
_
(
"Set a password on your account to pull or push via %{protocol}."
)
%
{
protocol:
protocol
}
_
(
"Set a password on your account to pull or push via %{protocol}."
)
%
{
protocol:
protocol
}
else
else
_
(
"Create a personal access token on your account to pull or push via %{protocol}."
)
%
{
protocol:
protocol
}
_
(
"Create a personal access token on your account to pull or push via %{protocol}."
)
%
{
protocol:
protocol
}
end
end
content_tag
(
append_link
?
:a
:
:span
),
protocol
,
protocol_element_output
=
content_tag
(
:strong
,
protocol
,
class:
'dropdown-menu-inner-title'
)
class:
klass
,
href:
(
project
.
http_url_to_repo
if
append_link
),
if
current_user
.
try
(
:require_password_creation?
)
||
current_user
.
try
(
:require_personal_access_token_creation_for_git_auth?
)
data:
{
protocol_element_output
<<
content_tag
(
:span
,
protocol_description
,
class:
'dropdown-menu-inner-content'
)
html:
true
,
end
placement:
placement
,
container:
'body'
,
content_tag
(
append_link
?
:a
:
:span
),
title:
tooltip_title
protocol_element_output
,
}
class:
'http-selector'
,
href:
(
project
.
http_url_to_repo
if
append_link
)
end
end
def
ssh_clone_button
(
project
,
placement
=
'right'
,
append_link:
true
)
def
ssh_clone_button
(
project
,
append_link:
true
)
klass
=
'ssh-selector'
ssh_description
=
_
(
'Add an SSH key to your profile to pull or push via SSH.'
)
klass
<<
' has-tooltip'
if
current_user
.
try
(
:require_ssh_key?
)
ssh_element_output
=
content_tag
(
:strong
,
'SSH'
,
class:
'dropdown-menu-inner-title'
)
ssh_element_output
<<
content_tag
(
:span
,
ssh_description
,
class:
'dropdown-menu-inner-content'
)
if
current_user
.
try
(
:require_ssh_key?
)
content_tag
(
append_link
?
:a
:
:span
),
'SSH'
,
content_tag
(
append_link
?
:a
:
:span
),
class:
klass
,
ssh_element_output
,
href:
(
project
.
ssh_url_to_repo
if
append_link
),
class:
'ssh-selector'
,
data:
{
href:
(
project
.
ssh_url_to_repo
if
append_link
)
html:
true
,
placement:
placement
,
container:
'body'
,
title:
_
(
'Add an SSH key to your profile to pull or push via SSH.'
)
}
end
end
end
end
changelogs/unreleased/39455-clone-dropdown-should-not-have-a-tooltip.yml
0 → 100644
View file @
81f2bdfc
---
title
:
Removed tooltip from clone dropdown
merge_request
:
15334
author
:
type
:
other
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