From 4bb99677b1ddee84ab0433efe081de8025e5aa53 Mon Sep 17 00:00:00 2001
From: Alec Cooper <ahnolds@gmail.com>
Date: Thu, 12 Nov 2015 21:38:26 -0500
Subject: [PATCH 1/2] Relative links in the README file shown on the repository
 homepage should point to the default branch, not to master

---
 CHANGELOG                                   | 1 +
 lib/gitlab/markdown/relative_link_filter.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1bd60728e6f..5d22e950914 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -39,6 +39,7 @@ v 8.2.0 (unreleased)
   - Improve Continuous Integration graphs page
   - Make color of "Accept Merge Request" button consistent with current build status
   - Add ignore white space option in merge request diff and commit and compare view
+  - Relative links from a repositories README.md now link to the default branch
 
 v 8.1.4
   - Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
diff --git a/lib/gitlab/markdown/relative_link_filter.rb b/lib/gitlab/markdown/relative_link_filter.rb
index 6ee3d1ce039..632be4d7542 100644
--- a/lib/gitlab/markdown/relative_link_filter.rb
+++ b/lib/gitlab/markdown/relative_link_filter.rb
@@ -51,7 +51,7 @@ module Gitlab
           relative_url_root,
           context[:project].path_with_namespace,
           path_type(file_path),
-          ref || 'master',  # assume that if no ref exists we can point to master
+          ref || context[:project].default_branch,  # if no ref exists, point to the default branch
           file_path
         ].compact.join('/').squeeze('/').chomp('/')
 

From 9337da7864756116f3865e14d46227ffe857d0e5 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 15 Nov 2015 21:37:13 -0500
Subject: [PATCH 2/2] Revert "Merge pull request #9812 from
 chrspeich/hide-tabs-lone-auth-provider"

This reverts commit 84999611d8f7894219eb4ebc76555c79b1f14794, reversing
changes made to 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b.
---
 app/views/devise/shared/_signin_box.html.haml | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml
index 9a1331b2549..41ad2c231d4 100644
--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
@@ -7,34 +7,26 @@
       %h3 Sign in
   .login-body
     - if form_based_providers.any?
-      - if form_based_providers.count >= 2 || signin_enabled?
-        %ul.nav.nav-tabs
-          - if crowd_enabled?
-            %li.active
-              = link_to "Crowd", "#tab-crowd", 'data-toggle' => 'tab'
-          - @ldap_servers.each_with_index do |server, i|
-            %li{class: (:active if i.zero? && !crowd_enabled?)}
-              = link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab'
-          - if signin_enabled?
-            %li
-              = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
-        .tab-content
-          - if crowd_enabled?
-            %div.tab-pane.active{id: "tab-crowd"}
-              = render 'devise/sessions/new_crowd'
-          - @ldap_servers.each_with_index do |server, i|
-            %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero? && !crowd_enabled?)}
-              = render 'devise/sessions/new_ldap', server: server
-          - if signin_enabled?
-            %div#tab-signin.tab-pane
-              = render 'devise/sessions/new_base'
-      - else
+      %ul.nav.nav-tabs
         - if crowd_enabled?
-          = render 'devise/sessions/new_crowd'
-        - elsif @ldap_servers.any?
-          = render 'devise/sessions/new_ldap', server: @ldap_servers.first
-        - elsif signin_enabled?
-          = render 'devise/sessions/new_base'
+          %li.active
+            = link_to "Crowd", "#tab-crowd", 'data-toggle' => 'tab'
+        - @ldap_servers.each_with_index do |server, i|
+          %li{class: (:active if i.zero? && !crowd_enabled?)}
+            = link_to server['label'], "#tab-#{server['provider_name']}", 'data-toggle' => 'tab'
+        - if signin_enabled?
+          %li
+            = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
+      .tab-content
+        - if crowd_enabled?
+          %div.tab-pane.active{id: "tab-crowd"}
+            = render 'devise/sessions/new_crowd'
+        - @ldap_servers.each_with_index do |server, i|
+          %div.tab-pane{id: "tab-#{server['provider_name']}", class: (:active if i.zero? && !crowd_enabled?)}
+            = render 'devise/sessions/new_ldap', server: server
+        - if signin_enabled?
+          %div#tab-signin.tab-pane
+            = render 'devise/sessions/new_base'
 
     - elsif signin_enabled?
       = render 'devise/sessions/new_base'