Commit 05d26e21 authored by Valery Sizov's avatar Valery Sizov

fix rubocop

parent 9a7ada02
...@@ -183,7 +183,6 @@ module IssuesHelper ...@@ -183,7 +183,6 @@ module IssuesHelper
options_from_collection_for_select(options, 'name', 'title', params[:due_date]) options_from_collection_for_select(options, 'name', 'title', params[:due_date])
end end
def issues_weight_options(selected = nil, edit: false) def issues_weight_options(selected = nil, edit: false)
weights = edit ? edit_weights : issue_weights weights = edit ? edit_weights : issue_weights
......
...@@ -44,7 +44,6 @@ class Event < ActiveRecord::Base ...@@ -44,7 +44,6 @@ class Event < ActiveRecord::Base
scope :closed, -> { where(action: CLOSED) } scope :closed, -> { where(action: CLOSED) }
scope :merged, -> { where(action: MERGED) } scope :merged, -> { where(action: MERGED) }
class << self class << self
def reset_event_cache_for(target) def reset_event_cache_for(target)
Event.where(target_id: target.id, target_type: target.class.to_s). Event.where(target_id: target.id, target_type: target.class.to_s).
......
...@@ -16,7 +16,6 @@ class ProjectWiki ...@@ -16,7 +16,6 @@ class ProjectWiki
attr_reader :error_message attr_reader :error_message
attr_reader :project attr_reader :project
def initialize(project, user = nil) def initialize(project, user = nil)
@project = project @project = project
@user = user @user = user
......
...@@ -3,7 +3,6 @@ class GeoBulkNotifyWorker ...@@ -3,7 +3,6 @@ class GeoBulkNotifyWorker
sidekiq_options queue: :default sidekiq_options queue: :default
def perform def perform
Geo::NotifyNodesService.new.execute Geo::NotifyNodesService.new.execute
end end
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
require 'gitlab/current_settings' require 'gitlab/current_settings'
module Elasticsearch module Elasticsearch
module Model module Model
module Client module Client
......
...@@ -224,7 +224,6 @@ module Gitlab ...@@ -224,7 +224,6 @@ module Gitlab
end end
end end
build_status_object(true) build_status_object(true)
end end
......
...@@ -102,7 +102,6 @@ module Gitlab ...@@ -102,7 +102,6 @@ module Gitlab
).map(&:dn) ).map(&:dn)
end end
def ldap_search(*args) def ldap_search(*args)
# Net::LDAP's `time` argument doesn't work. Use Ruby `Timeout` instead. # Net::LDAP's `time` argument doesn't work. Use Ruby `Timeout` instead.
Timeout.timeout(config.timeout) do Timeout.timeout(config.timeout) do
......
...@@ -366,7 +366,6 @@ describe API::API, api: true do ...@@ -366,7 +366,6 @@ describe API::API, api: true do
approvals_before_merge: approvals_before_merge approvals_before_merge: approvals_before_merge
end end
context 'when the target project has approvals_before_merge set to zero' do context 'when the target project has approvals_before_merge set to zero' do
before do before do
project.update_attributes(approvals_before_merge: 0) project.update_attributes(approvals_before_merge: 0)
......
...@@ -34,7 +34,6 @@ describe API::API, 'ProjectGitHook', api: true do ...@@ -34,7 +34,6 @@ describe API::API, 'ProjectGitHook', api: true do
end end
end end
describe "POST /projects/:id/git_hook" do describe "POST /projects/:id/git_hook" do
context "authorized user" do context "authorized user" do
it "should add git hook to project" do it "should add git hook to project" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment