Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
08a8a4d885d9
Commit
a481337b
authored
Sep 29, 2017
by
Filipa Lacerda
Browse files
Merge branch 'remove-target-dd' into 'master'
Remove target dd Closes #38485 See merge request gitlab-org/gitlab-ce!14558
parents
668a4455dcad
ba124f230403
Changes
7
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/repo/components/repo_commit_section.vue
View file @
08a8a4d8
...
...
@@ -37,7 +37,7 @@ export default {
content
:
f
.
newContent
,
}));
const
payload
=
{
branch
:
Store
.
targe
tBranch
,
branch
:
Store
.
curren
tBranch
,
commit_message
:
commitMessage
,
actions
,
};
...
...
@@ -105,7 +105,7 @@ export default {
</label>
<div
class=
"col-md-6"
>
<span
class=
"help-block"
>
{{
targe
tBranch
}}
{{
curren
tBranch
}}
</span>
</div>
</div>
...
...
app/assets/javascripts/repo/components/repo_edit_button.vue
View file @
08a8a4d8
...
...
@@ -26,16 +26,6 @@ export default {
this
.
editMode
=
!
this
.
editMode
;
Store
.
toggleBlobView
();
},
toggleProjectRefsForm
()
{
$
(
'
.project-refs-form
'
).
toggleClass
(
'
disabled
'
,
this
.
editMode
);
$
(
'
.js-tree-ref-target-holder
'
).
toggle
(
this
.
editMode
);
},
},
watch
:
{
editMode
()
{
this
.
toggleProjectRefsForm
();
},
},
};
</
script
>
...
...
app/assets/javascripts/repo/index.js
View file @
08a8a4d8
...
...
@@ -11,10 +11,6 @@ function initDropdowns() {
}
function
addEventsForNonVueEls
()
{
$
(
document
).
on
(
'
change
'
,
'
.dropdown
'
,
()
=>
{
Store
.
targetBranch
=
$
(
'
.project-refs-target-form input[name="ref"]
'
).
val
();
});
window
.
onbeforeunload
=
function
confirmUnload
(
e
)
{
const
hasChanged
=
Store
.
openedFiles
.
some
(
file
=>
file
.
changed
);
...
...
app/assets/javascripts/repo/stores/repo_store.js
View file @
08a8a4d8
...
...
@@ -32,7 +32,6 @@ const RepoStore = {
isCommitable
:
false
,
binary
:
false
,
currentBranch
:
''
,
targetBranch
:
'
new-branch
'
,
commitMessage
:
''
,
binaryTypes
:
{
png
:
false
,
...
...
app/views/projects/tree/_tree_header.html.haml
View file @
08a8a4d8
.tree-ref-container
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'tree'
,
path:
@path
-
if
show_new_repo?
.tree-ref-target-holder.js-tree-ref-target-holder
=
icon
(
'long-arrow-right'
,
title:
'to target branch'
)
=
render
'shared/target_switcher'
,
destination:
'tree'
,
path:
@path
-
unless
show_new_repo?
=
render
'projects/tree/old_tree_header'
...
...
app/views/shared/_target_switcher.html.haml
deleted
100644 → 0
View file @
668a4455
-
dropdown_toggle_text
=
@ref
||
@project
.
default_branch
=
form_tag
nil
,
method: :get
,
class:
"project-refs-form project-refs-target-form"
do
=
hidden_field_tag
:destination
,
destination
-
if
defined?
(
path
)
=
hidden_field_tag
:path
,
path
-
@options
&&
@options
.
each
do
|
key
,
value
|
=
hidden_field_tag
key
,
value
,
id:
nil
.dropdown
=
dropdown_toggle
dropdown_toggle_text
,
{
toggle:
"dropdown"
,
selected:
dropdown_toggle_text
,
ref:
@ref
,
refs_url:
refs_project_path
(
@project
,
find:
[
'branches'
]),
field_name:
'ref'
,
input_field_name:
'new-branch'
,
submit_form_on_click:
true
,
visit:
false
},
{
toggle_class:
"js-project-refs-dropdown"
}
.dropdown-menu.dropdown-menu-selectable.git-revision-dropdown
{
class:
(
"dropdown-menu-align-right"
if
local_assigns
[
:align_right
])
}
=
dropdown_title
_
(
"Create a new branch"
)
=
dropdown_input
_
(
"Create a new branch"
)
=
dropdown_title
_
(
"Select existing branch"
),
options:
{
close:
false
}
=
dropdown_filter
_
(
"Search branches and tags"
)
=
dropdown_content
=
dropdown_loading
spec/javascripts/repo/components/repo_edit_button_spec.js
View file @
08a8a4d8
...
...
@@ -21,13 +21,11 @@ describe('RepoEditButton', () => {
expect
(
vm
.
$el
.
textContent
).
toMatch
(
'
Edit
'
);
spyOn
(
vm
,
'
editCancelClicked
'
).
and
.
callThrough
();
spyOn
(
vm
,
'
toggleProjectRefsForm
'
);
vm
.
$el
.
click
();
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
editCancelClicked
).
toHaveBeenCalled
();
expect
(
vm
.
toggleProjectRefsForm
).
toHaveBeenCalled
();
expect
(
vm
.
$el
.
textContent
).
toMatch
(
'
Cancel edit
'
);
done
();
});
...
...
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