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
5bb9a78d
Commit
5bb9a78d
authored
Feb 23, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added missing i18n methods & aria-hidden
removed console.log
🙈
parent
898cf02e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
...ets/javascripts/ide/components/commit_sidebar/actions.vue
+2
-2
app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue
...javascripts/ide/components/commit_sidebar/radio_group.vue
+5
-1
app/assets/javascripts/ide/stores/modules/commit/actions.js
app/assets/javascripts/ide/stores/modules/commit/actions.js
+0
-1
No files found.
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
View file @
5bb9a78d
...
...
@@ -51,13 +51,13 @@
</radio-group>
<radio-group
:value=
"$options.commitToNewBranch"
label=
"Create a new branch
"
:label=
"__('Create a new branch')
"
:show-input=
"true"
:help-text=
"commitToNewBranchText"
/>
<radio-group
:value=
"$options.commitToNewBranchMR"
label=
"Create a new branch and merge request
"
:label=
"__('Create a new branch and merge request')
"
:show-input=
"true"
:help-text=
"newMergeRequestHelpText"
/>
...
...
app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue
View file @
5bb9a78d
...
...
@@ -71,7 +71,11 @@
class=
"help-block inline"
:title=
"helpText"
>
<i
class=
"fa fa-question-circle"
></i>
<i
class=
"fa fa-question-circle"
aria-hidden=
"true"
>
</i>
</span>
</span>
</label>
...
...
app/assets/javascripts/ide/stores/modules/commit/actions.js
View file @
5bb9a78d
...
...
@@ -146,7 +146,6 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState }) =
}
})
.
catch
((
err
)
=>
{
console
.
log
(
err
);
let
errMsg
=
__
(
'
Error committing changes. Please try again.
'
);
if
(
err
.
response
.
data
&&
err
.
response
.
data
.
message
)
{
errMsg
+=
` (
${
stripHtml
(
err
.
response
.
data
.
message
)}
)`
;
...
...
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