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
88d42c2e
Commit
88d42c2e
authored
Mar 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace projects_box with ui-box. Fixed team spinach test
parent
e84df44e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
20 deletions
+15
-20
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+1
-4
app/views/dashboard/_groups.html.haml
app/views/dashboard/_groups.html.haml
+7
-4
app/views/dashboard/_projects.html.haml
app/views/dashboard/_projects.html.haml
+1
-1
app/views/groups/_projects.html.haml
app/views/groups/_projects.html.haml
+1
-1
app/views/teams/_projects.html.haml
app/views/teams/_projects.html.haml
+1
-1
app/views/teams/edit.html.haml
app/views/teams/edit.html.haml
+1
-1
features/steps/userteams/userteams.rb
features/steps/userteams/userteams.rb
+2
-6
features/teams/team.feature
features/teams/team.feature
+1
-2
No files found.
app/assets/stylesheets/sections/projects.scss
View file @
88d42c2e
...
...
@@ -6,11 +6,8 @@
.side
{
@extend
.pull-right
;
.
projects_box
,
.
ui-box
{
.ui-box
{
margin
:
3px
;
}
.projects_box
{
>
.title
{
padding
:
2px
15px
;
}
...
...
app/views/dashboard/_groups.html.haml
View file @
88d42c2e
...
...
@@ -12,10 +12,13 @@
-
groups
.
each
do
|
group
|
%li
=
link_to
group_path
(
id:
group
.
path
),
class:
dom_class
(
group
)
do
%strong
.well-title
=
truncate
(
group
.
name
,
length:
35
)
%span
.pull-right.light
-
if
group
.
owner
==
current_user
%i
.icon-wrench
%strong
.well-title
=
truncate
(
group
.
name
,
length:
35
)
%span
.arrow
→
%span
.last_activity
%strong
Owner:
%span
=
group
.
owner_name
-
if
groups
.
blank?
%li
%h3
.nothing_here_message
You have no groups yet.
app/views/dashboard/_projects.html.haml
View file @
88d42c2e
.
projects_
box
.
ui-
box
%h5
.title
Projects
%small
...
...
app/views/groups/_projects.html.haml
View file @
88d42c2e
.
projects_
box
.
ui-
box
%h5
.title
Projects
%small
...
...
app/views/teams/_projects.html.haml
View file @
88d42c2e
.
projects_
box
.
ui-
box
%h5
.title
Projects
%small
...
...
app/views/teams/edit.html.haml
View file @
88d42c2e
...
...
@@ -11,7 +11,7 @@
.span9
.tab-content
.tab-pane.active
#tab-projects
.ui-box
.ui-box
.projects-table
%h5
.title
Projects
%ul
.well-list
-
@projects
.
each
do
|
project
|
...
...
features/steps/userteams/userteams.rb
View file @
88d42c2e
...
...
@@ -206,12 +206,8 @@ class Userteams < Spinach::FeatureSteps
visit
team_path
(
team
)
end
When
'I click on link "Projects"'
do
click_link
"Projects"
end
And
'I click link "Assign project to Team"'
do
click_link
"Assign project to Team"
When
'I click on link "Assign Project"'
do
click_link
"Assign Project"
end
Then
'I should see form with my own project in avaliable projects list'
do
...
...
features/teams/team.feature
View file @
88d42c2e
...
...
@@ -59,8 +59,7 @@ Feature: UserTeams
Given
I have team with projects and members
And
I have my own project without teams
And
I visit my team page
When
I click on link
"Projects"
And
I click link
"Assign project to Team"
When
I click on link
"Assign Project"
Then
I should see form with my own project in avaliable projects list
When
I submit form with selected project and max access
Then
I should see my own project in team projects list
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