Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
This commit is contained in:
commit
86ce64f053
3 changed files with 21 additions and 28 deletions
|
@ -40,6 +40,7 @@ v 8.2.0 (unreleased)
|
|||
- 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
|
||||
- Ability to add release notes (markdown text and attachments) to git tags (aka Releases)
|
||||
- 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,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'
|
||||
|
|
|
@ -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('/')
|
||||
|
||||
|
|
Loading…
Reference in a new issue