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
7bf26235
Commit
7bf26235
authored
Nov 27, 2018
by
Dennis Tang
Committed by
Rubén Dávila
Nov 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport: Callout CSS, group edit selection JS
parent
55f6eadc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
2 deletions
+15
-2
app/assets/javascripts/groups_select.js
app/assets/javascripts/groups_select.js
+6
-1
app/assets/javascripts/pages/groups/edit/index.js
app/assets/javascripts/pages/groups/edit/index.js
+4
-0
app/assets/stylesheets/framework/callout.scss
app/assets/stylesheets/framework/callout.scss
+5
-1
No files found.
app/assets/javascripts/groups_select.js
View file @
7bf26235
...
@@ -10,13 +10,18 @@ export default function groupsSelect() {
...
@@ -10,13 +10,18 @@ export default function groupsSelect() {
const
$select
=
$
(
this
);
const
$select
=
$
(
this
);
const
allAvailable
=
$select
.
data
(
'
allAvailable
'
);
const
allAvailable
=
$select
.
data
(
'
allAvailable
'
);
const
skipGroups
=
$select
.
data
(
'
skipGroups
'
)
||
[];
const
skipGroups
=
$select
.
data
(
'
skipGroups
'
)
||
[];
const
parentGroupID
=
$select
.
data
(
'
parentId
'
);
const
groupsPath
=
parentGroupID
?
Api
.
subgroupsPath
.
replace
(
'
:id
'
,
parentGroupID
)
:
Api
.
groupsPath
;
$select
.
select2
({
$select
.
select2
({
placeholder
:
'
Search for a group
'
,
placeholder
:
'
Search for a group
'
,
allowClear
:
$select
.
hasClass
(
'
allowClear
'
),
allowClear
:
$select
.
hasClass
(
'
allowClear
'
),
multiple
:
$select
.
hasClass
(
'
multiselect
'
),
multiple
:
$select
.
hasClass
(
'
multiselect
'
),
minimumInputLength
:
0
,
minimumInputLength
:
0
,
ajax
:
{
ajax
:
{
url
:
Api
.
buildUrl
(
Api
.
groupsPath
),
url
:
Api
.
buildUrl
(
groupsPath
),
dataType
:
'
json
'
,
dataType
:
'
json
'
,
quietMillis
:
250
,
quietMillis
:
250
,
transport
(
params
)
{
transport
(
params
)
{
...
...
app/assets/javascripts/pages/groups/edit/index.js
View file @
7bf26235
...
@@ -5,6 +5,7 @@ import initSettingsPanels from '~/settings_panels';
...
@@ -5,6 +5,7 @@ import initSettingsPanels from '~/settings_panels';
import
dirtySubmitFactory
from
'
~/dirty_submit/dirty_submit_factory
'
;
import
dirtySubmitFactory
from
'
~/dirty_submit/dirty_submit_factory
'
;
import
mountBadgeSettings
from
'
~/pages/shared/mount_badge_settings
'
;
import
mountBadgeSettings
from
'
~/pages/shared/mount_badge_settings
'
;
import
{
GROUP_BADGE
}
from
'
~/badges/constants
'
;
import
{
GROUP_BADGE
}
from
'
~/badges/constants
'
;
import
groupsSelect
from
'
~/groups_select
'
;
import
projectSelect
from
'
~/project_select
'
;
import
projectSelect
from
'
~/project_select
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
...
@@ -17,5 +18,8 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -17,5 +18,8 @@ document.addEventListener('DOMContentLoaded', () => {
);
);
mountBadgeSettings
(
GROUP_BADGE
);
mountBadgeSettings
(
GROUP_BADGE
);
// Initialize Subgroups selector
groupsSelect
();
projectSelect
();
projectSelect
();
});
});
app/assets/stylesheets/framework/callout.scss
View file @
7bf26235
...
@@ -33,7 +33,11 @@
...
@@ -33,7 +33,11 @@
.bs-callout-warning
{
.bs-callout-warning
{
background-color
:
$orange-100
;
background-color
:
$orange-100
;
border-color
:
$orange-200
;
border-color
:
$orange-200
;
color
:
$orange-700
;
color
:
$orange-900
;
a
{
color
:
$orange-900
;
}
}
}
.bs-callout-info
{
.bs-callout-info
{
...
...
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