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
bfd00caf
Commit
bfd00caf
authored
Jan 30, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Few usability improvments
parent
560985b0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
app/views/projects/_project_head.html.haml
app/views/projects/_project_head.html.haml
+4
-4
app/views/team_members/_form.html.haml
app/views/team_members/_form.html.haml
+1
-1
app/views/team_members/_show.html.haml
app/views/team_members/_show.html.haml
+1
-1
features/steps/project/project_team_management.rb
features/steps/project/project_team_management.rb
+1
-1
No files found.
app/views/projects/_project_head.html.haml
View file @
bfd00caf
...
@@ -13,19 +13,19 @@
...
@@ -13,19 +13,19 @@
=
link_to
'Snippets'
,
project_snippets_path
(
@project
),
class:
"snippets-tab tab"
=
link_to
'Snippets'
,
project_snippets_path
(
@project
),
class:
"snippets-tab tab"
-
if
can?
current_user
,
:admin_project
,
@project
-
if
can?
current_user
,
:admin_project
,
@project
=
nav_link
(
controller: :deploy_keys
,
html_options:
{
class:
'right'
})
do
=
nav_link
(
controller: :deploy_keys
,
html_options:
{
class:
'
pull-
right'
})
do
=
link_to
project_deploy_keys_path
(
@project
)
do
=
link_to
project_deploy_keys_path
(
@project
)
do
%span
%span
Deploy Keys
Deploy Keys
=
nav_link
(
controller: :hooks
,
html_options:
{
class:
'right'
})
do
=
nav_link
(
controller: :hooks
,
html_options:
{
class:
'
pull-
right'
})
do
=
link_to
project_hooks_path
(
@project
)
do
=
link_to
project_hooks_path
(
@project
)
do
%span
%span
Hooks
Hooks
=
nav_link
(
controller: :services
,
html_options:
{
class:
'right'
})
do
=
nav_link
(
controller: :services
,
html_options:
{
class:
'
pull-
right'
})
do
=
link_to
project_services_path
(
@project
)
do
=
link_to
project_services_path
(
@project
)
do
%span
%span
Services
Services
=
nav_link
(
path:
'projects#edit'
,
html_options:
{
class:
'right'
})
do
=
nav_link
(
path:
'projects#edit'
,
html_options:
{
class:
'
pull-
right'
})
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
%i
.icon-edit
%i
.icon-edit
Edit
Edit
app/views/team_members/_form.html.haml
View file @
bfd00caf
...
@@ -19,5 +19,5 @@
...
@@ -19,5 +19,5 @@
.input
=
select_tag
:project_access
,
options_for_select
(
Project
.
access_options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.input
=
select_tag
:project_access
,
options_for_select
(
Project
.
access_options
,
@user_project_relation
.
project_access
),
class:
"project-access-select chosen"
.actions
.actions
=
f
.
submit
'
Save'
,
class:
"btn btn-sav
e"
=
f
.
submit
'
Add users'
,
class:
"btn btn-creat
e"
=
link_to
"Cancel"
,
project_team_index_path
(
@project
),
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
project_team_index_path
(
@project
),
class:
"btn btn-cancel"
app/views/team_members/_show.html.haml
View file @
bfd00caf
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
-
if
current_user
==
user
-
if
current_user
==
user
%span
.btn.disabled
This is you!
%span
.btn.disabled
This is you!
-
if
@project
.
namespace_owner
==
user
-
if
@project
.
namespace_owner
==
user
%span
.btn.disabled
.btn-success
Owner
%span
.btn.disabled
Owner
-
elsif
user
.
blocked
-
elsif
user
.
blocked
%span
.btn.disabled.blocked
Blocked
%span
.btn.disabled.blocked
Blocked
-
elsif
allow_admin
-
elsif
allow_admin
...
...
features/steps/project/project_team_management.rb
View file @
bfd00caf
...
@@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
...
@@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
select
user
.
name
,
:from
=>
"user_ids"
select
user
.
name
,
:from
=>
"user_ids"
select
"Reporter"
,
:from
=>
"project_access"
select
"Reporter"
,
:from
=>
"project_access"
end
end
click_button
"
Save
"
click_button
"
Add users
"
end
end
Then
'I should see "Mike" in team list as "Reporter"'
do
Then
'I should see "Mike" in team list as "Reporter"'
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