summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-17 12:25:34 +0000
committerRémy Coutable <remy@rymai.me>2018-04-17 12:25:34 +0000
commit2f3e74d82eac3103d93e3b078f28e4c051d65f1e (patch)
tree79c64700c3cc47e12222e0454a623874c9b3e778
parent423d0ba216a03b62d5e134ce826850e11005b853 (diff)
parentcbf2906496b5123fc7bf1be3094693790d047e11 (diff)
downloadgitlab-ce-2f3e74d82eac3103d93e3b078f28e4c051d65f1e.tar.gz
Merge branch 'blackst0ne-rails5-fix-ci-group-class-arel-table-error' into 'master'
[Rails5] Fix `undefined method 'arel_table' for Ci::Group:Class` error See merge request gitlab-org/gitlab-ce!18329
-rw-r--r--app/models/ci/group_variable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/group_variable.rb b/app/models/ci/group_variable.rb
index 62d768cc6cf..44cb583e1bd 100644
--- a/app/models/ci/group_variable.rb
+++ b/app/models/ci/group_variable.rb
@@ -4,7 +4,7 @@ module Ci
include HasVariable
include Presentable
- belongs_to :group
+ belongs_to :group, class_name: "::Group"
alias_attribute :secret_value, :value