summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-08-16 12:58:50 +0000
committerNick Thomas <nick@gitlab.com>2018-08-16 12:58:50 +0000
commitfb8606f65a60808e52539f71f09fba871b5aba6b (patch)
treefffd9f99b45b063e318c0e954116c98647737ef9 /lib
parent122d84a403d3534dea743d94aa23d4115cc804a8 (diff)
parent710f75186009cb85c996d0de723ec3524299ecd8 (diff)
downloadgitlab-shell-fb8606f65a60808e52539f71f09fba871b5aba6b.tar.gz
Merge branch 'rs-rspec' into 'master'
Update to RSpec 3 Closes #54 See merge request gitlab-org/gitlab-shell!229
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab_init.rb2
-rw-r--r--lib/gitlab_keys.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab_init.rb b/lib/gitlab_init.rb
index c3f35a2..2767a62 100644
--- a/lib/gitlab_init.rb
+++ b/lib/gitlab_init.rb
@@ -1,3 +1,3 @@
-ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+ROOT_PATH = File.expand_path('..', __dir__)
require_relative 'gitlab_config'
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
index 3ee2882..0600a18 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -136,7 +136,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
lock do
$logger.info('Removing key', key_id: @key_id)
open_auth_file('r+') do |f|
- while line = f.gets # rubocop:disable Style/AssignmentInCondition
+ while line = f.gets # rubocop:disable Lint/AssignmentInCondition
next unless line.start_with?("command=\"#{self.class.command_key(@key_id)}\"")
f.seek(-line.length, IO::SEEK_CUR)
# Overwrite the line with #'s. Because the 'line' variable contains