summaryrefslogtreecommitdiff
path: root/app/models/ci/variable.rb
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-24 20:21:45 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-24 20:21:45 +0000
commit4658c9a234b270897b0e9042a3f51fcdc376146b (patch)
tree36067d70dc06657a6d7fa890f3240d4ec55e76a4 /app/models/ci/variable.rb
parentc99d12e5b378661250ee23abc1a5ece03a813d6f (diff)
parent5480114477fcb0f6a7dcc49eb75582652cb007e5 (diff)
downloadgitlab-ce-4658c9a234b270897b0e9042a3f51fcdc376146b.tar.gz
Merge branch 'enable-scss-lint-trailing-whitespace' into 'master'
Enable trailingWhitespace in scss-lint ## What does this MR do? Enables `trailingWhitespace` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23485 See merge request !7077
Diffstat (limited to 'app/models/ci/variable.rb')
0 files changed, 0 insertions, 0 deletions