From 8f60144782ba564c63d757c11a72440202f2490c Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytses@gmail.com>
Date: Tue, 2 Dec 2014 10:32:24 +0100
Subject: [PATCH] Change avatar file size to 200kb.

---
 CHANGELOG                                              | 2 +-
 app/models/user.rb                                     | 2 +-
 app/views/profiles/show.html.haml                      | 2 +-
 app/views/shared/_choose_group_avatar_button.html.haml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 417bd3c2b4d..7f0c5f8436d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,7 +8,7 @@ v 7.6.0
   -
   -
   -
-  -
+  - Change maximum avatar file size from 100KB to 200KB
   -
   -
   -
diff --git a/app/models/user.rb b/app/models/user.rb
index fc191a78f53..1cddd85ada0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -124,7 +124,7 @@ class User < ActiveRecord::Base
   validate :namespace_uniq, if: ->(user) { user.username_changed? }
   validate :avatar_type, if: ->(user) { user.avatar_changed? }
   validate :unique_email, if: ->(user) { user.email_changed? }
-  validates :avatar, file_size: { maximum: 100.kilobytes.to_i }
+  validates :avatar, file_size: { maximum: 200.kilobytes.to_i }
 
   before_validation :generate_password, on: :create
   before_validation :sanitize_attrs
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index d6b52f86154..640104fdad1 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -83,7 +83,7 @@
             &nbsp;
             %span.file_name.js-avatar-filename File name...
             = f.file_field :avatar, class: "js-user-avatar-input hidden"
-            .light The maximum file size allowed is 100KB.
+            .light The maximum file size allowed is 200KB.
             - if @user.avatar?
               %hr
               = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-avatar"
diff --git a/app/views/shared/_choose_group_avatar_button.html.haml b/app/views/shared/_choose_group_avatar_button.html.haml
index f32c2d388a7..299c0bd42a2 100644
--- a/app/views/shared/_choose_group_avatar_button.html.haml
+++ b/app/views/shared/_choose_group_avatar_button.html.haml
@@ -4,4 +4,4 @@
 &nbsp;
 %span.file_name.js-avatar-filename File name...
 = f.file_field :avatar, class: 'js-group-avatar-input hidden'
-.light The maximum file size allowed is 100KB.
+.light The maximum file size allowed is 200KB.
-- 
GitLab