diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-04-12 00:17:24 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-04-12 10:14:54 +1200 |
| commit | 85b29c1c2fa3b94d7371cf454c485457a0756cb1 (patch) | |
| tree | 966fb0431e4208234442e610ccb061414fae3534 /spec/services/merge_requests/conflicts | |
| parent | ec7804444343cef3562d88aab2d255287a215430 (diff) | |
| download | gitlab-ce-85b29c1c2fa3b94d7371cf454c485457a0756cb1.tar.gz | |
Add frozen_string_literal to spec/servicesfrozen_string_literal_spec_services
Probably useful as we often move these files to "new" files.
Diffstat (limited to 'spec/services/merge_requests/conflicts')
| -rw-r--r-- | spec/services/merge_requests/conflicts/list_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/merge_requests/conflicts/resolve_service_spec.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/services/merge_requests/conflicts/list_service_spec.rb b/spec/services/merge_requests/conflicts/list_service_spec.rb index c81fa95e4b7..68a9c0a8b86 100644 --- a/spec/services/merge_requests/conflicts/list_service_spec.rb +++ b/spec/services/merge_requests/conflicts/list_service_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe MergeRequests::Conflicts::ListService do diff --git a/spec/services/merge_requests/conflicts/resolve_service_spec.rb b/spec/services/merge_requests/conflicts/resolve_service_spec.rb index 7edf8a96c94..74f20094081 100644 --- a/spec/services/merge_requests/conflicts/resolve_service_spec.rb +++ b/spec/services/merge_requests/conflicts/resolve_service_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe MergeRequests::Conflicts::ResolveService do |