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
adce7bbf
Commit
adce7bbf
authored
May 17, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Automatically close user dropdown for CE (EE conflict)
parent
e4003ebd
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
1 deletion
+33
-1
app/assets/javascripts/test.js
app/assets/javascripts/test.js
+1
-0
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+11
-0
app/assets/stylesheets/test.scss
app/assets/stylesheets/test.scss
+17
-0
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+2
-0
app/views/shared/issuable/_sidebar_assignees.html.haml
app/views/shared/issuable/_sidebar_assignees.html.haml
+0
-1
config/application.rb
config/application.rb
+1
-0
config/webpack.config.js
config/webpack.config.js
+1
-0
No files found.
app/assets/javascripts/test.js
0 → 100644
View file @
adce7bbf
$
.
fx
.
off
=
true
;
app/assets/javascripts/users_select.js
View file @
adce7bbf
...
@@ -421,6 +421,17 @@ window.emitSidebarEvent = window.emitSidebarEvent || $.noop;
...
@@ -421,6 +421,17 @@ window.emitSidebarEvent = window.emitSidebarEvent || $.noop;
selected
=
$dropdown
.
closest
(
'
.selectbox
'
).
find
(
"
input[name='
"
+
(
$dropdown
.
data
(
'
field-name
'
))
+
"
']
"
).
val
();
selected
=
$dropdown
.
closest
(
'
.selectbox
'
).
find
(
"
input[name='
"
+
(
$dropdown
.
data
(
'
field-name
'
))
+
"
']
"
).
val
();
return
assignTo
(
selected
);
return
assignTo
(
selected
);
}
}
// Automatically close dropdown after assignee is selected
// since CE has no multiple assignees
// EE does not have a max-select
if
(
$dropdown
.
data
(
'
max-select
'
)
&&
getSelected
().
length
===
$dropdown
.
data
(
'
max-select
'
))
{
// Close the dropdown
$dropdown
.
dropdown
(
'
toggle
'
);
this
.
hidden
();
}
},
},
id
:
function
(
user
)
{
id
:
function
(
user
)
{
return
user
.
id
;
return
user
.
id
;
...
...
app/assets/stylesheets/test.scss
0 → 100644
View file @
adce7bbf
*
{
-o-transition
:
none
!
important
;
-moz-transition
:
none
!
important
;
-ms-transition
:
none
!
important
;
-webkit-transition
:
none
!
important
;
transition
:
none
!
important
;
-o-transform
:
none
!
important
;
-moz-transform
:
none
!
important
;
-ms-transform
:
none
!
important
;
-webkit-transform
:
none
!
important
;
transform
:
none
!
important
;
-webkit-animation
:
none
!
important
;
-moz-animation
:
none
!
important
;
-o-animation
:
none
!
important
;
-ms-animation
:
none
!
important
;
animation
:
none
!
important
;
}
app/views/layouts/_head.html.haml
View file @
adce7bbf
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
=
stylesheet_link_tag
"application"
,
media:
"all"
=
stylesheet_link_tag
"application"
,
media:
"all"
=
stylesheet_link_tag
"print"
,
media:
"print"
=
stylesheet_link_tag
"print"
,
media:
"print"
=
stylesheet_link_tag
"test"
,
media:
"all"
if
Rails
.
env
.
test?
=
Gon
::
Base
.
render_data
=
Gon
::
Base
.
render_data
...
@@ -34,6 +35,7 @@
...
@@ -34,6 +35,7 @@
=
webpack_bundle_tag
"common"
=
webpack_bundle_tag
"common"
=
webpack_bundle_tag
"main"
=
webpack_bundle_tag
"main"
=
webpack_bundle_tag
"raven"
if
current_application_settings
.
clientside_sentry_enabled
=
webpack_bundle_tag
"raven"
if
current_application_settings
.
clientside_sentry_enabled
=
webpack_bundle_tag
"test"
if
Rails
.
env
.
test?
-
if
content_for?
(
:page_specific_javascripts
)
-
if
content_for?
(
:page_specific_javascripts
)
=
yield
:page_specific_javascripts
=
yield
:page_specific_javascripts
...
...
app/views/shared/issuable/_sidebar_assignees.html.haml
View file @
adce7bbf
...
@@ -42,7 +42,6 @@
...
@@ -42,7 +42,6 @@
-
options
[
:data
][
:multi_select
]
=
true
-
options
[
:data
][
:multi_select
]
=
true
-
options
[
:data
][
'dropdown-title'
]
=
title
-
options
[
:data
][
'dropdown-title'
]
=
title
-
options
[
:data
][
'dropdown-header'
]
=
'Assignee'
-
options
[
:data
][
'dropdown-header'
]
=
'Assignee'
-
options
[
:data
][
'max-select'
]
=
1
-
else
-
else
-
title
=
'Select assignee'
-
title
=
'Select assignee'
...
...
config/application.rb
View file @
adce7bbf
...
@@ -111,6 +111,7 @@ module Gitlab
...
@@ -111,6 +111,7 @@ module Gitlab
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"vendor/assets/fonts/*"
config
.
assets
.
precompile
<<
"vendor/assets/fonts/*"
config
.
assets
.
precompile
<<
"test.css"
# Version of your assets, change this if you want to expire all your assets
# Version of your assets, change this if you want to expire all your assets
config
.
assets
.
version
=
'1.0'
config
.
assets
.
version
=
'1.0'
...
...
config/webpack.config.js
View file @
adce7bbf
...
@@ -65,6 +65,7 @@ var config = {
...
@@ -65,6 +65,7 @@ var config = {
users
:
'
./users/users_bundle.js
'
,
users
:
'
./users/users_bundle.js
'
,
raven
:
'
./raven/index.js
'
,
raven
:
'
./raven/index.js
'
,
vue_merge_request_widget
:
'
./vue_merge_request_widget/index.js
'
,
vue_merge_request_widget
:
'
./vue_merge_request_widget/index.js
'
,
test
:
'
./test.js
'
,
},
},
output
:
{
output
:
{
...
...
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