diff options
author | James Lopez <james@gitlab.com> | 2018-03-22 11:04:03 +0000 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2018-03-22 11:04:03 +0000 |
commit | 2eab1fd2c9a7db1f9cc71a706c5ac0cfdc61c953 (patch) | |
tree | 1ed85940487b28510f4038923febac6f5ee453c6 /app/assets/javascripts/performance_bar/components/performance_bar_app.vue | |
parent | 4d0ec5b1284e45f9b927d354d6408cf174ad243b (diff) | |
parent | d68ddc8366dec3a9aed357c96446a43d36e5de43 (diff) | |
download | gitlab-ce-2eab1fd2c9a7db1f9cc71a706c5ac0cfdc61c953.tar.gz |
Merge branch 'master' into 'latest-security-to-master-21-03-18'
# Conflicts:
# Gemfile
# Gemfile.lock
Diffstat (limited to 'app/assets/javascripts/performance_bar/components/performance_bar_app.vue')
-rw-r--r-- | app/assets/javascripts/performance_bar/components/performance_bar_app.vue | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue index 88345cf2ad9..2fd1715ee79 100644 --- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue @@ -113,27 +113,21 @@ export default { id="js-peek" :class="env" > - <request-selector - v-if="currentRequest" - :current-request="currentRequest" - :requests="requests" - @change-current-request="changeCurrentRequest" - /> - <div - id="peek-view-host" - class="view prepend-left-5" - > - <span - v-if="currentRequest && currentRequest.details" - class="current-host" - > - {{ currentRequest.details.host.hostname }} - </span> - </div> <div v-if="currentRequest" - class="wrapper" + class="container-fluid container-limited" > + <div + id="peek-view-host" + class="view" + > + <span + v-if="currentRequest.details" + class="current-host" + > + {{ currentRequest.details.host.hostname }} + </span> + </div> <upstream-performance-bar v-if="initialRequest && currentRequest.details" /> @@ -186,6 +180,12 @@ export default { gc </span> </div> + <request-selector + v-if="currentRequest" + :current-request="currentRequest" + :requests="requests" + @change-current-request="changeCurrentRequest" + /> </div> </div> </template> |