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
bd3203b8
Commit
bd3203b8
authored
Oct 31, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead code and align with some JS code from CE
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
7a1a90f2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
10 deletions
+7
-10
app/assets/javascripts/admin_email_select.js
app/assets/javascripts/admin_email_select.js
+1
-1
app/assets/javascripts/groups_select.js
app/assets/javascripts/groups_select.js
+3
-3
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+0
-3
app/assets/javascripts/merge_request_widget.js.es6
app/assets/javascripts/merge_request_widget.js.es6
+3
-3
No files found.
app/assets/javascripts/admin_email_select.js
View file @
bd3203b8
...
...
@@ -13,7 +13,7 @@
minimumInputLength
:
0
,
query
:
function
(
query
)
{
var
group_result
,
project_result
;
group_result
=
Api
.
groups
(
query
.
term
,
{
skip_ldap
:
skip_ldap
},
function
(
groups
)
{
group_result
=
Api
.
groups
(
query
.
term
,
{},
function
(
groups
)
{
return
groups
;
});
project_result
=
Api
.
projects
(
query
.
term
,
'
id
'
,
function
(
projects
)
{
...
...
app/assets/javascripts/groups_select.js
View file @
bd3203b8
/* eslint-disable */
(
function
()
{
var
slice
=
[].
slice
;
...
...
@@ -5,8 +6,7 @@
function
GroupsSelect
()
{
$
(
'
.ajax-groups-select
'
).
each
((
function
(
_this
)
{
return
function
(
i
,
select
)
{
var
skip_ldap
,
all_available
,
skip_groups
;
skip_ldap
=
$
(
select
).
hasClass
(
'
skip_ldap
'
);
var
all_available
,
skip_groups
;
all_available
=
$
(
select
).
data
(
'
all-available
'
);
skip_groups
=
$
(
select
).
data
(
'
skip-groups
'
)
||
[];
return
$
(
select
).
select2
({
...
...
@@ -14,7 +14,7 @@
multiple
:
$
(
select
).
hasClass
(
'
multiselect
'
),
minimumInputLength
:
0
,
query
:
function
(
query
)
{
options
=
{
all_available
:
all_available
,
skip_groups
:
skip_groups
}
options
=
{
all_available
:
all_available
,
skip_groups
:
skip_groups
}
;
return
Api
.
groups
(
query
.
term
,
options
,
function
(
groups
)
{
var
data
;
data
=
{
...
...
app/assets/javascripts/lib/utils/common_utils.js
View file @
bd3203b8
...
...
@@ -35,9 +35,6 @@
}
});
};
gl
.
utils
.
capitalize
=
function
(
str
)
{
return
str
[
0
].
toUpperCase
()
+
str
.
slice
(
1
);
};
gl
.
utils
.
getPagePath
=
function
()
{
return
$
(
'
body
'
).
data
(
'
page
'
).
split
(
'
:
'
)[
0
];
};
...
...
app/assets/javascripts/merge_request_widget.js.es6
View file @
bd3203b8
...
...
@@ -105,7 +105,7 @@
callback = function() {
return merge_request_widget.mergeInProgress(deleteSourceBranch);
};
return setTimeout(callback,
1
000);
return setTimeout(callback,
2
000);
}
};
})(this),
...
...
@@ -228,11 +228,11 @@
if ($(`.mr-state-widget #${ environment.id }`).length) return;
const $template = $(DEPLOYMENT_TEMPLATE);
if (!environment.external_url || !environment.external_url_formatted) $('.js-environment-link', $template).remove();
if (!environment.stop_url) {
$('.js-stop-env-link', $template).remove();
}
if (environment.deployed_at && environment.deployed_at_formatted) {
environment.deployed_at = $.timeago(environment.deployed_at) + '.';
} else {
...
...
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