diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-12-02 18:35:33 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-12-02 18:35:33 +0000 |
commit | 44dc4173306235dd6afdd50b685c69eb3087166b (patch) | |
tree | 0404eba255fbfeff00a208d9974bd69e5d47e398 /app/assets | |
parent | 2f91c0eef45e9501ba90976a64886aee56b90b46 (diff) | |
parent | f83927ebdeffb6529d864de51279509f18b99bc5 (diff) | |
download | gitlab-ce-44dc4173306235dd6afdd50b685c69eb3087166b.tar.gz |
Merge branch '25264-ref-commit' into 'master'
Change ref property to commitRef
## What does this MR do?
Changes `ref` prop to `commitRef` because `ref` is a reserved word in Vue.js
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25264
//cc @selfup
See merge request !7901
Diffstat (limited to 'app/assets')
-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..6ed14261fc3 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" + :commit_ref="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..2ef2959cbf4 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: { + commit_ref: { 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.commit_ref && this.commit_ref.name && this.commit_ref.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="commit_ref.ref_url"> + {{commit_ref.name}} </a> <div class="icon-container commit-icon commit-icon-container"></div> |