kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'add-js-prevent-default-on-click' into 'master'

Browse source 
Replace inline scripts in links to prevent default

See merge request gitlab-org/gitlab-ce!31838
This commit is contained in:
Clement Ho 2019-08-19 17:50:45 +00:00
commit cfc88c9265
6 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/members.js
View file

@ -17,6 +17,8 @@ export default class Members {
}
dropdownClicked(options) {
options.e.preventDefault();
this.formSubmit(null, options.$el);
}

2
app/views/projects/commit/_ajax_signature.html.haml
View file

@ -1,2 +1,2 @@
- if commit.has_signature?
%a{ href: 'javascript:void(0)', tabindex: 0, class: commit_signature_badge_classes('js-loading-gpg-badge'), data: { toggle: 'tooltip', placement: 'top', title: _('GPG signature (loading...)'), 'commit-sha' => commit.sha } }
%button{ tabindex: 0, class: commit_signature_badge_classes('js-loading-gpg-badge'), data: { toggle: 'tooltip', placement: 'top', title: _('GPG signature (loading...)'), 'commit-sha' => commit.sha } }

2
app/views/projects/commit/_signature_badge.html.haml
View file

@ -24,5 +24,5 @@
= link_to(_('Learn more about signing commits'), help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link')
%a{ href: 'javascript:void(0)', tabindex: 0, class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'top', title: title, content: content } }
%button{ tabindex: 0, class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'top', title: title, content: content } }
= label

2
app/views/shared/members/_group.html.haml
View file

@ -32,7 +32,7 @@
%ul
- Gitlab::Access.options.each do |role, role_id|
%li
= link_to role, "javascript:void(0)",
= link_to role, '#',
class: ("is-active" if group_link.group_access == role_id),
data: { id: role_id, el_id: dom_id }
.clearable-input.member-form-control.d-sm-inline-block

2
app/views/shared/members/_member.html.haml
View file

@ -82,7 +82,7 @@
%ul
- member.valid_level_roles.each do |role, role_id|
%li
= link_to role, "javascript:void(0)",
= link_to role, '#',
class: ("is-active" if member.access_level == role_id),
data: { id: role_id, el_id: dom_id(member) }
= render_if_exists 'shared/members/ee/revert_ldap_group_sync_option',

18
spec/features/signed_commits_spec.rb
View file

@ -15,8 +15,8 @@ describe 'GPG signed commits' do
visit project_commit_path(project, ref)
expect(page).to have_link 'Unverified'
expect(page).not_to have_link 'Verified'
expect(page).to have_button 'Unverified'
expect(page).not_to have_button 'Verified'
# user changes his email which makes the gpg key verified
perform_enqueued_jobs do
@ -26,8 +26,8 @@ describe 'GPG signed commits' do
visit project_commit_path(project, ref)
expect(page).not_to have_link 'Unverified'
expect(page).to have_link 'Verified'
expect(page).not_to have_button 'Unverified'
expect(page).to have_button 'Verified'
end
it 'changes from unverified to verified when the user adds the missing gpg key' do
@ -36,8 +36,8 @@ describe 'GPG signed commits' do
visit project_commit_path(project, ref)
expect(page).to have_link 'Unverified'
expect(page).not_to have_link 'Verified'
expect(page).to have_button 'Unverified'
expect(page).not_to have_button 'Verified'
# user adds the gpg key which makes the signature valid
perform_enqueued_jobs do
@ -46,8 +46,8 @@ describe 'GPG signed commits' do
visit project_commit_path(project, ref)
expect(page).not_to have_link 'Unverified'
expect(page).to have_link 'Verified'
expect(page).not_to have_button 'Unverified'
expect(page).to have_button 'Verified'
end
context 'shows popover badges', :js do
@ -136,7 +136,7 @@ describe 'GPG signed commits' do
visit project_commit_path(project, GpgHelpers::SIGNED_AND_AUTHORED_SHA)
# wait for the signature to get generated
expect(page).to have_link 'Verified'
expect(page).to have_button 'Verified'
user_1.destroy!