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
5dffd21c
Commit
5dffd21c
authored
Jul 28, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error message for existing labels.
parent
279c61f3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
CHANGELOG
CHANGELOG
+3
-0
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+7
-5
No files found.
CHANGELOG
View file @
5dffd21c
...
@@ -112,6 +112,9 @@ v 8.10.3
...
@@ -112,6 +112,9 @@ v 8.10.3
- Fix importer for GitHub Pull Requests when a branch was removed. !5573
- Fix importer for GitHub Pull Requests when a branch was removed. !5573
- Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured. !5584
- Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured. !5584
- Trim extra displayed carriage returns in diffs and files with CRLFs. !5588
- Trim extra displayed carriage returns in diffs and files with CRLFs. !5588
- Fix label already exist error message in the right sidebar.
v 8.10.3 (unreleased)
v 8.10.2
v 8.10.2
- User can now search branches by name. !5144
- User can now search branches by name. !5144
...
...
app/assets/javascripts/labels_select.js
View file @
5dffd21c
...
@@ -70,13 +70,15 @@
...
@@ -70,13 +70,15 @@
name
:
newLabelField
.
val
(),
name
:
newLabelField
.
val
(),
color
:
newColorField
.
val
()
color
:
newColorField
.
val
()
},
function
(
label
)
{
},
function
(
label
)
{
var
errors
;
$newLabelCreateButton
.
enable
();
$newLabelCreateButton
.
enable
();
if
(
label
.
message
!=
null
)
{
if
(
label
.
message
!=
null
)
{
errors
=
_
.
map
(
label
.
message
,
function
(
value
,
key
)
{
var
errorText
=
label
.
message
;
if
(
_
.
isObject
(
label
.
message
))
{
errorText
=
_
.
map
(
label
.
message
,
function
(
value
,
key
)
{
return
key
+
"
"
+
value
[
0
];
return
key
+
"
"
+
value
[
0
];
});
}).
join
(
'
<br/>
'
);
return
$newLabelError
.
html
(
errors
.
join
(
"
<br/>
"
)).
show
();
}
return
$newLabelError
.
html
(
errorText
).
show
();
}
else
{
}
else
{
return
$
(
'
.dropdown-menu-back
'
,
$dropdown
.
parent
()).
trigger
(
'
click
'
);
return
$
(
'
.dropdown-menu-back
'
,
$dropdown
.
parent
()).
trigger
(
'
click
'
);
}
}
...
...
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