summaryrefslogtreecommitdiff
path: root/.simplecov
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2016-01-29 08:12:18 +0000
committerMarin Jankovski <marin@gitlab.com>2016-01-29 08:12:18 +0000
commit9d0065f05455e1f9146ab30a3aaf903472c9b8f4 (patch)
tree3e43624c81f66e5dfcba4d9c55a80c99ceec4177 /.simplecov
parent92c04ecbd7308b7ccb53bb4a8adac8706285f481 (diff)
parent6e4d36b49d7fc9c41e136f234c6b5dd74a86df50 (diff)
downloadgitlab-ce-9d0065f05455e1f9146ab30a3aaf903472c9b8f4.tar.gz
Merge branch 'hotfix/ruby-21-broken-update' into 'master'
fix syntax error on 2.1 and rubocop on 2.2 Background: Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`. Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801 See merge request !2637
Diffstat (limited to '.simplecov')
0 files changed, 0 insertions, 0 deletions