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
e3569c70
Commit
e3569c70
authored
Aug 27, 2019
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit to current branch by default
When using the Web IDE
parent
6308c0ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
...ets/javascripts/ide/components/commit_sidebar/actions.vue
+5
-1
qa/qa/page/project/web_ide/edit.rb
qa/qa/page/project/web_ide/edit.rb
+5
-1
No files found.
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
View file @
e3569c70
...
...
@@ -69,7 +69,11 @@ export default {
:disabled=
"currentBranch && !currentBranch.can_push"
:title=
"$options.currentBranchPermissionsTooltip"
>
<span
class=
"ide-radio-label"
v-html=
"commitToCurrentBranchText"
>
</span>
<span
class=
"ide-radio-label"
data-qa-selector=
"commit_to_current_branch_radio"
v-html=
"commitToCurrentBranchText"
></span>
</radio-group>
<radio-group
:value=
"$options.commitToNewBranch"
...
...
qa/qa/page/project/web_ide/edit.rb
View file @
e3569c70
...
...
@@ -34,6 +34,10 @@ module QA
element
:dropdown_filter_input
end
view
'app/assets/javascripts/ide/components/commit_sidebar/actions.vue'
do
element
:commit_to_current_branch_radio
end
view
'app/assets/javascripts/ide/components/commit_sidebar/form.vue'
do
element
:begin_commit_button
element
:commit_button
...
...
@@ -104,7 +108,7 @@ module QA
# animation is still in process even when the buttons have the
# expected visibility.
commit_success_msg_shown
=
retry_until
do
uncheck_element
:start_new_mr_checkbox
click_element
:commit_to_current_branch_radio
click_element
:commit_button
wait
(
reload:
false
)
do
...
...
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