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
ed913786
Commit
ed913786
authored
Jan 26, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix blob controller rendering in case of errors
parent
752cb506
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+2
-2
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+2
-2
No files found.
app/controllers/projects/blob_controller.rb
View file @
ed913786
...
@@ -28,7 +28,7 @@ class Projects::BlobController < Projects::ApplicationController
...
@@ -28,7 +28,7 @@ class Projects::BlobController < Projects::ApplicationController
redirect_to
project_blob_path
(
@project
,
File
.
join
(
@ref
,
file_path
))
redirect_to
project_blob_path
(
@project
,
File
.
join
(
@ref
,
file_path
))
else
else
flash
[
:alert
]
=
result
[
:message
]
flash
[
:alert
]
=
result
[
:message
]
render
:
sho
w
render
:
ne
w
end
end
end
end
...
@@ -53,7 +53,7 @@ class Projects::BlobController < Projects::ApplicationController
...
@@ -53,7 +53,7 @@ class Projects::BlobController < Projects::ApplicationController
redirect_to
after_edit_path
redirect_to
after_edit_path
else
else
flash
[
:alert
]
=
result
[
:message
]
flash
[
:alert
]
=
result
[
:message
]
render
:
show
render
:
edit
end
end
end
end
...
...
features/steps/shared/paths.rb
View file @
ed913786
...
@@ -284,11 +284,11 @@ module SharedPaths
...
@@ -284,11 +284,11 @@ module SharedPaths
end
end
step
'I am on the new file page'
do
step
'I am on the new file page'
do
current_path
.
should
eq
(
project_
new_tree
_path
(
@project
,
root_ref
))
current_path
.
should
eq
(
project_
create_blob
_path
(
@project
,
root_ref
))
end
end
step
'I am on the ".gitignore" edit file page'
do
step
'I am on the ".gitignore" edit file page'
do
current_path
.
should
eq
(
project_edit_
tree
_path
(
current_path
.
should
eq
(
project_edit_
blob
_path
(
@project
,
File
.
join
(
root_ref
,
'.gitignore'
)))
@project
,
File
.
join
(
root_ref
,
'.gitignore'
)))
end
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