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
a9c7de88
Commit
a9c7de88
authored
Jun 20, 2012
by
Zevs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Handle MR "show all commits" link with a doc-ready event handler."
This reverts commit
5b1ede62
.
parent
581a8223
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+6
-7
app/views/merge_requests/_commits.html.haml
app/views/merge_requests/_commits.html.haml
+1
-1
No files found.
app/assets/javascripts/merge_requests.js
View file @
a9c7de88
...
@@ -58,16 +58,15 @@ var MergeRequest = {
...
@@ -58,16 +58,15 @@ var MergeRequest = {
dataType
:
"
script
"
});
dataType
:
"
script
"
});
},
},
showAllCommits
:
function
()
{
$
(
"
.first_mr_commits
"
).
remove
();
$
(
"
.all_mr_commits
"
).
removeClass
(
"
hide
"
);
},
already_cannot_be_merged
:
already_cannot_be_merged
:
function
(){
function
(){
$
(
"
.automerge_widget
"
).
hide
();
$
(
"
.automerge_widget
"
).
hide
();
$
(
"
.automerge_widget.already_cannot_be_merged
"
).
show
();
$
(
"
.automerge_widget.already_cannot_be_merged
"
).
show
();
}
}
}
}
$
(
function
()
{
$
(
'
.first_mr_commits a.show_all
'
).
live
(
'
click
'
,
function
()
{
$
(
"
.first_mr_commits
"
).
remove
();
$
(
"
.all_mr_commits
"
).
removeClass
(
"
hide
"
);
});
});
app/views/merge_requests/_commits.html.haml
View file @
a9c7de88
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%li
.bottom
%li
.bottom
8 of
#{
@commits
.
count
}
commits displayed.
8 of
#{
@commits
.
count
}
commits displayed.
%strong
%strong
%a
.show_all
Click here to show all
=
link_to_function
"Click here to show all"
,
"MergeRequest.showAllCommits()"
%ul
.all_mr_commits.hide.unstyled
%ul
.all_mr_commits.hide.unstyled
-
@commits
.
each
do
|
commit
|
-
@commits
.
each
do
|
commit
|
=
render
"commits/commit"
,
:commit
=>
commit
=
render
"commits/commit"
,
:commit
=>
commit
...
...
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