Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
07e23c70f1
commit
81e6c76671
|
@ -45,11 +45,15 @@ export default class FileTemplateSelector {
|
|||
}
|
||||
|
||||
renderLoading() {
|
||||
this.$loadingIcon.addClass('fa-spinner fa-spin').removeClass('fa-chevron-down');
|
||||
this.$loadingIcon
|
||||
.addClass('gl-spinner gl-spinner-orange gl-spinner-sm')
|
||||
.removeClass('fa-chevron-down');
|
||||
}
|
||||
|
||||
renderLoaded() {
|
||||
this.$loadingIcon.addClass('fa-chevron-down').removeClass('fa-spinner fa-spin');
|
||||
this.$loadingIcon
|
||||
.addClass('fa-chevron-down')
|
||||
.removeClass('gl-spinner gl-spinner-orange gl-spinner-sm');
|
||||
}
|
||||
|
||||
reportSelection(options) {
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/blob/file_template_selector.js'
|
||||
merge_request: 41146
|
||||
author: Gilang Gumilar
|
||||
type: changed
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Use applogger in group.rb, access.rb and repo update mirror worker
|
||||
merge_request: 41049
|
||||
author: Rajendra Kadam
|
||||
type: other
|
|
@ -45,7 +45,7 @@ module Gitlab
|
|||
def self.normalize_dn(dn)
|
||||
::Gitlab::Auth::Ldap::DN.new(dn).to_normalized_s
|
||||
rescue ::Gitlab::Auth::Ldap::DN::FormatError => e
|
||||
Rails.logger.info("Returning original DN \"#{dn}\" due to error during normalization attempt: #{e.message}") # rubocop:disable Gitlab/RailsLogger
|
||||
Gitlab::AppLogger.info("Returning original DN \"#{dn}\" due to error during normalization attempt: #{e.message}") # rubocop:disable Gitlab/RailsLogger
|
||||
|
||||
dn
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue