diff options
| author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-09-25 16:43:23 +0200 |
|---|---|---|
| committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-10-13 20:55:09 +0200 |
| commit | 2d235221079ef6af90bf482a8f563dd409290751 (patch) | |
| tree | 3bcd965c6f4e88302fea566fd42e50459898a6b0 /app/controllers | |
| parent | e261de255dfff71f5acc7d33f339a30a3cb32ab9 (diff) | |
| download | gitlab-ce-2d235221079ef6af90bf482a8f563dd409290751.tar.gz | |
Use :message key, not :error for File::Service.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/edit_tree_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 7009e3b1bc8..0944c7421ee 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -20,7 +20,7 @@ class Projects::BlobController < Projects::ApplicationController flash[:notice] = "Your changes have been successfully committed" redirect_to project_tree_path(@project, @ref) else - flash[:alert] = result[:error] + flash[:alert] = result[:message] render :show end end diff --git a/app/controllers/projects/edit_tree_controller.rb b/app/controllers/projects/edit_tree_controller.rb index 8976d7c7be8..fdc1a85d8d7 100644 --- a/app/controllers/projects/edit_tree_controller.rb +++ b/app/controllers/projects/edit_tree_controller.rb @@ -22,7 +22,7 @@ class Projects::EditTreeController < Projects::BaseTreeController redirect_to after_edit_path else - flash[:alert] = result[:error] + flash[:alert] = result[:message] render :show end end |