diff options
author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-07-16 20:12:46 +0200 |
---|---|---|
committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-07-16 20:12:46 +0200 |
commit | 3c439888a6a080ffaa26a0edc7291d25eaa26791 (patch) | |
tree | 2ddb568554bc7286e5b62eedadbcc1156c16395c | |
parent | de582ab375a1fd04b63ea351aabbff5b31bcad6b (diff) | |
download | gitlab-ce-3c439888a6a080ffaa26a0edc7291d25eaa26791.tar.gz |
Removed some constant allready defined warnings
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-rw-r--r-- | lib/gitlab/theme.rb | 10 | ||||
-rw-r--r-- | lib/gitlab/visibility_level.rb | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/gitlab/theme.rb b/lib/gitlab/theme.rb index 44237a062fc..b7c50cb734d 100644 --- a/lib/gitlab/theme.rb +++ b/lib/gitlab/theme.rb @@ -1,10 +1,10 @@ module Gitlab class Theme - BASIC = 1 - MARS = 2 - MODERN = 3 - GRAY = 4 - COLOR = 5 + BASIC = 1 unless const_defined?(:BASIC) + MARS = 2 unless const_defined?(:MARS) + MODERN = 3 unless const_defined?(:MODERN) + GRAY = 4 unless const_defined?(:GRAY) + COLOR = 5 unless const_defined?(:COLOR) def self.css_class_by_id(id) themes = { diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb index eada9bcddf5..ea1319268f8 100644 --- a/lib/gitlab/visibility_level.rb +++ b/lib/gitlab/visibility_level.rb @@ -5,9 +5,9 @@ # module Gitlab module VisibilityLevel - PRIVATE = 0 - INTERNAL = 10 - PUBLIC = 20 + PRIVATE = 0 unless const_defined?(:PRIVATE) + INTERNAL = 10 unless const_defined?(:INTERNAL) + PUBLIC = 20 unless const_defined?(:PUBLIC) class << self def values @@ -21,7 +21,7 @@ module Gitlab 'Public' => PUBLIC } end - + def allowed_for?(user, level) user.is_admin? || !Gitlab.config.gitlab.restricted_visibility_levels.include?(level) end |