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
Tatuya Kamada
gitlab-ce
Commits
5ef3b384
Commit
5ef3b384
authored
Apr 17, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MR commits suppressed if too many. few icons
parent
3b7998e1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
5 deletions
+29
-5
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+6
-0
app/views/merge_requests/_commits.html.haml
app/views/merge_requests/_commits.html.haml
+17
-4
app/views/projects/_project_head.html.haml
app/views/projects/_project_head.html.haml
+3
-0
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+3
-1
No files found.
app/assets/javascripts/merge_requests.js
View file @
5ef3b384
...
@@ -38,5 +38,11 @@ var MergeRequest = {
...
@@ -38,5 +38,11 @@ var MergeRequest = {
$
(
'
.status
'
).
removeClass
(
"
loading
"
);
$
(
'
.status
'
).
removeClass
(
"
loading
"
);
},
},
dataType
:
"
script
"
});
dataType
:
"
script
"
});
},
showAllCommits
:
function
()
{
$
(
"
.first_mr_commits
"
).
remove
();
$
(
"
.all_mr_commits
"
).
removeClass
(
"
hide
"
);
}
}
}
}
app/views/merge_requests/_commits.html.haml
View file @
5ef3b384
-
unless
@commits
.
empty?
-
unless
@commits
.
empty?
.ui-box
.ui-box
%h5
Commits
%h5
Commits
(
#{
@commits
.
count
}
)
.merge-request-commits
.merge-request-commits
-
if
@commits
.
count
>
8
%ul
.first_mr_commits.unstyled
-
@commits
.
first
(
8
).
each
do
|
commit
|
=
render
"commits/commit"
,
:commit
=>
commit
%li
.bottom
8 of
#{
@commits
.
count
}
commits displayed.
%strong
=
link_to_function
"Click here to show all"
,
"MergeRequest.showAllCommits()"
%ul
.all_mr_commits.hide.unstyled
-
@commits
.
each
do
|
commit
|
=
render
"commits/commit"
,
:commit
=>
commit
-
else
%ul
.unstyled
%ul
.unstyled
-
@commits
.
each
do
|
commit
|
-
@commits
.
each
do
|
commit
|
=
render
"commits/commit"
,
:commit
=>
commit
=
render
"commits/commit"
,
:commit
=>
commit
...
...
app/views/projects/_project_head.html.haml
View file @
5ef3b384
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
%li
{
:class
=>
"#{'active' if current_page?(project_path(@project)) }"
}
%li
{
:class
=>
"#{'active' if current_page?(project_path(@project)) }"
}
=
link_to
project_path
(
@project
),
:class
=>
"activities-tab tab"
do
=
link_to
project_path
(
@project
),
:class
=>
"activities-tab tab"
do
%i
.icon-home
Show
Show
%li
{
:class
=>
" #{'active' if (controller.controller_name == "
team_members
") || current_page?(team_project_path(@project)) }"
}
%li
{
:class
=>
" #{'active' if (controller.controller_name == "
team_members
") || current_page?(team_project_path(@project)) }"
}
=
link_to
team_project_path
(
@project
),
:class
=>
"team-tab tab"
do
=
link_to
team_project_path
(
@project
),
:class
=>
"team-tab tab"
do
%i
.icon-user
Team
Team
%li
{
:class
=>
"#{'active' if current_page?(files_project_path(@project)) }"
}
%li
{
:class
=>
"#{'active' if current_page?(files_project_path(@project)) }"
}
=
link_to
files_project_path
(
@project
),
:class
=>
"files-tab tab "
do
=
link_to
files_project_path
(
@project
),
:class
=>
"files-tab tab "
do
...
@@ -23,5 +25,6 @@
...
@@ -23,5 +25,6 @@
Hooks
Hooks
%li
.right
{
:class
=>
"#{'active' if current_page?(edit_project_path(@project)) }"
}
%li
.right
{
:class
=>
"#{'active' if current_page?(edit_project_path(@project)) }"
}
=
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
Edit
Edit
app/views/projects/show.html.haml
View file @
5ef3b384
...
@@ -14,7 +14,9 @@
...
@@ -14,7 +14,9 @@
.span4.right
.span4.right
.right
.right
-
if
can?
current_user
,
:download_code
,
@project
-
if
can?
current_user
,
:download_code
,
@project
=
link_to
"Download"
,
archive_project_repository_path
(
@project
),
:class
=>
"btn small padded"
=
link_to
archive_project_repository_path
(
@project
),
:class
=>
"btn small padded"
do
%i
.icon-download-alt
Download
-
if
@project
.
merge_requests_enabled
&&
can?
(
current_user
,
:write_merge_request
,
@project
)
-
if
@project
.
merge_requests_enabled
&&
can?
(
current_user
,
:write_merge_request
,
@project
)
=
link_to
new_project_merge_request_path
(
@project
),
:title
=>
"New Merge Request"
,
:class
=>
"btn small padded"
do
=
link_to
new_project_merge_request_path
(
@project
),
:title
=>
"New Merge Request"
,
:class
=>
"btn small padded"
do
Merge Request
Merge Request
...
...
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