Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 12:54:24 +0300
committerDouwe Maan <douwe@gitlab.com>2015-12-02 12:54:24 +0300
commit9aac53bcee8f5fc99ec84036d688801d987959ea (patch)
tree0cd600bf7810e50165e76433ebe162969e1d20b2
parent2f5074dc395c784f91abb3bacd23e75ce080a547 (diff)
Satisfy Rubocop
-rw-r--r--app/models/commit_range.rb2
-rw-r--r--spec/lib/gitlab/markdown/commit_reference_filter_spec.rb2
-rw-r--r--spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/commit_range.rb b/app/models/commit_range.rb
index b8bf36b32ce..14e7971fa06 100644
--- a/app/models/commit_range.rb
+++ b/app/models/commit_range.rb
@@ -93,7 +93,7 @@ class CommitRange
def to_reference(from_project = nil)
if cross_project_reference?(from_project)
- reference = project.to_reference + self.class.reference_prefix + self.id
+ project.to_reference + self.class.reference_prefix + self.id
else
self.id
end
diff --git a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
index 78a3603269c..462a41b4756 100644
--- a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
@@ -152,7 +152,7 @@ module Gitlab::Markdown
end
it 'ignores invalid commit IDs on the referenced project' do
- exp = act = "Committed #{invalidate_reference(reference)}"
+ act = "Committed #{invalidate_reference(reference)}"
expect(reference_filter(act).to_html).to match(/<a.+>#{Regexp.escape(invalidate_reference(reference))}<\/a>/)
end
diff --git a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
index b6f05710c3b..3a9acc9d6d4 100644
--- a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
@@ -134,7 +134,7 @@ module Gitlab::Markdown
end
it 'ignores invalid snippet IDs on the referenced project' do
- exp = act = "See #{invalidate_reference(reference)}"
+ act = "See #{invalidate_reference(reference)}"
expect(reference_filter(act).to_html).to match(/<a.+>#{Regexp.escape(invalidate_reference(reference))}<\/a>/)
end