diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb
index 6a671ab2630b774e64b0fe72feb5d806d4da58bf..fba80c7132e87409034d99ab5bd75306dee9546a 100644
--- a/lib/gitlab/asciidoc.rb
+++ b/lib/gitlab/asciidoc.rb
@@ -14,15 +14,11 @@ module Gitlab
     # Public: Converts the provided Asciidoc markup into HTML.
     #
     # input         - the source text in Asciidoc format
-    # asciidoc_opts - a Hash of options to pass to the Asciidoctor converter
     #
-    def self.render(input, asciidoc_opts = {})
-      asciidoc_opts.reverse_merge!(
-        safe: :secure,
-        backend: :gitlab_html5,
-        attributes: []
-      )
-      asciidoc_opts[:attributes].unshift(*DEFAULT_ADOC_ATTRS)
+    def self.render(input)
+      asciidoc_opts = { safe: :secure,
+                        backend: :gitlab_html5,
+                        attributes: DEFAULT_ADOC_ATTRS }
 
       plantuml_setup
 
diff --git a/spec/lib/gitlab/asciidoc_spec.rb b/spec/lib/gitlab/asciidoc_spec.rb
index bca57105d1d22227efa4444b1a883b1a832a7e8b..0f47fb2fbd93734c983560692c82f0d188ed8df5 100644
--- a/spec/lib/gitlab/asciidoc_spec.rb
+++ b/spec/lib/gitlab/asciidoc_spec.rb
@@ -22,26 +22,9 @@ module Gitlab
         expect(Asciidoctor).to receive(:convert)
           .with(input, expected_asciidoc_opts).and_return(html)
 
-        expect( render(input, context) ).to eql html
+        expect(render(input)).to eq(html)
       end
 
-      context "with asciidoc_opts" do
-        let(:asciidoc_opts) { { safe: :safe, attributes: ['foo'] } }
-
-        it "merges the options with default ones" do
-          expected_asciidoc_opts = {
-              safe: :safe,
-              backend: :gitlab_html5,
-              attributes: described_class::DEFAULT_ADOC_ATTRS + ['foo']
-          }
-
-          expect(Asciidoctor).to receive(:convert)
-            .with(input, expected_asciidoc_opts).and_return(html)
-
-          render(input, context, asciidoc_opts)
-        end
-      end
-      
       context "XSS" do
         links = {
           'links' => {
@@ -60,7 +43,7 @@ module Gitlab
 
         links.each do |name, data|
           it "does not convert dangerous #{name} into HTML" do
-            expect(render(data[:input], context)).to eql data[:output]
+            expect(render(data[:input])).to eq(data[:output])
           end
         end
       end