diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-10-05 13:48:22 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-10-05 13:48:22 +0300 |
| commit | 0c0c2ecd99cd5c4cb22a0c045f8d45d315203832 (patch) | |
| tree | 3900ccdcdff0cd6b8e3ed281ba57a317b801ad08 /app/assets/javascripts/monitoring/components/graph/flag.vue | |
| parent | ed3c25e4294bfc75f7167ed63e30561e39ac3a97 (diff) | |
| parent | de01353b166018a43ea92b38054b1267c3ba5cea (diff) | |
Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
# Conflicts:
# app/controllers/admin/users_controller.rb
# app/controllers/confirmations_controller.rb
# app/controllers/profiles/emails_controller.rb
# app/models/user.rb
# app/services/emails/base_service.rb
# app/services/emails/destroy_service.rb
# app/views/devise/mailer/confirmation_instructions.html.haml
# lib/api/users.rb
# spec/services/emails/destroy_service_spec.rb
Diffstat (limited to 'app/assets/javascripts/monitoring/components/graph/flag.vue')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/graph/flag.vue | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/monitoring/components/graph/flag.vue b/app/assets/javascripts/monitoring/components/graph/flag.vue index a98e3d06c18..10fb7ff6803 100644 --- a/app/assets/javascripts/monitoring/components/graph/flag.vue +++ b/app/assets/javascripts/monitoring/components/graph/flag.vue @@ -23,6 +23,10 @@ type: Number, required: true, }, + showFlagContent: { + type: Boolean, + required: true, + }, }, data() { @@ -57,6 +61,7 @@ transform="translate(-5, 20)"> </line> <svg + v-if="showFlagContent" class="rect-text-metric" :x="currentFlagPosition" y="0"> |