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
0a7d47df
Commit
0a7d47df
authored
Jan 14, 2022
by
Ezekiel Kigbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove old haml modal
parent
4c6fe280
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
18 deletions
+5
-18
app/assets/javascripts/vue_shared/components/confirm_fork_modal.vue
.../javascripts/vue_shared/components/confirm_fork_modal.vue
+0
-1
app/assets/javascripts/vue_shared/components/web_ide_link.vue
...assets/javascripts/vue_shared/components/web_ide_link.vue
+1
-1
app/helpers/tree_helper.rb
app/helpers/tree_helper.rb
+4
-4
app/views/shared/_confirm_fork_modal.html.haml
app/views/shared/_confirm_fork_modal.html.haml
+0
-12
No files found.
app/assets/javascripts/vue_shared/components/confirm_fork_modal.vue
View file @
0a7d47df
...
...
@@ -53,7 +53,6 @@ export default {
};
</
script
>
<
template
>
<!-- v-bind="$attrs" -->
<gl-modal
:visible=
"isVisible"
:modal-id=
"modalId"
...
...
app/assets/javascripts/vue_shared/components/web_ide_link.vue
View file @
0a7d47df
...
...
@@ -296,7 +296,7 @@ export default {
</gl-sprintf>
</gl-modal>
<confirm-fork-modal
v-if=
"showWebIdeButton"
v-if=
"showWebIdeButton
|| showEditButton
"
:is-visible=
"isForkModalOpen"
:modal-id=
"forkModalId"
:fork-path=
"forkPath"
...
...
app/helpers/tree_helper.rb
View file @
0a7d47df
...
...
@@ -176,14 +176,14 @@ module TreeHelper
end
def
fork_modal_options
(
project
,
ref
,
path
,
blob
)
if
show_web_ide_button?
return
{
fork_path:
ide_fork_and_edit_path
(
project
,
ref
,
path
),
fork_modal_id:
"modal-confirm-fork-webide"
}
end
if
show_edit_button?
({
blob:
blob
})
return
{
fork_path:
fork_and_edit_path
(
project
,
ref
,
path
),
fork_modal_id:
"modal-confirm-fork-edit"
}
end
if
show_web_ide_button?
return
{
fork_path:
ide_fork_and_edit_path
(
project
,
ref
,
path
),
fork_modal_id:
"modal-confirm-fork-webide"
}
end
{}
end
...
...
app/views/shared/_confirm_fork_modal.html.haml
deleted
100644 → 0
View file @
4c6fe280
.modal
{
data:
{
qa_selector:
'confirm_fork_modal'
},
id:
"modal-confirm-fork-#{type}"
}
.modal-dialog
.modal-content
.modal-header
%h3
.page-title
=
_
(
'Fork project?'
)
%button
.close
{
type:
"button"
,
"data-dismiss"
:
"modal"
,
"aria-label"
=>
_
(
'Close'
)
}
%span
{
"aria-hidden"
:
"true"
}
×
.modal-body.p-3
%p
=
_
(
"You can’t %{tag_start}edit%{tag_end} files directly in this project. Fork this project and submit a merge request with your changes."
)
%
{
tag_start:
''
,
tag_end:
''
}
.modal-footer
=
link_to
_
(
'Cancel'
),
'#'
,
class:
"btn gl-button btn-default"
,
"data-dismiss"
=>
"modal"
=
link_to
_
(
'Fork project'
),
fork_path
,
class:
'btn gl-button btn-confirm'
,
data:
{
qa_selector:
'fork_project_button'
},
method: :post
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