summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-24 18:35:57 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-24 18:35:57 -0700
commit69454e36f77db6f6e1c45c04c39acf670fe443e4 (patch)
tree7ff7294f398c2d299f103bfe820f91173b4d4bc6 /lib
parent6ec8ff069ceaa7bb914cbbd97ac248d926ef7e4e (diff)
downloadgitlab-ce-69454e36f77db6f6e1c45c04c39acf670fe443e4.tar.gz
Style/RedundantReturn enabledmore-rubocop-styles
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git_access.rb4
-rw-r--r--lib/gitlab/popen.rb2
-rw-r--r--lib/gitlab/theme.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index cb69e4b13d3..573415baec1 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -7,7 +7,7 @@ module Gitlab
def self.can_push_to_branch?(user, project, ref)
return false unless user
-
+
if project.protected_branch?(ref) &&
!(project.developers_can_push_to_protected_branch?(ref) && project.team.developer?(user))
user.can?(:push_code_to_protected_branches, project)
@@ -83,7 +83,7 @@ module Gitlab
end
end
- return build_status_object(true)
+ build_status_object(true)
end
def change_access_check(user, project, change)
diff --git a/lib/gitlab/popen.rb b/lib/gitlab/popen.rb
index fea4d2d55d2..43e07e09160 100644
--- a/lib/gitlab/popen.rb
+++ b/lib/gitlab/popen.rb
@@ -29,7 +29,7 @@ module Gitlab
@cmd_status = wait_thr.value.exitstatus
end
- return @cmd_output, @cmd_status
+ [@cmd_output, @cmd_status]
end
end
end
diff --git a/lib/gitlab/theme.rb b/lib/gitlab/theme.rb
index 9799e54de5d..43093c7d27e 100644
--- a/lib/gitlab/theme.rb
+++ b/lib/gitlab/theme.rb
@@ -19,7 +19,7 @@ module Gitlab
id ||= Gitlab.config.gitlab.default_theme
- return themes[id]
+ themes[id]
end
def self.type_css_class_by_id(id)