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
6e23c1b6
Commit
6e23c1b6
authored
4 years ago
by
Natalia Tepluhina
Committed by
Mark Florian
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Returned to_i method"
This reverts commit 3686f5f5359bf816353a197b459e26f389917262.
parent
5f46d0b1
No related merge requests found
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
17 deletions
+34
-17
app/assets/javascripts/groups/components/group_folder.vue
app/assets/javascripts/groups/components/group_folder.vue
+1
-1
app/assets/javascripts/groups/constants.js
app/assets/javascripts/groups/constants.js
+1
-1
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+26
-9
app/views/groups/_subgroups_and_projects.html.haml
app/views/groups/_subgroups_and_projects.html.haml
+1
-1
spec/features/dashboard/groups_list_spec.rb
spec/features/dashboard/groups_list_spec.rb
+1
-1
spec/features/explore/groups_list_spec.rb
spec/features/explore/groups_list_spec.rb
+4
-4
No files found.
app/assets/javascripts/groups/components/group_folder.vue
View file @
6e23c1b6
...
@@ -35,7 +35,7 @@ export default {
...
@@ -35,7 +35,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<ul
class=
"
content
-list group-list-tree"
>
<ul
class=
"
groups
-list group-list-tree"
>
<group-item
<group-item
v-for=
"(group, index) in groups"
v-for=
"(group, index) in groups"
:key=
"index"
:key=
"index"
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/groups/constants.js
View file @
6e23c1b6
...
@@ -8,7 +8,7 @@ export const ACTIVE_TAB_ARCHIVED = 'archived';
...
@@ -8,7 +8,7 @@ export const ACTIVE_TAB_ARCHIVED = 'archived';
export
const
GROUPS_LIST_HOLDER_CLASS
=
'
.js-groups-list-holder
'
;
export
const
GROUPS_LIST_HOLDER_CLASS
=
'
.js-groups-list-holder
'
;
export
const
GROUPS_FILTER_FORM_CLASS
=
'
.js-group-filter-form
'
;
export
const
GROUPS_FILTER_FORM_CLASS
=
'
.js-group-filter-form
'
;
export
const
CONTENT_LIST_CLASS
=
'
.
content
-list
'
;
export
const
CONTENT_LIST_CLASS
=
'
.
groups
-list
'
;
export
const
COMMON_STR
=
{
export
const
COMMON_STR
=
{
FAILURE
:
__
(
'
An error occurred. Please try again.
'
),
FAILURE
:
__
(
'
An error occurred. Please try again.
'
),
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/groups.scss
View file @
6e23c1b6
...
@@ -8,6 +8,32 @@
...
@@ -8,6 +8,32 @@
}
}
}
}
.groups-list
{
@include
basic-list
;
display
:
flex
;
flex-direction
:
column
;
margin
:
0
;
.group-row-contents
.controls
>
.btn
:last-child
{
margin
:
0
;
}
li
{
.title
{
font-weight
:
600
;
}
a
{
color
:
$gray-900
;
text-decoration
:
none
;
&
:hover
{
text-decoration
:
underline
;
}
}
}
}
.group-root-path
{
.group-root-path
{
max-width
:
40vw
;
max-width
:
40vw
;
overflow
:
hidden
;
overflow
:
hidden
;
...
@@ -15,11 +41,6 @@
...
@@ -15,11 +41,6 @@
word-wrap
:
nowrap
;
word-wrap
:
nowrap
;
}
}
.content-list
.group-name
{
font-weight
:
$gl-font-weight-bold
;
color
:
$pages-group-name-color
;
}
.group-row
{
.group-row
{
@include
basic-list-stats
;
@include
basic-list-stats
;
...
@@ -322,10 +343,6 @@ table.pipeline-project-metrics tr td {
...
@@ -322,10 +343,6 @@ table.pipeline-project-metrics tr td {
}
}
}
}
.content-list
li
:last-child
{
padding-bottom
:
0
;
}
.group-list-tree
{
.group-list-tree
{
margin-bottom
:
0
;
margin-bottom
:
0
;
margin-left
:
30px
;
margin-left
:
30px
;
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/_subgroups_and_projects.html.haml
View file @
6e23c1b6
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.empty-state.hidden
.empty-state.hidden
=
render
"shared/groups/empty_state"
=
render
"shared/groups/empty_state"
%
ul
.content-list
{
data:
{
hide_projects:
'false'
,
group_id:
group
.
id
,
path:
group_path
(
group
)
}
}
%
section
{
data:
{
hide_projects:
'false'
,
group_id:
group
.
id
,
path:
group_path
(
group
)
}
}
.js-groups-list-holder
.js-groups-list-holder
.loading-container.text-center.prepend-top-20
.loading-container.text-center.prepend-top-20
.spinner.spinner-md
.spinner.spinner-md
This diff is collapsed.
Click to expand it.
spec/features/dashboard/groups_list_spec.rb
View file @
6e23c1b6
...
@@ -77,7 +77,7 @@ describe 'Dashboard Groups page', :js do
...
@@ -77,7 +77,7 @@ describe 'Dashboard Groups page', :js do
expect
(
page
).
to
have_content
(
group
.
name
)
expect
(
page
).
to
have_content
(
group
.
name
)
expect
(
page
).
to
have_content
(
nested_group
.
parent
.
name
)
expect
(
page
).
to
have_content
(
nested_group
.
parent
.
name
)
expect
(
page
).
not_to
have_content
(
another_group
.
name
)
expect
(
page
).
not_to
have_content
(
another_group
.
name
)
expect
(
page
.
all
(
'.js-groups-list-holder .
content
-list li'
).
length
).
to
eq
2
expect
(
page
.
all
(
'.js-groups-list-holder .
groups
-list li'
).
length
).
to
eq
2
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/features/explore/groups_list_spec.rb
View file @
6e23c1b6
...
@@ -47,26 +47,26 @@ describe 'Explore Groups page', :js do
...
@@ -47,26 +47,26 @@ describe 'Explore Groups page', :js do
expect
(
page
).
to
have_content
(
group
.
full_name
)
expect
(
page
).
to
have_content
(
group
.
full_name
)
expect
(
page
).
to
have_content
(
public_group
.
full_name
)
expect
(
page
).
to
have_content
(
public_group
.
full_name
)
expect
(
page
).
not_to
have_content
(
private_group
.
full_name
)
expect
(
page
).
not_to
have_content
(
private_group
.
full_name
)
expect
(
page
.
all
(
'.js-groups-list-holder .
content
-list li'
).
length
).
to
eq
2
expect
(
page
.
all
(
'.js-groups-list-holder .
groups
-list li'
).
length
).
to
eq
2
end
end
it
'shows non-archived projects count'
do
it
'shows non-archived projects count'
do
# Initially project is not archived
# Initially project is not archived
expect
(
find
(
'.js-groups-list-holder .
content
-list li:first-child .stats .number-projects'
)).
to
have_text
(
"1"
)
expect
(
find
(
'.js-groups-list-holder .
groups
-list li:first-child .stats .number-projects'
)).
to
have_text
(
"1"
)
# Archive project
# Archive project
::
Projects
::
UpdateService
.
new
(
empty_project
,
user
,
archived:
true
).
execute
::
Projects
::
UpdateService
.
new
(
empty_project
,
user
,
archived:
true
).
execute
visit
explore_groups_path
visit
explore_groups_path
# Check project count
# Check project count
expect
(
find
(
'.js-groups-list-holder .
content
-list li:first-child .stats .number-projects'
)).
to
have_text
(
"0"
)
expect
(
find
(
'.js-groups-list-holder .
groups
-list li:first-child .stats .number-projects'
)).
to
have_text
(
"0"
)
# Unarchive project
# Unarchive project
::
Projects
::
UpdateService
.
new
(
empty_project
,
user
,
archived:
false
).
execute
::
Projects
::
UpdateService
.
new
(
empty_project
,
user
,
archived:
false
).
execute
visit
explore_groups_path
visit
explore_groups_path
# Check project count
# Check project count
expect
(
find
(
'.js-groups-list-holder .
content
-list li:first-child .stats .number-projects'
)).
to
have_text
(
"1"
)
expect
(
find
(
'.js-groups-list-holder .
groups
-list li:first-child .stats .number-projects'
)).
to
have_text
(
"1"
)
end
end
describe
'landing component'
do
describe
'landing component'
do
...
...
This diff is collapsed.
Click to expand it.
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