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
95fde9bd
Commit
95fde9bd
authored
Apr 14, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Projects page as dashboard. Old dashboard removed
parent
5f31989a
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
37 additions
and
208 deletions
+37
-208
app/views/dashboard/_issues.html.haml
app/views/dashboard/_issues.html.haml
+0
-17
app/views/dashboard/_issues_feed.html.haml
app/views/dashboard/_issues_feed.html.haml
+0
-12
app/views/dashboard/_merge_requests.html.haml
app/views/dashboard/_merge_requests.html.haml
+0
-20
app/views/dashboard/_merge_requests_feed.html.haml
app/views/dashboard/_merge_requests_feed.html.haml
+0
-11
app/views/dashboard/_projects.html.haml
app/views/dashboard/_projects.html.haml
+0
-22
app/views/dashboard/_projects_feed.html.haml
app/views/dashboard/_projects_feed.html.haml
+0
-15
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+0
-82
app/views/layouts/_app_menu.html.haml
app/views/layouts/_app_menu.html.haml
+0
-1
app/views/layouts/_const_menu_links.html.haml
app/views/layouts/_const_menu_links.html.haml
+1
-1
app/views/projects/index.html.haml
app/views/projects/index.html.haml
+13
-1
app/views/search/show.html.haml
app/views/search/show.html.haml
+2
-1
config/routes.rb
config/routes.rb
+1
-5
db/schema.rb
db/schema.rb
+20
-20
No files found.
app/views/dashboard/_issues.html.haml
deleted
100644 → 0
View file @
5f31989a
%div
.ui-box
%h5
=
link_to
"Issues"
,
"#issues"
,
:id
=>
"issues"
%small
(assigned to you)
%ul
.unstyled
-
@issues
.
each
do
|
issue
|
%li
.wll
=
link_to
[
issue
.
project
,
issue
]
do
%p
%span
.btn.disabled.small
=
issue
.
project
.
name
%strong
–
Issue
#
=
issue
.
id
=
truncate
issue
.
title
,
:length
=>
50
%span
.right.cgray
=
issue
.
updated_at
.
stamp
(
"Aug 21, 2011"
)
app/views/dashboard/_issues_feed.html.haml
deleted
100644 → 0
View file @
5f31989a
-
@issues
.
each
do
|
issue
|
.wll
=
link_to
[
issue
.
project
,
issue
]
do
%p
%strong
%span
=
issue
.
project
.
name
–
Issue
#
=
issue
.
id
=
truncate
issue
.
title
,
:length
=>
50
%span
.right.cgray
=
issue
.
updated_at
.
stamp
(
"Aug 21, 2011"
)
app/views/dashboard/_merge_requests.html.haml
deleted
100644 → 0
View file @
5f31989a
%div
.ui-box
%h5
=
link_to
"5 Latest Merge Requests"
,
"#merge_requests"
,
:id
=>
"merge_requests"
%small
(authored or assigned to you)
%ul
.unstyled
-
@merge_requests
.
each
do
|
merge_request
|
%li
.wll
=
link_to
[
merge_request
.
project
,
merge_request
]
do
%p
%span
.btn.disabled.small
=
merge_request
.
project
.
name
%strong
–
Merge Request ##{merge_request.id}
=
truncate
merge_request
.
title
,
:length
=>
50
%span
.right.cgray
=
merge_request
.
updated_at
.
stamp
(
"Aug 21, 2011"
)
%li
.bottom
app/views/dashboard/_merge_requests_feed.html.haml
deleted
100644 → 0
View file @
5f31989a
-
@merge_requests
.
each
do
|
merge_request
|
.wll
=
link_to
[
merge_request
.
project
,
merge_request
]
do
%p
%strong
%strong
=
merge_request
.
project
.
name
–
Merge Request ##{merge_request.id}
=
truncate
merge_request
.
title
,
:length
=>
50
%span
.right.cgray
=
merge_request
.
updated_at
.
stamp
(
"Aug 21, 2011"
)
app/views/dashboard/_projects.html.haml
deleted
100644 → 0
View file @
5f31989a
%div
%h3
%span
.ico.projects
Projects
%small
(most recent)
%hr
%div
.dash_projects
-
projects
.
first
(
5
).
each
do
|
project
|
%div
.dash_project
%h4
=
link_to
project
,
:class
=>
"project_link"
do
=
truncate
project
.
name
,
:length
=>
30
%small
last activity at
=
project
.
last_activity_date
.
stamp
(
"Aug 25, 2011"
)
.right
%small
%strong
=
link_to
"Browse Code »"
,
tree_project_ref_path
(
project
,
project
.
root_ref
),
:class
=>
"neib"
%strong
=
link_to
"Commits »"
,
project_commits_path
(
project
)
app/views/dashboard/_projects_feed.html.haml
deleted
100644 → 0
View file @
5f31989a
-
projects
.
first
(
5
).
each
do
|
project
|
%div
.dash_project_item
%h4
=
link_to
project
,
:class
=>
"project_link"
do
%span
.ico.project
=
truncate
project
.
name
,
:length
=>
24
%small
last activity at
=
project
.
last_activity_date
.
stamp
(
"Aug 25, 2011"
)
.right
%small
%strong
=
link_to
"Browse Code »"
,
tree_project_ref_path
(
project
,
project
.
root_ref
),
:class
=>
"neib gray"
%strong
=
link_to
"Commits »"
,
project_commits_path
(
project
),
:class
=>
"gray"
app/views/dashboard/index.html.haml
deleted
100644 → 0
View file @
5f31989a
-
if
current_user
.
require_ssh_key?
.alert-message.block-message.error
%p
You wont be able to pull/push project code unless you
=
link_to
new_key_path
,
:class
=>
"vlink"
do
add new key
to your profile
%div
.dashboard_category
%h3
%span
.ico.projects
=
link_to
"Projects"
,
"#projects"
,
:id
=>
"projects"
%small
(most recent)
%strong
.right
=
link_to
projects_path
do
Projects list
→
%hr
.dashboard_block
.row
.span3.right
%div
.lborder.ipadded
%h3
=
pluralize
current_user
.
projects
.
count
,
"project"
,
"projects"
-
if
current_user
.
can_create_project?
%hr
%div
You can create up to
=
current_user
.
projects_limit
projects. Click on button below to add a new one
.link_holder
%br
=
link_to
new_project_path
,
:class
=>
"btn"
do
New Project »
-
else
%hr
%div
You've reached project limit for your account.
You cannot create new projects.
.link_holder
%br
=
link_to
profile_path
,
:class
=>
"btn"
do
Your Profile »
.span9.left
=
render
"dashboard/projects_feed"
,
:projects
=>
@active_projects
-
if
@last_push
&&
@last_push
.
valid_push?
.padded.prepend-top-20
%h5
%small
Latest push was to the
#{
@last_push
.
ref_name
}
#{
@last_push
.
ref_type
}
of
#{
@last_push
.
project
.
name
}
:
%ul
.unstyled
=
render
@last_push
-
if
@merge_requests
.
any?
%div
.dashboard_category
%h3
=
link_to
"Merge Requests"
,
"#merge_requests"
,
:id
=>
"merge_requests"
%small
(authored or assigned to you)
%strong
.right
=
link_to
dashboard_merge_requests_path
do
Visit merge requests page
→
%hr
.dashboard_block
=
render
"dashboard/merge_requests_feed"
-
if
@issues
.
any?
%div
.dashboard_category
%h3
=
link_to
"Issues"
,
"#issues"
,
:id
=>
"issues"
%small
(assigned to you)
%strong
.right
=
link_to
dashboard_issues_path
do
Visit issues page
→
%hr
.dashboard_block
=
render
"dashboard/issues_feed"
-
if
@events
.
any?
%div
.dashboard_category
%h3
%span
.ico.activities
=
link_to
"Activities"
,
"#activities"
,
:id
=>
"activities"
%hr
.dashboard_block
=
render
@events
app/views/layouts/_app_menu.html.haml
View file @
95fde9bd
%nav
.main_menu
=
render
"layouts/const_menu_links"
=
link_to
"Projects"
,
projects_path
,
:class
=>
"
#{
"current"
if
current_page?
(
projects_path
)
}
"
=
link_to
dashboard_issues_path
,
:class
=>
"
#{
"current"
if
current_page?
(
dashboard_issues_path
)
}
"
,
:id
=>
"issues_slide"
do
Issues
%span
.count
=
current_user
.
assigned_issues
.
opened
.
count
...
...
app/views/layouts/_const_menu_links.html.haml
View file @
95fde9bd
=
link_to
"Home"
,
root_path
,
:class
=>
"home
#{
"current"
if
current_page?
(
dashboard
_path
)
||
current_page?
(
root_path
)
}
"
,
:title
=>
"Home"
=
link_to
"Home"
,
root_path
,
:class
=>
"home
#{
"current"
if
current_page?
(
projects
_path
)
||
current_page?
(
root_path
)
}
"
,
:title
=>
"Home"
app/views/projects/index.html.haml
View file @
95fde9bd
-
if
@projects
.
any?
.row
.span8
=
render
@events
-
if
current_user
.
require_ssh_key?
.alert.alert-error.padded
%span
You wont be able to pull/push project code unless you
%strong
=
link_to
new_key_path
,
:class
=>
"vlink"
do
add new key
to your profile
-
if
@events
.
any?
=
render
@events
-
else
.padded
%strong
.cgray
Projects activity will be displayed here
.span4.right
%div
.leftbar.ui-box
%h5
...
...
app/views/search/show.html.haml
View file @
95fde9bd
=
form_tag
search_path
,
:method
=>
:get
do
|
f
|
.padded
=
label_tag
:search
,
"Looking for"
=
label_tag
:search
do
%strong
Looking for
.input
=
text_field_tag
:search
,
params
[
:search
],
:placeholder
=>
"issue 143"
,
:class
=>
"input-xxlarge"
=
submit_tag
'Search'
,
:class
=>
"btn btn-primary"
...
...
config/routes.rb
View file @
95fde9bd
...
...
@@ -38,12 +38,8 @@ Gitlab::Application.routes.draw do
get
"profile/design"
,
:to
=>
"profile#design"
put
"profile/update"
,
:to
=>
"profile#update"
get
"dashboard"
,
:to
=>
"dashboard#index"
get
"dashboard/issues"
,
:to
=>
"dashboard#issues"
get
"dashboard/merge_requests"
,
:to
=>
"dashboard#merge_requests"
get
"dashboard/activities"
,
:to
=>
"dashboard#activities"
#get "profile/:id", :to => "profile#show"
resources
:projects
,
:constraints
=>
{
:id
=>
/[^\/]+/
},
:only
=>
[
:new
,
:create
,
:index
]
resources
:keys
...
...
@@ -131,5 +127,5 @@ Gitlab::Application.routes.draw do
end
resources
:notes
,
:only
=>
[
:index
,
:create
,
:destroy
]
end
root
:to
=>
"
dashboard
#index"
root
:to
=>
"
projects
#index"
end
db/schema.rb
View file @
95fde9bd
...
...
@@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
t
.
integer
"assignee_id"
t
.
integer
"author_id"
t
.
integer
"project_id"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
boolean
"closed"
,
:default
=>
false
,
:null
=>
false
t
.
integer
"position"
,
:default
=>
0
t
.
boolean
"critical"
,
:default
=>
false
,
:null
=>
false
...
...
@@ -44,8 +44,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
create_table
"keys"
,
:force
=>
true
do
|
t
|
t
.
integer
"user_id"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
text
"key"
t
.
string
"title"
t
.
string
"identifier"
...
...
@@ -60,10 +60,10 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
t
.
integer
"assignee_id"
t
.
string
"title"
t
.
boolean
"closed"
,
:default
=>
false
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
text
"st_commits"
,
:limit
=>
4294967295
t
.
text
"st_diffs"
,
:limit
=>
4294967295
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
text
"st_commits"
,
:limit
=>
2147483647
t
.
text
"st_diffs"
,
:limit
=>
2147483647
t
.
boolean
"merged"
,
:default
=>
false
,
:null
=>
false
end
...
...
@@ -84,8 +84,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
t
.
string
"noteable_id"
t
.
string
"noteable_type"
t
.
integer
"author_id"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
integer
"project_id"
t
.
string
"attachment"
t
.
string
"line_code"
...
...
@@ -98,8 +98,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
t
.
string
"name"
t
.
string
"path"
t
.
text
"description"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
boolean
"private_flag"
,
:default
=>
true
,
:null
=>
false
t
.
string
"code"
t
.
integer
"owner_id"
...
...
@@ -122,8 +122,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
t
.
text
"content"
t
.
integer
"author_id"
,
:null
=>
false
t
.
integer
"project_id"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
string
"file_name"
t
.
datetime
"expires_at"
end
...
...
@@ -156,8 +156,8 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
t
.
datetime
"last_sign_in_at"
t
.
string
"current_sign_in_ip"
t
.
string
"last_sign_in_ip"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
string
"name"
t
.
boolean
"admin"
,
:default
=>
false
,
:null
=>
false
t
.
integer
"projects_limit"
,
:default
=>
10
...
...
@@ -177,16 +177,16 @@ ActiveRecord::Schema.define(:version => 20120413135904) do
create_table
"users_projects"
,
:force
=>
true
do
|
t
|
t
.
integer
"user_id"
,
:null
=>
false
t
.
integer
"project_id"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
integer
"project_access"
,
:default
=>
0
,
:null
=>
false
end
create_table
"web_hooks"
,
:force
=>
true
do
|
t
|
t
.
string
"url"
t
.
integer
"project_id"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
end
create_table
"wikis"
,
:force
=>
true
do
|
t
|
...
...
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