Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-03 03:08:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-03 03:08:46 +0300
commit8d805598c7c94d86fceb6767a8ce53b2963000a2 (patch)
tree42308835a007991a12b4dbb0882596a6a2b31ec7 /app/assets/javascripts/projects
parentd93f280b17046ed62adc9640838dba6a23bb9a25 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects')
-rw-r--r--app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
index 00e5848522e..089cac9ee4c 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
@@ -110,7 +110,7 @@ export default {
<input
ref="service-desk-incoming-email"
type="text"
- class="form-control incoming-email h-auto"
+ class="form-control incoming-email"
:placeholder="__('Incoming email')"
:aria-label="__('Incoming email')"
aria-describedby="incoming-email-describer"
@@ -121,7 +121,7 @@ export default {
<clipboard-button
:title="__('Copy')"
:text="incomingEmail"
- css-class="btn qa-clipboard-button"
+ css-class="input-group-text qa-clipboard-button"
/>
</div>
</div>