-
GitLab Bot authored
# Conflicts: # app/assets/stylesheets/pages/milestone.scss # app/controllers/admin/application_settings_controller.rb # lib/gitlab.rb # spec/features/admin/admin_settings_spec.rb # spec/lib/gitlab_spec.rb [ci skip]
33967fb7
# Conflicts: # app/assets/stylesheets/pages/milestone.scss # app/controllers/admin/application_settings_controller.rb # lib/gitlab.rb # spec/features/admin/admin_settings_spec.rb # spec/lib/gitlab_spec.rb [ci skip]