diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-24 07:46:06 -0700 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-08-24 12:25:41 -0700 |
| commit | 6652fac234ef978b3d2a0a2ffb23c9225e7860de (patch) | |
| tree | 83c945ff3414142d2a20374f0cf65e3295b46fda | |
| parent | 683f77bc5ae571323b0917d06b6ca9adedc1278c (diff) | |
| download | gitlab-ce-6652fac234ef978b3d2a0a2ffb23c9225e7860de.tar.gz | |
Fix Error 500 in API when accessing a group that has an avatar
Closes #2340
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/group.rb | 1 | ||||
| -rw-r--r-- | spec/requests/api/groups_spec.rb | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index b59b868f9a8..e386e882a65 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.1 (unreleased) - Only include base URL in OmniAuth full_host parameter (Stan Hu) + - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu) v 7.14.0 - Fix bug where non-project members of the target project could set labels on new merge requests. diff --git a/app/models/group.rb b/app/models/group.rb index 4ff610f8e9d..9cd146bb73b 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -17,6 +17,7 @@ require 'carrierwave/orm/activerecord' require 'file_size_validator' class Group < Namespace + include Gitlab::ConfigHelper include Referable has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember' diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb index 1d5b4f6f36b..13cced81875 100644 --- a/spec/requests/api/groups_spec.rb +++ b/spec/requests/api/groups_spec.rb @@ -7,7 +7,8 @@ describe API::API, api: true do let(:user2) { create(:user) } let(:user3) { create(:user) } let(:admin) { create(:admin) } - let!(:group1) { create(:group) } + let(:avatar_file_path) { File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif') } + let!(:group1) { create(:group, avatar: File.open(avatar_file_path)) } let!(:group2) { create(:group) } before do |