diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-11 15:13:46 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-26 17:00:24 +0100 |
| commit | 8259a0c5802dd2666a72cca6fd34b6e7b47c6ed9 (patch) | |
| tree | ff048bf2a9b928cc4689be823382d5152dc5cc19 | |
| parent | b32a71d141338e8440ebed708fe4d7570a94615f (diff) | |
| download | gitlab-ce-upgrade-jquery.tar.gz | |
testing CI builds for failureupgrade-jquery
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/tags/master_deletes_tag_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 8ae4fd94146..826590e8628 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -174,7 +174,7 @@ This will remove the fork relationship to source project = succeed "." do = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project) - = form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_project_path(@project), method: :delete, remote: true, html: { class: 'transfer-project' }) do |f| + = form_for([@project.namespace.becomes(Namespace), @project], url: remove_fork_project_path(@project), method: :delete, remote: true, html: { 'data-type': 'script', class: 'transfer-project' }) do |f| %p %strong Once removed, the fork relationship cannot be restored and you will no longer be able to send merge requests to the source. = button_to 'Remove fork relationship', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_fork_project_message(@project) } diff --git a/spec/features/tags/master_deletes_tag_spec.rb b/spec/features/tags/master_deletes_tag_spec.rb index d47b2481ca4..a6472df1515 100644 --- a/spec/features/tags/master_deletes_tag_spec.rb +++ b/spec/features/tags/master_deletes_tag_spec.rb @@ -51,7 +51,7 @@ feature 'Master deletes tag' do def delete_first_tag page.within('.content') do - first('.btn-remove').click + first('.btn-remove').trigger('click') end wait_for_requests |