diff --git a/doc/api/tags.md b/doc/api/tags.md
index d428ca0ef5c..ac9fac92f4c 100644
--- a/doc/api/tags.md
+++ b/doc/api/tags.md
@@ -40,8 +40,8 @@ Parameters:
 
 ## Get a single repository tag
 
-Get a specific repository tag determined by its name. It returns 200 together
-with the tag information if the tag exists. It returns 404 if the tag does not
+Get a specific repository tag determined by its name. It returns `200` together
+with the tag information if the tag exists. It returns `404` if the tag does not
 exist.
 
 ```
diff --git a/lib/api/tags.rb b/lib/api/tags.rb
index 731a68082ba..d1a10479e44 100644
--- a/lib/api/tags.rb
+++ b/lib/api/tags.rb
@@ -19,15 +19,15 @@ module API
       # Get a single repository tag
       #
       # Parameters:
-      #   id (required) - The ID of a project
+      #   id (required)       - The ID of a project
       #   tag_name (required) - The name of the tag
       # Example Request:
       #   GET /projects/:id/repository/tags/:tag_name
-      get ":id/repository/tags/:tag_name", requirements: { tag_name: /.*/ } do
+      get ":id/repository/tags/:tag_name", requirements: { tag_name: /.+/ } do
         tag = user_project.repository.find_tag(params[:tag_name])
         not_found!('Tag') unless tag
 
-        present tag,  with: Entities::RepoTag, project: user_project
+        present tag, with: Entities::RepoTag, project: user_project
       end
 
       # Create tag
diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index acbd9c3e332..9f9c3b1cf4c 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -40,17 +40,17 @@ describe API::API, api: true  do
     end
   end
 
-  describe "GET /projects/:id/repository/tags/:tag_name" do
+  describe 'GET /projects/:id/repository/tags/:tag_name' do
     let(:tag_name) { project.repository.tag_names.sort.reverse.first }
 
-    it 'should return a specific tag' do
+    it 'returns a specific tag' do
       get api("/projects/#{project.id}/repository/tags/#{tag_name}", user)
 
       expect(response.status).to eq(200)
       expect(json_response['name']).to eq(tag_name)
     end
 
-    it 'should return 404 for an invalid tag name' do
+    it 'returns 404 for an invalid tag name' do
       get api("/projects/#{project.id}/repository/tags/foobar", user)
 
       expect(response.status).to eq(404)