Merge remote-tracking branch 'ce/7-14-stable' into 7-14-stable-ee

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
-v 8.0.0 (unreleased)
-  - Remove satellites
-  - Better performance for web editor (switched from satellites to rugged)
-  - Faster merge
-  - Ability to fetch merge requests from refs/merge-requests/:id
+v 7.14.1
+  - 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.

VERSION

-7.14.0-ee
\ No newline at end of file
+7.14.0-ee

app/models/group.rb

@@ -17,6 +17,7 @@
 require 'file_size_validator'
 class Group < Namespace
+  include Gitlab::ConfigHelper
   include Referable
   has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember'

config/initializers/1_settings.rb

@@ -8,7 +8,7 @@ class << self
     def gitlab_on_standard_port?
       gitlab.port.to_i == (gitlab.https ? 443 : 80)
     end
-    
+
     # get host without www, thanks to http://stackoverflow.com/a/6674363/1233435
     def get_host_without_www(url)
       url = URI.encode(url)
@@ -32,14 +32,12 @@ def build_gitlab_shell_ssh_path_prefix
       end
     end
+    def build_base_gitlab_url
+      base_gitlab_url.join('')
+    end
+
     def build_gitlab_url
-      custom_port = gitlab_on_standard_port? ? nil : ":#{gitlab.port}"
-      [ gitlab.protocol,
-        "://",
-        gitlab.host,
-        custom_port,
-        gitlab.relative_url_root
-      ].join('')
+      (base_gitlab_url + [gitlab.relative_url_root]).join('')
     end
     # check that values in `current` (string or integer) is a contant in `modul`.
@@ -64,6 +62,17 @@ def verify_constant(modul, current, default)
       end
       value
     end
+
+    private
+
+    def base_gitlab_url
+      custom_port = gitlab_on_standard_port? ? nil : ":#{gitlab.port}"
+      [ gitlab.protocol,
+        "://",
+        gitlab.host,
+        custom_port
+      ]
+    end
   end
 end
@@ -152,6 +161,7 @@ def verify_constant(modul, current, default)
 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
 Settings.gitlab['email_display_name'] ||= "GitLab"
 Settings.gitlab['email_reply_to'] ||= "noreply@#{Settings.gitlab.host}"
+Settings.gitlab['base_url']   ||= Settings.send(:build_base_gitlab_url)
 Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
 Settings.gitlab['user']       ||= 'git'
 Settings.gitlab['user_home']  ||= begin

config/initializers/7_omniauth.rb

@@ -14,7 +14,7 @@ module OmniAuth::Strategies
   end
 end
-OmniAuth.config.full_host = Settings.gitlab['url']
+OmniAuth.config.full_host = Settings.gitlab['base_url']
 OmniAuth.config.allowed_request_methods = [:post]
 #In case of auto sign-in, the GET method is used (users don't get to click on a button)
 OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present?

spec/requests/api/groups_spec.rb

@@ -7,7 +7,8 @@
   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