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
45593d1a
Commit
45593d1a
authored
Feb 05, 2020
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve text messages in IDE commit actions
parent
8c8aaefc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
...ets/javascripts/ide/components/commit_sidebar/actions.vue
+4
-4
changelogs/unreleased/fe-ide-minor-improvements-for-commit-options.yml
...released/fe-ide-minor-improvements-for-commit-options.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-3
No files found.
app/assets/javascripts/ide/components/commit_sidebar/actions.vue
View file @
45593d1a
<
script
>
import
_
from
'
underscore
'
;
import
{
mapState
,
mapGetters
,
createNamespacedHelpers
}
from
'
vuex
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
{
sprintf
,
s
__
}
from
'
~/locale
'
;
import
consts
from
'
../../stores/modules/commit/constants
'
;
import
RadioGroup
from
'
./radio_group.vue
'
;
import
NewMergeRequestOption
from
'
./new_merge_request_option.vue
'
;
...
...
@@ -21,7 +21,7 @@ export default {
...
mapGetters
([
'
currentBranch
'
]),
commitToCurrentBranchText
()
{
return
sprintf
(
__
(
'
Commit to %{branchName} branch
'
),
s__
(
'
IDE|
Commit to %{branchName} branch
'
),
{
branchName
:
`<strong class="monospace">
${
_
.
escape
(
this
.
currentBranchId
)}
</strong>`
},
false
,
);
...
...
@@ -56,8 +56,8 @@ export default {
},
commitToCurrentBranch
:
consts
.
COMMIT_TO_CURRENT_BRANCH
,
commitToNewBranch
:
consts
.
COMMIT_TO_NEW_BRANCH
,
currentBranchPermissionsTooltip
:
__
(
"
This option is disabled as you don't have write permissions for the current branch
"
,
currentBranchPermissionsTooltip
:
s
__
(
"
IDE|This option is disabled because you don't have write permissions for the current branch.
"
,
),
};
</
script
>
...
...
changelogs/unreleased/fe-ide-minor-improvements-for-commit-options.yml
0 → 100644
View file @
45593d1a
---
title
:
Minor text update to IDE commit to branch disabled tooltip
merge_request
:
24521
author
:
type
:
other
locale/gitlab.pot
View file @
45593d1a
...
...
@@ -10040,6 +10040,9 @@ msgstr ""
msgid "IDE|Commit"
msgstr ""
msgid "IDE|Commit to %{branchName} branch"
msgstr ""
msgid "IDE|Edit"
msgstr ""
...
...
@@ -10067,6 +10070,9 @@ msgstr ""
msgid "IDE|Successful commit"
msgstr ""
msgid "IDE|This option is disabled because you don't have write permissions for the current branch."
msgstr ""
msgid "IP Address"
msgstr ""
...
...
@@ -19464,9 +19470,6 @@ msgstr ""
msgid "This namespace has already been taken! Please choose another one."
msgstr ""
msgid "This option is disabled as you don't have write permissions for the current branch"
msgstr ""
msgid "This option is only available on GitLab.com"
msgstr ""
...
...
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