diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-10-28 18:56:13 -0200 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-11-01 11:03:56 -0200 |
commit | f4e31b820e0cebd0f4bd0fe5a5d6a7a3c903a969 (patch) | |
tree | 989a8987858d3d8891a31b941a4a54d052deaaea /lib | |
parent | 957308af84ca8312ea362c7272a4008dac808086 (diff) | |
download | gitlab-ce-f4e31b820e0cebd0f4bd0fe5a5d6a7a3c903a969.tar.gz |
Fix project features default values
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/helpers.rb | 10 | ||||
-rw-r--r-- | lib/gitlab/utils.rb | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 8025581d3ca..3c9d7b1aaef 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -1,18 +1,12 @@ module API module Helpers + include Gitlab::Utils + PRIVATE_TOKEN_HEADER = "HTTP_PRIVATE_TOKEN" PRIVATE_TOKEN_PARAM = :private_token SUDO_HEADER = "HTTP_SUDO" SUDO_PARAM = :sudo - def to_boolean(value) - return value if [true, false].include?(value) - return true if value =~ /^(true|t|yes|y|1|on)$/i - return false if value =~ /^(false|f|no|n|0|off)$/i - - nil - end - def private_token params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER] end diff --git a/lib/gitlab/utils.rb b/lib/gitlab/utils.rb index e59ead5d76c..4c395b4266e 100644 --- a/lib/gitlab/utils.rb +++ b/lib/gitlab/utils.rb @@ -13,5 +13,13 @@ module Gitlab def force_utf8(str) str.force_encoding(Encoding::UTF_8) end + + def to_boolean(value) + return value if [true, false].include?(value) + return true if value =~ /^(true|t|yes|y|1|on)$/i + return false if value =~ /^(false|f|no|n|0|off)$/i + + nil + end end end |