summaryrefslogtreecommitdiff
path: root/spec/finders
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-09-28 00:54:47 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-09-28 00:54:47 +0000
commit3b206ccb8393d8f2c5ad227874d9a60beb054782 (patch)
treee2e5f277cd132991dae726a137ffd190ef53cfe5 /spec/finders
parent4d4506ad6ee6d745f57d0e701e9e8bd13144f7ca (diff)
parent533a208a851be490dae2cedf1d397fcca91efa8e (diff)
downloadgitlab-ce-3b206ccb8393d8f2c5ad227874d9a60beb054782.tar.gz
Merge branch 'is-v-cloak-causing-master-to-fail-pls-no-why' into 'master'
Changed to v-cloak attr to hash rocket and string 'true' ## What does this MR do? Changed to v-cloak attr to hash rocket and string 'true' ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Maybe it's killing `master`? :confused: ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - 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? See merge request !6553
Diffstat (limited to 'spec/finders')
0 files changed, 0 insertions, 0 deletions