diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-12-02 15:26:06 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-12-02 15:26:06 +0000 |
| commit | 76abe0eded9a7b52c5d22ef1cbbecbb9ee700ed4 (patch) | |
| tree | 63a3182ccae15c2d6f0d1a1633f0598ab0d36c4d /app/assets/javascripts | |
| parent | a1556200421f8e55fe1999a004694831553321dc (diff) | |
| download | gitlab-ce-76abe0eded9a7b52c5d22ef1cbbecbb9ee700ed4.tar.gz | |
Change ref property to commitRef
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_item.js.es6 | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_common_component/commit.js.es6 | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6 index 7ead8a18c2a..77ed13fc5f3 100644 --- a/app/assets/javascripts/environments/components/environment_item.js.es6 +++ b/app/assets/javascripts/environments/components/environment_item.js.es6 @@ -451,7 +451,7 @@ <div v-if="!isFolder && hasLastDeploymentKey" class="js-commit-component"> <commit-component :tag="commitTag" - :ref="commitRef" + :commitRef="commitRef" :commit_url="commitUrl" :short_sha="commitShortSha" :title="commitTitle" diff --git a/app/assets/javascripts/vue_common_component/commit.js.es6 b/app/assets/javascripts/vue_common_component/commit.js.es6 index 1bc68c1ba2f..3ecb1efd2fc 100644 --- a/app/assets/javascripts/vue_common_component/commit.js.es6 +++ b/app/assets/javascripts/vue_common_component/commit.js.es6 @@ -23,7 +23,7 @@ * name * ref_url */ - ref: { + commitRef: { type: Object, required: false, default: () => ({}), @@ -79,8 +79,8 @@ * * @returns {Boolean} */ - hasRef() { - return this.ref && this.ref.name && this.ref.ref_url; + hasCommitRef() { + return this.commitRef && this.commitRef.name && this.commitRef.ref_url; }, /** @@ -131,15 +131,15 @@ template: ` <div class="branch-commit"> - <div v-if="hasRef" class="icon-container"> + <div v-if="hasCommitRef" class="icon-container"> <i v-if="tag" class="fa fa-tag"></i> <i v-if="!tag" class="fa fa-code-fork"></i> </div> - <a v-if="hasRef" + <a v-if="hasCommitRef" class="monospace branch-name" - :href="ref.ref_url"> - {{ref.name}} + :href="commitRef.ref_url"> + {{commitRef.name}} </a> <div class="icon-container commit-icon commit-icon-container"></div> |