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
d9c20cf5
Commit
d9c20cf5
authored
Oct 31, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 404 errors on Merge Request -> new
parent
b6fc0310
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+5
-0
app/views/merge_requests/branch_from.js.haml
app/views/merge_requests/branch_from.js.haml
+1
-1
app/views/merge_requests/branch_to.js.haml
app/views/merge_requests/branch_to.js.haml
+1
-2
No files found.
app/helpers/commits_helper.rb
View file @
d9c20cf5
...
@@ -65,4 +65,9 @@ module CommitsHelper
...
@@ -65,4 +65,9 @@ module CommitsHelper
end
end
end
end
def
commit_to_html
commit
if
commit
.
model
escape_javascript
(
render
'commits/commit'
,
commit:
commit
)
end
end
end
end
app/views/merge_requests/branch_from.js.haml
View file @
d9c20cf5
:plain
:plain
$(".mr_source_commit").html("
#{
escape_javascript
(
render
'commits/commit'
,
commit:
@commit
)
}
");
$(".mr_source_commit").html("
#{
commit_to_html
(
@commit
)
}
");
app/views/merge_requests/branch_to.js.haml
View file @
d9c20cf5
:plain
:plain
$(".mr_target_commit").html("
#{
escape_javascript
(
render
'commits/commit'
,
commit:
@commit
)
}
");
$(".mr_target_commit").html("
#{
commit_to_html
(
@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