gitlab-org--gitlab-foss/spec
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
..
benchmarks Move Markdown/reference logic from Gitlab::Markdown to Banzai 2015-12-15 15:51:16 +01:00
controllers Move blame group logic to dedicated class 2016-01-28 14:49:21 +01:00
factories Update commit status factory to reflect recent changes 2016-01-26 15:23:57 +01:00
features Merge branch 'rs-2fa-requirement-wording' into 'master' 2016-01-27 19:04:44 +00:00
finders remove public field from namespace and refactoring 2016-01-04 16:00:29 +02:00
fixtures Update tests 2016-01-20 17:14:26 +01:00
helpers Update text_color_for_bg helper to support RGB triplet color codes 2016-01-24 15:06:46 -08:00
initializers Ensure Gravatar host looks like an actual host 2016-01-18 14:58:16 +01:00
javascripts reverting more MR ajax files, will appear in different commit 2016-01-12 14:55:54 -05:00
lib Move blame group logic to dedicated class 2016-01-28 14:49:21 +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 'hotfix/ruby-21-broken-update' into 'master' 2016-01-29 08:12:18 +00:00
requests Improve consistency and duplication for Merge Request API 2016-01-28 14:26:12 +01:00
routing Fix broken specs. #2406 2016-01-20 00:14:58 -05:00
services Extract Projects::ImportService service from RepositoryImportWorker 2016-01-25 22:58:30 -02:00
support Let the CI runner know about builds that this build depends on 2016-01-14 19:45:55 +01:00
tasks/gitlab
views/help
workers Write to InfluxDB directly via UDP 2015-12-29 14:53:45 +01:00
factories.rb Unsubscribe from thread through link in email footer 2016-01-09 12:41:22 +01:00
factories_spec.rb
rails_helper.rb
spec_helper.rb Add temporary monkey patch to get specs passing on 4.2.5.1 2016-01-25 14:53:28 -08:00
teaspoon_env.rb