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
2a26b12c
Commit
2a26b12c
authored
Apr 05, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ee-fix-groups-long-url' into 'master'
Ee fix groups long url See merge request !1568
parents
da36ac0f
f9c52bae
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/javascripts/groups_select.js
app/assets/javascripts/groups_select.js
+2
-2
changelogs/unreleased/fix-groups-long-url.yml
changelogs/unreleased/fix-groups-long-url.yml
+4
-0
No files found.
app/assets/javascripts/groups_select.js
View file @
2a26b12c
...
...
@@ -45,14 +45,14 @@ window.GroupsSelect = (function() {
page
,
per_page
:
GroupsSelect
.
PER_PAGE
,
all_available
,
skip_groups
,
};
},
results
:
function
(
data
,
page
)
{
if
(
data
.
length
)
return
{
results
:
[]
};
const
result
s
=
data
.
length
?
data
:
data
.
results
||
[];
const
group
s
=
data
.
length
?
data
:
data
.
results
||
[];
const
more
=
data
.
pagination
?
data
.
pagination
.
more
:
false
;
const
results
=
groups
.
filter
(
group
=>
skip_groups
.
indexOf
(
group
.
id
)
===
-
1
);
return
{
results
,
...
...
changelogs/unreleased/fix-groups-long-url.yml
0 → 100644
View file @
2a26b12c
---
title
:
Skip groups validation on the client
merge_request
:
author
:
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