BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a65f07a2
Commit
a65f07a2
authored
Jun 07, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address feedback
parent
a7936b2f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
3 deletions
+18
-3
index.js
app/assets/javascripts/groups/index.js
+1
-2
lists.scss
app/assets/stylesheets/framework/lists.scss
+0
-1
webpack.config.js
config/webpack.config.js
+1
-0
group_item_spec.js
spec/javascripts/groups/group_item_spec.js
+4
-0
groups_spec.js
spec/javascripts/groups/groups_spec.js
+4
-0
common_utils_spec.js
spec/javascripts/lib/utils/common_utils_spec.js
+8
-0
No files found.
app/assets/javascripts/groups/index.js
View file @
a65f07a2
/* global Flash */
import
Vue
from
'vue'
;
import
GroupsList
from
'~/groups_list'
;
import
GroupFilterableList
from
'./groups_filterable_list'
;
import
GroupsComponent
from
'./components/groups.vue'
;
import
GroupFolder
from
'./components/group_folder.vue'
;
...
...
@@ -181,6 +180,6 @@ document.addEventListener('DOMContentLoaded', () => {
eventHub
.
$off
(
'leaveGroup'
,
this
.
leaveGroup
);
eventHub
.
$off
(
'updateGroups'
,
this
.
updateGroups
);
eventHub
.
$off
(
'updatePagination'
,
this
.
updatePagination
);
}
}
,
});
});
app/assets/stylesheets/framework/lists.scss
View file @
a65f07a2
...
...
@@ -304,7 +304,6 @@ ul.indent-list {
.group-list-tree
{
margin-bottom
:
0
;
margin-left
:
20px
;
// border-top: solid 1px $border-white-light;
position
:
relative
;
&
:
:
before
{
...
...
config/webpack.config.js
View file @
a65f07a2
...
...
@@ -156,6 +156,7 @@ var config = {
'environments'
,
'environments_folder'
,
'filtered_search'
,
'groups'
,
'issue_show'
,
'merge_conflicts'
,
'notebook_viewer'
,
...
...
spec/javascripts/groups/group_item_spec.js
View file @
a65f07a2
...
...
@@ -26,6 +26,10 @@ describe('Groups Component', () => {
});
});
afterEach
(()
=>
{
component
.
$destroy
();
});
it
(
'should render the group item correctly'
,
()
=>
{
expect
(
component
.
$el
.
classList
.
contains
(
'group-row'
)).
toBe
(
true
);
expect
(
component
.
$el
.
classList
.
contains
(
'.no-description'
)).
toBe
(
false
);
...
...
spec/javascripts/groups/groups_spec.js
View file @
a65f07a2
...
...
@@ -34,6 +34,10 @@ describe('Groups Component', () => {
});
});
afterEach
(()
=>
{
component
.
$destroy
();
});
describe
(
'with data'
,
()
=>
{
it
(
'should render a list of groups'
,
()
=>
{
expect
(
component
.
$el
.
classList
.
contains
(
'groups-list-tree-container'
)).
toBe
(
true
);
...
...
spec/javascripts/lib/utils/common_utils_spec.js
View file @
a65f07a2
...
...
@@ -150,6 +150,14 @@ import '~/lib/utils/common_utils';
const
value
=
gl
.
utils
.
getParameterByName
(
'fakeParameter'
);
expect
(
value
).
toBe
(
null
);
});
it
(
'should return valid paramentes if URL is provided'
,
()
=>
{
let
value
=
gl
.
utils
.
getParameterByName
(
'foo'
,
'http://cocteau.twins/?foo=bar'
);
expect
(
value
).
toBe
(
'bar'
);
value
=
gl
.
utils
.
getParameterByName
(
'manan'
,
'http://cocteau.twins/?foo=bar&manan=canchu'
);
expect
(
value
).
toBe
(
'canchu'
);
});
});
describe
(
'gl.utils.normalizedHeaders'
,
()
=>
{
...
...
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