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
23e33885
Commit
23e33885
authored
Jan 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont set @project variable in list. Remove a bit of duplication in dash and group
parent
f716c0a1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
32 deletions
+21
-32
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+2
-2
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+1
-14
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+2
-2
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+1
-14
app/views/shared/_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+1
-0
app/views/shared/_merge_requests.html.haml
app/views/shared/_merge_requests.html.haml
+14
-0
No files found.
app/views/dashboard/issues.html.haml
View file @
23e33885
...
@@ -12,9 +12,9 @@
...
@@ -12,9 +12,9 @@
-
if
@issues
.
any?
-
if
@issues
.
any?
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
%div
.ui-box
%div
.ui-box
-
@
project
=
group
[
0
]
-
project
=
group
[
0
]
%h5
.title
%h5
.title
=
link_to_project
@
project
=
link_to_project
project
%ul
.well-list.issues_table
%ul
.well-list.issues_table
-
group
[
1
].
each
do
|
issue
|
-
group
[
1
].
each
do
|
issue
|
=
render
(
partial:
'issues/show'
,
locals:
{
issue:
issue
})
=
render
(
partial:
'issues/show'
,
locals:
{
issue:
issue
})
...
...
app/views/dashboard/merge_requests.html.haml
View file @
23e33885
...
@@ -8,17 +8,4 @@
...
@@ -8,17 +8,4 @@
.span3
.span3
=
render
'filter'
,
entity:
'merge_request'
=
render
'filter'
,
entity:
'merge_request'
.span9
.span9
-
if
@merge_requests
.
any?
=
render
'shared/merge_requests'
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
.ui-box
-
@project
=
group
[
0
]
%h5
.title
=
link_to_project
@project
%ul
.well-list
-
group
[
1
].
each
do
|
merge_request
|
=
render
(
partial:
'merge_requests/merge_request'
,
locals:
{
merge_request:
merge_request
})
%hr
=
paginate
@merge_requests
,
theme:
"gitlab"
-
else
%h3
.nothing_here_message
Nothing to show here
app/views/groups/issues.html.haml
View file @
23e33885
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,9 @@
-
if
@issues
.
any?
-
if
@issues
.
any?
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
-
@issues
.
group_by
(
&
:project
).
each
do
|
group
|
%div
.ui-box
%div
.ui-box
-
@
project
=
group
[
0
]
-
project
=
group
[
0
]
%h5
.title
%h5
.title
=
link_to_project
@
project
=
link_to_project
project
%ul
.well-list.issues_table
%ul
.well-list.issues_table
-
group
[
1
].
each
do
|
issue
|
-
group
[
1
].
each
do
|
issue
|
=
render
(
partial:
'issues/show'
,
locals:
{
issue:
issue
})
=
render
(
partial:
'issues/show'
,
locals:
{
issue:
issue
})
...
...
app/views/groups/merge_requests.html.haml
View file @
23e33885
...
@@ -8,17 +8,4 @@
...
@@ -8,17 +8,4 @@
.span3
.span3
=
render
'filter'
,
entity:
'merge_request'
=
render
'filter'
,
entity:
'merge_request'
.span9
.span9
-
if
@merge_requests
.
any?
=
render
'shared/merge_requests'
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
.ui-box
-
@project
=
group
[
0
]
%h5
.title
=
link_to_project
@project
%ul
.well-list
-
group
[
1
].
each
do
|
merge_request
|
=
render
(
partial:
'merge_requests/merge_request'
,
locals:
{
merge_request:
merge_request
})
%hr
=
paginate
@merge_requests
,
theme:
"gitlab"
-
else
%h3
.nothing_here_message
Nothing to show here
app/views/shared/_clone_panel.html.haml
View file @
23e33885
.input-prepend.project_clone_holder
.input-prepend.project_clone_holder
%button
{
class:
"btn active"
,
:"data-clone"
=>
@project
.
ssh_url_to_repo
}
SSH
%button
{
class:
"btn active"
,
:"data-clone"
=>
@project
.
ssh_url_to_repo
}
SSH
%button
{
class:
"btn"
,
:"data-clone"
=>
@project
.
http_url_to_repo
}=
Gitlab
.
config
.
gitlab
.
protocol
.
upcase
%button
{
class:
"btn"
,
:"data-clone"
=>
@project
.
http_url_to_repo
}=
Gitlab
.
config
.
gitlab
.
protocol
.
upcase
=
text_field_tag
:project_clone
,
@project
.
url_to_repo
,
class:
"one_click_select input-xxlarge"
=
text_field_tag
:project_clone
,
@project
.
url_to_repo
,
class:
"one_click_select input-xxlarge"
app/views/shared/_merge_requests.html.haml
0 → 100644
View file @
23e33885
-
if
@merge_requests
.
any?
-
@merge_requests
.
group_by
(
&
:project
).
each
do
|
group
|
.ui-box
-
project
=
group
[
0
]
%h5
.title
=
link_to_project
project
%ul
.well-list
-
group
[
1
].
each
do
|
merge_request
|
=
render
(
partial:
'merge_requests/merge_request'
,
locals:
{
merge_request:
merge_request
})
%hr
=
paginate
@merge_requests
,
theme:
"gitlab"
-
else
%h3
.nothing_here_message
Nothing to show here
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