diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-03-13 10:36:13 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-03-28 14:18:09 -0500 |
| commit | 1f026738675317a86b19d88900eafe24243b8c8b (patch) | |
| tree | 9c1f0500e122b1bcf58832dfc68d1ccc4167db8e /app/controllers | |
| parent | fe5f7390f036234192f4bee7f21f7795a0b992e0 (diff) | |
| download | gitlab-ce-1f026738675317a86b19d88900eafe24243b8c8b.tar.gz | |
Fix promoting labels and milestones copy text
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/milestones_controller.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 99790b8e7e8..cf8787931ca 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -112,7 +112,7 @@ class Projects::LabelsController < Projects::ApplicationController begin return render_404 unless promote_service.execute(@label) - flash[:notice] = "#{@label.title} promoted to group label." + flash[:notice] = "#{@label.title} promoted to <a href=#{group_labels_path(@project.group)}>group label.</a>".html_safe respond_to do |format| format.html do redirect_to(project_labels_path(@project), status: 303) diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb index cf84629fadc..816338b462a 100644 --- a/app/controllers/projects/milestones_controller.rb +++ b/app/controllers/projects/milestones_controller.rb @@ -74,9 +74,9 @@ class Projects::MilestonesController < Projects::ApplicationController end def promote - Milestones::PromoteService.new(project, current_user).execute(milestone) + promoted_milestone = Milestones::PromoteService.new(project, current_user).execute(milestone) - flash[:notice] = "#{milestone.title} promoted to group milestone" + flash[:notice] = "#{milestone.title} promoted to <a href=#{group_milestone_path(project.group, promoted_milestone.iid)}>group milestone.</a>".html_safe respond_to do |format| format.html do redirect_to project_milestones_path(project) |