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
99c263ad
Commit
99c263ad
authored
Dec 27, 2016
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated some tests descriptions to represent the correct settings path
Updated the js from the member_expiration_date to es6
parent
cfd8f635
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
10 deletions
+6
-10
app/assets/javascripts/member_expiration_date.js.es6
app/assets/javascripts/member_expiration_date.js.es6
+3
-7
spec/features/security/project/internal_access_spec.rb
spec/features/security/project/internal_access_spec.rb
+1
-1
spec/features/security/project/private_access_spec.rb
spec/features/security/project/private_access_spec.rb
+1
-1
spec/features/security/project/public_access_spec.rb
spec/features/security/project/public_access_spec.rb
+1
-1
No files found.
app/assets/javascripts/member_expiration_date.js
→
app/assets/javascripts/member_expiration_date.js
.es6
View file @
99c263ad
/* eslint-disable func-names, space-before-function-paren, vars-on-top, no-var, object-shorthand, comma-dangle, max-len */
/* eslint-disable func-names, space-before-function-paren, vars-on-top, no-var, object-shorthand, comma-dangle, max-len */
(
function
()
{
(
() =>
{
// Add datepickers to all `js-access-expiration-date` elements. If those elements are
// Add datepickers to all `js-access-expiration-date` elements. If those elements are
// children of an element with the `clearable-input` class, and have a sibling
// children of an element with the `clearable-input` class, and have a sibling
// `js-clear-input` element, then show that element when there is a value in the
// `js-clear-input` element, then show that element when there is a value in the
// datepicker, and make clicking on that element clear the field.
// datepicker, and make clicking on that element clear the field.
//
//
gl
.
MemberExpirationDate
=
function
(
newSelector
)
{
gl.MemberExpirationDate =
(selector = '.js-access-expiration-date') =>
{
function toggleClearInput() {
function toggleClearInput() {
$(this).closest('.clearable-input').toggleClass('has-value', $(this).val() !== '');
$(this).closest('.clearable-input').toggleClass('has-value', $(this).val() !== '');
}
}
var
selector
=
'
.js-access-expiration-date
'
;
if
(
typeof
newSelector
!==
'
undefined
'
&&
newSelector
!==
''
)
{
selector
=
newSelector
;
}
var inputs = $(selector);
var inputs = $(selector);
inputs.datepicker({
inputs.datepicker({
...
@@ -25,7 +21,7 @@
...
@@ -25,7 +21,7 @@
}
}
});
});
inputs
.
next
(
'
.js-clear-input
'
).
on
(
'
click
'
,
function
(
event
)
{
inputs.next('.js-clear-input').on('click',
(event) =>
{
event.preventDefault();
event.preventDefault();
var input = $(this).closest('.clearable-input').find(selector);
var input = $(this).closest('.clearable-input').find(selector);
...
...
spec/features/security/project/internal_access_spec.rb
View file @
99c263ad
...
@@ -82,7 +82,7 @@ describe "Internal Project Access", feature: true do
...
@@ -82,7 +82,7 @@ describe "Internal Project Access", feature: true do
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
end
end
describe
"GET /:project_path/settings/
project_
members"
do
describe
"GET /:project_path/settings/members"
do
subject
{
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
...
...
spec/features/security/project/private_access_spec.rb
View file @
99c263ad
...
@@ -82,7 +82,7 @@ describe "Private Project Access", feature: true do
...
@@ -82,7 +82,7 @@ describe "Private Project Access", feature: true do
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
end
end
describe
"GET /:project_path/settings/
project_
members"
do
describe
"GET /:project_path/settings/members"
do
subject
{
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
...
...
spec/features/security/project/public_access_spec.rb
View file @
99c263ad
...
@@ -82,7 +82,7 @@ describe "Public Project Access", feature: true do
...
@@ -82,7 +82,7 @@ describe "Public Project Access", feature: true do
it
{
is_expected
.
to
be_allowed_for
(
:visitor
)
}
it
{
is_expected
.
to
be_allowed_for
(
:visitor
)
}
end
end
describe
"GET /:project_path/settings/
project_
members"
do
describe
"GET /:project_path/settings/members"
do
subject
{
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
}
subject
{
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
...
...
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