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
6743ecec
Commit
6743ecec
authored
Jan 25, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix redirects. Add link to new team and new group
parent
6350b32a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
app/controllers/admin/teams_controller.rb
app/controllers/admin/teams_controller.rb
+1
-1
app/controllers/teams_controller.rb
app/controllers/teams_controller.rb
+1
-1
app/views/projects/_new_form.html.haml
app/views/projects/_new_form.html.haml
+13
-5
No files found.
app/controllers/admin/teams_controller.rb
View file @
6743ecec
...
@@ -47,7 +47,7 @@ class Admin::TeamsController < Admin::ApplicationController
...
@@ -47,7 +47,7 @@ class Admin::TeamsController < Admin::ApplicationController
def
destroy
def
destroy
user_team
.
destroy
user_team
.
destroy
redirect_to
admin_
user_
teams_path
,
notice:
'Team of users was successfully deleted.'
redirect_to
admin_teams_path
,
notice:
'Team of users was successfully deleted.'
end
end
protected
protected
...
...
app/controllers/teams_controller.rb
View file @
6743ecec
...
@@ -28,7 +28,7 @@ class TeamsController < ApplicationController
...
@@ -28,7 +28,7 @@ class TeamsController < ApplicationController
def
destroy
def
destroy
user_team
.
destroy
user_team
.
destroy
redirect_to
teams
_path
redirect_to
dashboard
_path
end
end
def
new
def
new
...
...
app/views/projects/_new_form.html.haml
View file @
6743ecec
...
@@ -15,12 +15,20 @@
...
@@ -15,12 +15,20 @@
%span
Namespace
%span
Namespace
.input
.input
=
f
.
select
:namespace_id
,
namespaces_options
(
params
[
:namespace_id
]
||
:current_user
),
{},
{
class:
'chosen'
}
=
f
.
select
:namespace_id
,
namespaces_options
(
params
[
:namespace_id
]
||
:current_user
),
{},
{
class:
'chosen'
}
-
elsif
current_user
.
can_create_group?
%p
.padded
New projects are private by default. You choose who can see the project and commit to repository.
%hr
-
if
current_user
.
can_create_group?
.clearfix
.clearfix
.input.light
.input.light
Need a group for several projects?
Need a group for several
dependent
projects?
=
link_to
new_group_path
,
class:
"btn very_small"
do
=
link_to
new_group_path
,
class:
"btn very_small"
do
Create a group
Create a group
%hr
-
if
current_user
.
can_create_team?
%p
.padded
.clearfix
New projects are private by default. You choose who can see the project and commit to repository.
.input.light
Want to share a team between projects?
=
link_to
new_team_path
,
class:
"btn very_small"
do
Create a team
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