diff options
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 640038818f2..4d79f0a1f5d 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -9,7 +9,7 @@ class Projects::LabelsController < Projects::ApplicationController before_action :authorize_read_label! before_action :authorize_admin_labels!, only: [:new, :create, :edit, :update, :generate, :destroy, :remove_priority, - :set_priorities] + :set_priorities,] before_action :authorize_admin_group_labels!, only: [:promote] respond_to :js, :html @@ -41,7 +41,7 @@ class Projects::LabelsController < Projects::ApplicationController else respond_to do |format| format.html { render :new } - format.json { render json: { message: @label.errors.messages }, status: :bad_request } + format.json { render json: {message: @label.errors.messages}, status: :bad_request } end end end @@ -62,9 +62,9 @@ class Projects::LabelsController < Projects::ApplicationController def generate Gitlab::IssuesLabels.generate(@project) - if params[:redirect] == 'issues' + if params[:redirect] == "issues" redirect_to project_issues_path(@project) - elsif params[:redirect] == 'merge_requests' + elsif params[:redirect] == "merge_requests" redirect_to project_merge_requests_path(@project) else redirect_to project_labels_path(@project) @@ -76,8 +76,8 @@ class Projects::LabelsController < Projects::ApplicationController @labels = find_labels redirect_to project_labels_path(@project), - status: 302, - notice: 'Label was removed' + status: 302, + notice: "Label was removed" end def remove_priority @@ -105,7 +105,7 @@ class Projects::LabelsController < Projects::ApplicationController end respond_to do |format| - format.json { render json: { message: 'success' } } + format.json { render json: {message: "success"} } end end # rubocop: enable CodeReuse/ActiveRecord @@ -122,7 +122,7 @@ class Projects::LabelsController < Projects::ApplicationController redirect_to(project_labels_path(@project), status: :see_other) end format.json do - render json: { url: project_labels_path(@project) } + render json: {url: project_labels_path(@project)} end end rescue ActiveRecord::RecordInvalid => e @@ -132,7 +132,7 @@ class Projects::LabelsController < Projects::ApplicationController respond_to do |format| format.html do redirect_to(project_labels_path(@project), - notice: 'Failed to promote label due to internal error. Please contact administrators.') + notice: "Failed to promote label due to internal error. Please contact administrators.") end format.js end @@ -140,7 +140,7 @@ class Projects::LabelsController < Projects::ApplicationController end def flash_notice_for(label, group) - ''.html_safe + "#{label.title} promoted to " + view_context.link_to('<u>group label</u>'.html_safe, group_labels_path(group)) + '.' + "".html_safe + "#{label.title} promoted to " + view_context.link_to("<u>group label</u>".html_safe, group_labels_path(group)) + "." end protected @@ -160,15 +160,15 @@ class Projects::LabelsController < Projects::ApplicationController def find_labels @available_labels ||= LabelsFinder.new(current_user, - project_id: @project.id, - include_ancestor_groups: params[:include_ancestor_groups], - search: params[:search], - subscribed: params[:subscribed], - sort: sort).execute + project_id: @project.id, + include_ancestor_groups: params[:include_ancestor_groups], + search: params[:search], + subscribed: params[:subscribed], + sort: sort).execute end def sort - @sort ||= params[:sort] || 'name_asc' + @sort ||= params[:sort] || "name_asc" end def authorize_admin_labels! |