summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-06 15:08:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-06 15:08:18 +0000
commit81e6c766712fb3d70a8d265f742c5bd01b9bfb25 (patch)
treed75e77c7ab6f7269930a116c1eb662a2b00546a0
parent07e23c70f1b3db4c10de22989d3bacd2cf56abf3 (diff)
downloadgitlab-ce-81e6c766712fb3d70a8d265f742c5bd01b9bfb25.tar.gz
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--app/assets/javascripts/blob/file_template_selector.js8
-rw-r--r--changelogs/unreleased/202262-migrate-spinner-for-app-assets-javascripts-blob-file_template_sele.yml5
-rw-r--r--changelogs/unreleased/app-logger-4.yml5
-rw-r--r--lib/gitlab/auth/ldap/person.rb2
4 files changed, 17 insertions, 3 deletions
diff --git a/app/assets/javascripts/blob/file_template_selector.js b/app/assets/javascripts/blob/file_template_selector.js
index 476901aae75..bd39aa2e16f 100644
--- a/app/assets/javascripts/blob/file_template_selector.js
+++ b/app/assets/javascripts/blob/file_template_selector.js
@@ -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) {
diff --git a/changelogs/unreleased/202262-migrate-spinner-for-app-assets-javascripts-blob-file_template_sele.yml b/changelogs/unreleased/202262-migrate-spinner-for-app-assets-javascripts-blob-file_template_sele.yml
new file mode 100644
index 00000000000..fe300716d98
--- /dev/null
+++ b/changelogs/unreleased/202262-migrate-spinner-for-app-assets-javascripts-blob-file_template_sele.yml
@@ -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
diff --git a/changelogs/unreleased/app-logger-4.yml b/changelogs/unreleased/app-logger-4.yml
new file mode 100644
index 00000000000..1bd7e662f0c
--- /dev/null
+++ b/changelogs/unreleased/app-logger-4.yml
@@ -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
diff --git a/lib/gitlab/auth/ldap/person.rb b/lib/gitlab/auth/ldap/person.rb
index 8c5000147c4..88b93776bec 100644
--- a/lib/gitlab/auth/ldap/person.rb
+++ b/lib/gitlab/auth/ldap/person.rb
@@ -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