summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop_todo.yml5
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb8
2 files changed, 3 insertions, 10 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 987af4da7..3044bda6c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1389,11 +1389,6 @@ Style/RaiseArgs:
- 'lib/redmine/sort_criteria.rb'
# Cop supports --auto-correct.
-Style/RedundantBegin:
- Exclude:
- - 'lib/redmine/scm/adapters/git_adapter.rb'
-
-# Cop supports --auto-correct.
Style/RedundantConditional:
Exclude:
- 'app/controllers/workflows_controller.rb'
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 22389bbbe..1c0c98699 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -70,11 +70,9 @@ module Redmine
end
def info
- begin
- Info.new(:root_url => url, :lastrev => lastrev('',nil))
- rescue
- nil
- end
+ Info.new(:root_url => url, :lastrev => lastrev('',nil))
+ rescue
+ nil
end
def branches