diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-17 15:01:20 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-17 15:01:20 +0000 |
commit | 546fa165ff728bc2d25ed9b55b95dd1d48139d4a (patch) | |
tree | 612a9800dba636c8053706363675bbac2c91c626 /spec | |
parent | e47989a58b8a9f83855ea9210ba5786fc14fb841 (diff) | |
parent | 170efaaba273792ddffc2806ef1501f33d87a5a2 (diff) | |
download | gitlab-ce-546fa165ff728bc2d25ed9b55b95dd1d48139d4a.tar.gz |
Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into 'master'
Enable Style/MultilineOperationIndentation in Rubocop
Fixes #25741
See merge request !8125
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/gfm/reference_rewriter_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/projects_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/gfm/reference_rewriter_spec.rb b/spec/lib/gitlab/gfm/reference_rewriter_spec.rb index d619e401897..f4703dc704f 100644 --- a/spec/lib/gitlab/gfm/reference_rewriter_spec.rb +++ b/spec/lib/gitlab/gfm/reference_rewriter_spec.rb @@ -29,7 +29,7 @@ describe Gitlab::Gfm::ReferenceRewriter do context 'description with ignored elements' do let(:text) do "Hi. This references #1, but not `#2`\n" + - '<pre>and not !1</pre>' + '<pre>and not !1</pre>' end it { is_expected.to include issue_first.to_reference(new_project) } diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index c5d67a90abc..8304c408064 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -167,7 +167,7 @@ describe API::Projects, api: true do expect(json_response).to satisfy do |response| response.one? do |entry| entry.has_key?('permissions') && - entry['name'] == project.name && + entry['name'] == project.name && entry['owner']['username'] == user.username end end |