kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

satisfy rubocop

Browse source
This commit is contained in:
Valery Sizov 2015-11-19 01:31:15 +02:00
parent fa2ed94fe9
commit a2912074be
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/projects/notes_controller.rb
View file

@ -3,7 +3,7 @@ class Projects::NotesController < Projects::ApplicationController
before_action :authorize_read_note! before_action :authorize_read_note!
before_action :authorize_create_note!, only: [:create] before_action :authorize_create_note!, only: [:create]
before_action :authorize_admin_note!, only: [:update, :destroy] before_action :authorize_admin_note!, only: [:update, :destroy]
before_action :find_current_user_notes, except: [:destroy, :delete_attachment, :award_toggle]] before_action :find_current_user_notes, except: [:destroy, :delete_attachment, :award_toggle]
def index def index
current_fetched_at = Time.now.to_i current_fetched_at = Time.now.to_i
@ -76,7 +76,7 @@ class Projects::NotesController < Projects::ApplicationController
project.notes.create(data) project.notes.create(data)
end end
render json: {ok: true} render json: { ok: true }
end end
private private

2
db/schema.rb
View file

@ -643,8 +643,6 @@ ActiveRecord::Schema.define(version: 20151116144118) do
t.string "import_type" t.string "import_type"
t.string "import_source" t.string "import_source"
t.integer "commit_count", default: 0 t.integer "commit_count", default: 0
t.boolean "merge_requests_ff_only_enabled", default: false
t.text "issues_template"
t.text "import_error" t.text "import_error"
end end

6
lib/award_emoji.rb
View file

@ -1,8 +1,10 @@
class AwardEmoji class AwardEmoji
EMOJI_LIST = ["+1", "-1", "100", "blush", "heart", "smile", "rage", EMOJI_LIST = [
"+1", "-1", "100", "blush", "heart", "smile", "rage",
"beers", "disappointed", "ok_hand", "beers", "disappointed", "ok_hand",
"helicopter", "shit", "airplane", "alarm_clock", "helicopter", "shit", "airplane", "alarm_clock",
"ambulance", "anguished", "two_hearts", "wink"] "ambulance", "anguished", "two_hearts", "wink"
]
def self.path_to_emoji_image(name) def self.path_to_emoji_image(name)
"emoji/#{Emoji.emoji_filename(name)}.png" "emoji/#{Emoji.emoji_filename(name)}.png"