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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
9959669f
Commit
9959669f
authored
Feb 14, 2013
by
Andrew8xx8
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Desctiptions removed from dashboard
parent
3d4e3245
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
81 deletions
+13
-81
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+0
-2
app/assets/stylesheets/sections/groups.scss
app/assets/stylesheets/sections/groups.scss
+0
-31
app/assets/stylesheets/sections/teams.scss
app/assets/stylesheets/sections/teams.scss
+0
-31
app/views/dashboard/_groups.html.haml
app/views/dashboard/_groups.html.haml
+4
-6
app/views/dashboard/_teams.html.haml
app/views/dashboard/_teams.html.haml
+7
-9
features/steps/userteams/userteams.rb
features/steps/userteams/userteams.rb
+2
-2
No files found.
app/assets/stylesheets/application.scss
View file @
9959669f
...
@@ -20,8 +20,6 @@
...
@@ -20,8 +20,6 @@
@import
"sections/nav.scss"
;
@import
"sections/nav.scss"
;
@import
"sections/commits.scss"
;
@import
"sections/commits.scss"
;
@import
"sections/issues.scss"
;
@import
"sections/issues.scss"
;
@import
"sections/groups.scss"
;
@import
"sections/teams.scss"
;
@import
"sections/projects.scss"
;
@import
"sections/projects.scss"
;
@import
"sections/snippets.scss"
;
@import
"sections/snippets.scss"
;
@import
"sections/votes.scss"
;
@import
"sections/votes.scss"
;
...
...
app/assets/stylesheets/sections/groups.scss
deleted
100644 → 0
View file @
3d4e3245
.projects
{
@extend
.row
;
.activities
{
}
.side
{
@extend
.right
;
.groups_box
{
>
.title
{
padding
:
2px
15px
;
}
.well-list
{
li
{
padding
:
15px
;
}
.edit
{
float
:
right
;
margin
:
0
;
}
.description
{
padding-top
:
5px
;
display
:
block
;
span
,
strong
{
font-size
:
12px
;
color
:
#666
;
}
}
}
@extend
.ui-box
;
}
}
}
app/assets/stylesheets/sections/teams.scss
deleted
100644 → 0
View file @
3d4e3245
.projects
{
@extend
.row
;
.activities
{
}
.side
{
@extend
.right
;
.teams_box
{
>
.title
{
padding
:
2px
15px
;
}
.well-list
{
li
{
padding
:
15px
;
}
.edit
{
float
:
right
;
margin
:
0
;
}
.description
{
padding-top
:
5px
;
display
:
block
;
span
,
strong
{
font-size
:
12px
;
color
:
#666
;
}
}
}
@extend
.ui-box
;
}
}
}
app/views/dashboard/_groups.html.haml
View file @
9959669f
.
groups_
box
.
ui-
box
%h5
.title
%h5
.title
Groups
Groups
%small
%small
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
%li
%li
=
link_to
group_path
(
id:
group
.
path
),
class:
dom_class
(
group
)
do
=
link_to
group_path
(
id:
group
.
path
),
class:
dom_class
(
group
)
do
%strong
.well-title
=
truncate
(
group
.
name
,
length:
35
)
%strong
.well-title
=
truncate
(
group
.
name
,
length:
35
)
%span
.edi
t.light
%span
.pull-righ
t.light
-
if
group
.
owner
==
current_user
-
if
group
.
owner
==
current_user
%i
.icon-wrench
%i
.icon-wrench
%span
.description
%strong
=
group
.
description
app/views/dashboard/_teams.html.haml
View file @
9959669f
.ui-box.teams
_
box
.ui-box.teams
-
box
%h5
.title
%h5
.title
Teams
Teams
%small
%small
...
@@ -12,11 +12,9 @@
...
@@ -12,11 +12,9 @@
%li
%li
=
link_to
team_path
(
id:
team
.
path
),
class:
dom_class
(
team
)
do
=
link_to
team_path
(
id:
team
.
path
),
class:
dom_class
(
team
)
do
%strong
.well-title
=
truncate
(
team
.
name
,
length:
35
)
%strong
.well-title
=
truncate
(
team
.
name
,
length:
35
)
%span
.edi
t.light
%span
.pull-righ
t.light
-
if
team
.
owner
==
current_user
-
if
team
.
owner
==
current_user
%i
.icon-wrench
%i
.icon-wrench
-
tm
=
current_user
.
user_team_user_relationships
.
find_by_user_team_id
(
team
.
id
)
-
tm
=
current_user
.
user_team_user_relationships
.
find_by_user_team_id
(
team
.
id
)
-
if
tm
-
if
tm
=
tm
.
access_human
=
tm
.
access_human
%span
.description
%strong
=
team
.
description
features/steps/userteams/userteams.rb
View file @
9959669f
...
@@ -8,7 +8,7 @@ class Userteams < Spinach::FeatureSteps
...
@@ -8,7 +8,7 @@ class Userteams < Spinach::FeatureSteps
end
end
Then
'I should see dashboard page without teams info block'
do
Then
'I should see dashboard page without teams info block'
do
page
.
has_no_css?
(
".teams
_
box"
).
must_equal
true
page
.
has_no_css?
(
".teams
-
box"
).
must_equal
true
end
end
When
'I have teams with my membership'
do
When
'I have teams with my membership'
do
...
@@ -17,7 +17,7 @@ class Userteams < Spinach::FeatureSteps
...
@@ -17,7 +17,7 @@ class Userteams < Spinach::FeatureSteps
end
end
Then
'I should see dashboard page with teams information block'
do
Then
'I should see dashboard page with teams information block'
do
page
.
should
have_css
(
".teams
_
box"
)
page
.
should
have_css
(
".teams
-
box"
)
end
end
When
'exist user teams'
do
When
'exist user teams'
do
...
...
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