diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-12-08 05:19:39 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-12-08 07:52:08 -0800 |
| commit | 3d654cc0faa67e5aee41fda31de095060714ecc4 (patch) | |
| tree | fd94505a5bf9f216ada9484a3eb4ce0b94a8f3fa | |
| parent | 4cd259e91dd54cda479d114210c6b7dc9113a5cc (diff) | |
| download | gitlab-ce-3d654cc0faa67e5aee41fda31de095060714ecc4.tar.gz | |
Fix broken group avatar upload
Closes #3918
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index f4f9332b502..c3aaa186ceb 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 8.3.0 (unreleased) - Bump gollum-lib to 4.1.0 (Stan Hu) + - Fix broken group avatar upload under "New group" (Stan Hu) - Fix API setting of 'public' attribute to false will make a project private (Stan Hu) - Handle and report SSL errors in Web hook test (Stan Hu) - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera) diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 4059fc39c67..599b4c49540 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -83,7 +83,7 @@ class Dispatcher when 'projects:project_members:index' new ProjectMembers() new UsersSelect() - when 'groups:new', 'groups:edit', 'admin:groups:edit' + when 'groups:new', 'groups:edit', 'admin:groups:edit', 'admin:groups:new' new GroupAvatar() when 'projects:tree:show' new TreeView() |