gitlab-org--gitlab-foss/app
Marin Jankovski 9d0065f054 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
2016-01-29 08:12:18 +00:00
..
assets Merge branch 'issue_2406' into 'master' 2016-01-28 16:58:38 +00:00
controllers Merge branch 'mr-merge-base' into 'master' 2016-01-28 21:08:41 +00:00
finders Scope issue projects to a Group when possible 2016-01-18 12:27:33 +01:00
helpers Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-broken-update 2016-01-28 18:14:28 +01:00
mailers Added X-GitLab-... headers to emails from CI and Email On Push services 2016-01-19 20:18:39 +02:00
models Merge branch 'mr-merge-base' into 'master' 2016-01-28 21:08:41 +00:00
services Move Gitlab::BitbucketImport::KeyDeleter to it's own importer 2016-01-26 10:56:22 -02:00
uploaders Let the CI runner know about builds that this build depends on 2016-01-14 19:45:55 +01:00
validators Blacklist 'new' 2016-01-08 10:19:22 +01:00
views Merge branch 'highlight-blame' into 'master' 2016-01-28 20:30:21 +00:00
workers Extract Projects::ImportService service from RepositoryImportWorker 2016-01-25 22:58:30 -02:00