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
2b555306
Commit
2b555306
authored
Oct 23, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent 500 error if cant detect branches for commit
parent
c2f74de4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+12
-11
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+0
-1
No files found.
app/views/projects/commit/_commit_box.html.haml
View file @
2b555306
...
...
@@ -39,17 +39,18 @@
-
@commit
.
parents
.
each
do
|
parent
|
=
link_to
parent
.
id
[
0
...
10
],
project_commit_path
(
@project
,
parent
)
.commit-info-row
%span
.cgray
Exists in
%span
-
branch
=
commit_default_branch
(
@project
,
@branches
)
=
link_to
(
branch
,
project_tree_path
(
@project
,
branch
))
-
if
@branches
.
any?
and in
=
link_to
(
"
#{
pluralize
(
@branches
.
count
,
"other branch"
)
}
"
,
"#"
,
class:
"js-details-expand"
)
%span
.js-details-contain.hide
=
commit_branches_links
(
@project
,
@branches
)
-
if
@branches
.
any?
.commit-info-row
%span
.cgray
Exists in
%span
-
branch
=
commit_default_branch
(
@project
,
@branches
)
=
link_to
(
branch
,
project_tree_path
(
@project
,
branch
))
-
if
@branches
.
any?
and in
=
link_to
(
"
#{
pluralize
(
@branches
.
count
,
"other branch"
)
}
"
,
"#"
,
class:
"js-details-expand"
)
%span
.js-details-contain.hide
=
commit_branches_links
(
@project
,
@branches
)
.commit-box
%h3
.commit-title
...
...
features/steps/project/project_merge_requests.rb
View file @
2b555306
...
...
@@ -109,7 +109,6 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And
'I click on the first commit in the merge request'
do
click_link
merge_request
.
commits
.
first
.
short_id
(
8
)
end
...
...
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