Commit 96a3f0e0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix rubocop issues

parent 9b140b22
...@@ -21,4 +21,3 @@ class Projects::GroupLinksController < Projects::ApplicationController ...@@ -21,4 +21,3 @@ class Projects::GroupLinksController < Projects::ApplicationController
redirect_to project_group_links_path(project) redirect_to project_group_links_path(project)
end end
end end
...@@ -2,9 +2,12 @@ class Appearance < ActiveRecord::Base ...@@ -2,9 +2,12 @@ class Appearance < ActiveRecord::Base
validates :title, presence: true validates :title, presence: true
validates :description, presence: true validates :description, presence: true
validates :logo, file_size: { maximum: 1000.kilobytes.to_i } validates :logo, file_size: { maximum: 1000.kilobytes.to_i }
validates :dark_logo, file_size: { maximum: 1000.kilobytes.to_i }, validates :dark_logo,
file_size: { maximum: 1000.kilobytes.to_i },
presence: true, if: :light_logo? presence: true, if: :light_logo?
validates :light_logo, file_size: { maximum: 1000.kilobytes.to_i },
validates :light_logo,
file_size: { maximum: 1000.kilobytes.to_i },
presence: true, if: :dark_logo? presence: true, if: :dark_logo?
mount_uploader :logo, AttachmentUploader mount_uploader :logo, AttachmentUploader
......
...@@ -180,5 +180,3 @@ module Gitlab ...@@ -180,5 +180,3 @@ module Gitlab
end end
end end
end end
...@@ -159,7 +159,7 @@ module Gitlab ...@@ -159,7 +159,7 @@ module Gitlab
# git push remote master # git push remote master
def rebase_in_satellite!(repo) def rebase_in_satellite!(repo)
update_satellite_source_and_target!(repo) update_satellite_source_and_target!(repo)
repo.git.checkout(default_options({b: true}), merge_request.source_branch, "source/#{merge_request.source_branch}") repo.git.checkout(default_options({ b: true }), merge_request.source_branch, "source/#{merge_request.source_branch}")
output, status = popen(%W(git pull --rebase origin #{merge_request.target_branch}), repo.working_dir) output, status = popen(%W(git pull --rebase origin #{merge_request.target_branch}), repo.working_dir)
if status == 0 if status == 0
......
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