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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
e0df4a9e
Commit
e0df4a9e
authored
Sep 28, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes the target branch and only uses the source branch.
parent
74bf6b20
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
16 deletions
+2
-16
app/assets/javascripts/repo/components/repo_commit_section.vue
...ssets/javascripts/repo/components/repo_commit_section.vue
+2
-2
app/assets/javascripts/repo/components/repo_edit_button.vue
app/assets/javascripts/repo/components/repo_edit_button.vue
+0
-10
app/assets/javascripts/repo/index.js
app/assets/javascripts/repo/index.js
+0
-3
app/assets/javascripts/repo/stores/repo_store.js
app/assets/javascripts/repo/stores/repo_store.js
+0
-1
No files found.
app/assets/javascripts/repo/components/repo_commit_section.vue
View file @
e0df4a9e
...
@@ -37,7 +37,7 @@ export default {
...
@@ -37,7 +37,7 @@ export default {
content
:
f
.
newContent
,
content
:
f
.
newContent
,
}));
}));
const
payload
=
{
const
payload
=
{
branch
:
Store
.
targe
tBranch
,
branch
:
Store
.
curren
tBranch
,
commit_message
:
commitMessage
,
commit_message
:
commitMessage
,
actions
,
actions
,
};
};
...
@@ -105,7 +105,7 @@ export default {
...
@@ -105,7 +105,7 @@ export default {
</label>
</label>
<div
class=
"col-md-6"
>
<div
class=
"col-md-6"
>
<span
class=
"help-block"
>
<span
class=
"help-block"
>
{{
targe
tBranch
}}
{{
curren
tBranch
}}
</span>
</span>
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/repo/components/repo_edit_button.vue
View file @
e0df4a9e
...
@@ -26,16 +26,6 @@ export default {
...
@@ -26,16 +26,6 @@ export default {
this
.
editMode
=
!
this
.
editMode
;
this
.
editMode
=
!
this
.
editMode
;
Store
.
toggleBlobView
();
Store
.
toggleBlobView
();
},
},
toggleProjectRefsForm
()
{
$
(
'
.project-refs-form
'
).
toggleClass
(
'
disabled
'
,
this
.
editMode
);
$
(
'
.js-tree-ref-target-holder
'
).
toggle
(
this
.
editMode
);
},
},
watch
:
{
editMode
()
{
this
.
toggleProjectRefsForm
();
},
},
},
};
};
</
script
>
</
script
>
...
...
app/assets/javascripts/repo/index.js
View file @
e0df4a9e
...
@@ -11,9 +11,6 @@ function initDropdowns() {
...
@@ -11,9 +11,6 @@ function initDropdowns() {
}
}
function
addEventsForNonVueEls
()
{
function
addEventsForNonVueEls
()
{
$
(
document
).
on
(
'
change
'
,
'
.dropdown
'
,
()
=>
{
Store
.
targetBranch
=
$
(
'
.project-refs-target-form input[name="ref"]
'
).
val
();
});
window
.
onbeforeunload
=
function
confirmUnload
(
e
)
{
window
.
onbeforeunload
=
function
confirmUnload
(
e
)
{
const
hasChanged
=
Store
.
openedFiles
const
hasChanged
=
Store
.
openedFiles
...
...
app/assets/javascripts/repo/stores/repo_store.js
View file @
e0df4a9e
...
@@ -32,7 +32,6 @@ const RepoStore = {
...
@@ -32,7 +32,6 @@ const RepoStore = {
isCommitable
:
false
,
isCommitable
:
false
,
binary
:
false
,
binary
:
false
,
currentBranch
:
''
,
currentBranch
:
''
,
targetBranch
:
'
new-branch
'
,
commitMessage
:
''
,
commitMessage
:
''
,
binaryTypes
:
{
binaryTypes
:
{
png
:
false
,
png
:
false
,
...
...
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