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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
2f22874b
Commit
2f22874b
authored
Nov 24, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group assoc. Show namespace in project list
parent
65c470e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/models/project.rb
app/models/project.rb
+1
-1
app/views/dashboard/_projects.html.haml
app/views/dashboard/_projects.html.haml
+5
-1
No files found.
app/models/project.rb
View file @
2f22874b
...
@@ -34,7 +34,7 @@ class Project < ActiveRecord::Base
...
@@ -34,7 +34,7 @@ class Project < ActiveRecord::Base
attr_accessor
:error_code
attr_accessor
:error_code
# Relations
# Relations
belongs_to
:group
,
foreign_key:
"namespace_id"
,
conditions:
'type = Group'
belongs_to
:group
,
foreign_key:
"namespace_id"
,
conditions:
"type = 'Group'"
belongs_to
:namespace
belongs_to
:namespace
belongs_to
:owner
,
class_name:
"User"
belongs_to
:owner
,
class_name:
"User"
has_many
:users
,
through: :users_projects
has_many
:users
,
through: :users_projects
...
...
app/views/dashboard/_projects.html.haml
View file @
2f22874b
...
@@ -12,7 +12,11 @@
...
@@ -12,7 +12,11 @@
-
projects
.
each
do
|
project
|
-
projects
.
each
do
|
project
|
%li
.wll
%li
.wll
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
=
link_to
project_path
(
project
),
class:
dom_class
(
project
)
do
%strong
.project_name
=
truncate
(
project
.
name
,
length:
25
)
-
if
project
.
namespace
=
project
.
namespace
.
human_name
\/
%strong
.project_name
=
truncate
(
project
.
name
,
length:
25
)
%span
.arrow
%span
.arrow
→
→
%span
.last_activity
%span
.last_activity
...
...
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