Commit 0d9e08a8 authored by Valery Sizov's avatar Valery Sizov

Merge branch 'master' into ce-to-ee

parents 37fe73c3 5be2191b
......@@ -44,6 +44,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)
......
......@@ -7,44 +7,34 @@
%h3 Sign in
.login-body
- if form_based_providers.any?
- if form_based_providers.count >= 2 || signin_enabled?
%ul.nav.nav-tabs
- if kerberos_enabled?
%li{class: (:active unless crowd_enabled? || ldap_enabled?)}
= link_to "Kerberos", "#tab-kerberos", 'data-toggle' => 'tab'
- if crowd_enabled?
%li.active
= link_to "Crowd", "#tab-crowd", 'data-toggle' => 'tab'
- if ldap_enabled?
- @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 kerberos_enabled?
%div#tab-kerberos.tab-pane{class: (:active unless crowd_enabled? || ldap_enabled?)}
= render 'devise/sessions/new_kerberos', provider: :kerberos
- if crowd_enabled?
%div.tab-pane.active{id: "tab-crowd"}
= render 'devise/sessions/new_crowd'
- if ldap_enabled?
- @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 kerberos_enabled?
= render 'devise/sessions/new_kerberos', provider: :kerberos
- elsif crowd_enabled?
= render 'devise/sessions/new_crowd'
- elsif ldap_enabled?
= render 'devise/sessions/new_ldap', server: @ldap_servers.first
- elsif signin_enabled?
= render 'devise/sessions/new_base'
%li{class: (:active unless crowd_enabled? || ldap_enabled?)}
= link_to "Kerberos", "#tab-kerberos", 'data-toggle' => 'tab'
- if crowd_enabled?
%li.active
= link_to "Crowd", "#tab-crowd", 'data-toggle' => 'tab'
- if ldap_enabled?
- @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 kerberos_enabled?
%div#tab-kerberos.tab-pane{class: (:active unless crowd_enabled? || ldap_enabled?)}
= render 'devise/sessions/new_kerberos', provider: :kerberos
- if crowd_enabled?
%div.tab-pane.active{id: "tab-crowd"}
= render 'devise/sessions/new_crowd'
- if ldap_enabled?
- @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'
= render 'devise/sessions/new_base'
\ No newline at end of file
......@@ -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('/')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment