Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-24 20:15:37 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-24 20:15:37 +0400
commit184e0f8df14640f1fb1ddcabb912f50c200f6249 (patch)
tree5d62eaa06121bfa059b9c446a9e3d9d084de7842 /app/controllers
parentde717a33352e789641fdb51ba162eefcd8efdfa4 (diff)
Fix non-showing error message when edit file via web
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/new_tree_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/new_tree_controller.rb b/app/controllers/projects/new_tree_controller.rb
index 3a51a78ef6f..71a5c6499ec 100644
--- a/app/controllers/projects/new_tree_controller.rb
+++ b/app/controllers/projects/new_tree_controller.rb
@@ -13,7 +13,7 @@ class Projects::NewTreeController < Projects::BaseTreeController
flash[:notice] = "Your changes have been successfully committed"
redirect_to project_blob_path(@project, File.join(@ref, file_path))
else
- flash[:alert] = result[:error]
+ flash[:alert] = result[:message]
render :show
end
end