From ea4777ff501e370a39ae30e76a955136afe3c1fa Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 31 Dec 2015 15:19:13 +0100
Subject: Add features for list and show details of variables in API

---
 app/models/ci/variable.rb           |  1 +
 lib/api/api.rb                      |  2 +
 lib/api/entities.rb                 |  4 ++
 lib/api/variables.rb                | 43 +++++++++++++++++++++
 spec/factories/ci/variables.rb      | 25 +++++++++++++
 spec/requests/api/variables_spec.rb | 75 +++++++++++++++++++++++++++++++++++++
 6 files changed, 150 insertions(+)
 create mode 100644 lib/api/variables.rb
 create mode 100644 spec/factories/ci/variables.rb
 create mode 100644 spec/requests/api/variables_spec.rb

diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index 56759d3e50f..0e2712086ca 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -9,6 +9,7 @@
 #  encrypted_value      :text
 #  encrypted_value_salt :string(255)
 #  encrypted_value_iv   :string(255)
+#  gl_project_id        :integer
 #
 
 module Ci
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 7834262d612..a9e1913f0f2 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -54,5 +54,7 @@ module API
     mount Keys
     mount Tags
     mount Triggers
+
+    mount Variables
   end
 end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 26e7c956e8f..f71d072f269 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -365,5 +365,9 @@ module API
     class TriggerRequest < Grape::Entity
       expose :id, :variables
     end
+
+    class Variable < Grape::Entity
+      expose :id, :key, :value
+    end
   end
 end
diff --git a/lib/api/variables.rb b/lib/api/variables.rb
new file mode 100644
index 00000000000..6517150f6f4
--- /dev/null
+++ b/lib/api/variables.rb
@@ -0,0 +1,43 @@
+module API
+  # Projects variables API
+  class Variables < Grape::API
+    before { authenticate! }
+    before { authorize_admin_project }
+
+    resource :projects do
+      # Get project variables
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   page (optional) - The page number for pagination
+      #   per_page (optional) - The value of items per page to show
+      # Example Request:
+      #   GET /projects/:id/variables
+      get ':id/variables' do
+        variables = user_project.variables
+        present paginate(variables), with: Entities::Variable
+      end
+
+      # Get specifica bariable of a project
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   variable_id (required) - The ID OR `key` of variable to show; if variable_id contains only digits it's treated
+      #                            as ID other ways it's treated as `key`
+      # Example Reuest:
+      #   GET /projects/:id/variables/:variable_id
+      get ':id/variables/:variable_id' do
+        variable_id = params[:variable_id]
+        variables = user_project.variables
+        variables =
+          if variable_id.match(/^\d+$/)
+            variables.where(id: variable_id.to_i)
+          else
+            variables.where(key: variable_id)
+          end
+
+        present variables.first, with: Entities::Variable
+      end
+    end
+  end
+end
diff --git a/spec/factories/ci/variables.rb b/spec/factories/ci/variables.rb
new file mode 100644
index 00000000000..c3dcb678da7
--- /dev/null
+++ b/spec/factories/ci/variables.rb
@@ -0,0 +1,25 @@
+# == Schema Information
+#
+# Table name: ci_variables
+#
+#  id                   :integer          not null, primary key
+#  project_id           :integer          not null
+#  key                  :string(255)
+#  value                :text
+#  encrypted_value      :text
+#  encrypted_value_salt :string(255)
+#  encrypted_value_iv   :string(255)
+#  gl_project_id        :integer
+#
+
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :ci_variable, class: Ci::Variable do
+    id 1
+    key 'TEST_VARIABLE_1'
+    value 'VALUE_1'
+
+    project factory: :empty_project
+  end
+end
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
new file mode 100644
index 00000000000..8f66f5432b6
--- /dev/null
+++ b/spec/requests/api/variables_spec.rb
@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe API::API, api: true do
+  include ApiHelpers
+
+  let(:user) { create(:user) }
+  let(:user2) { create(:user) }
+  let!(:project) { create(:project, creator_id: user.id) }
+  let!(:master) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+  let!(:developer) { create(:project_member, user: user2, project: project, access_level: ProjectMember::DEVELOPER) }
+  let!(:variable) { create(:ci_variable, project: project) }
+
+  describe 'GET /projects/:id/variables' do
+    context 'authorized user with proper permissions' do
+      it 'should return project variables' do
+        get api("/projects/#{project.id}/variables", user)
+
+        expect(response.status).to eq(200)
+        expect(json_response).to be_a(Array)
+      end
+    end
+
+    context 'authorized user with invalid permissions' do
+      it 'should not return project variables' do
+        get api("/projects/#{project.id}/variables", user2)
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'unauthorized user' do
+      it 'should not return project variables' do
+        get api("/projects/#{project.id}/variables")
+
+        expect(response.status).to eq(401)
+      end
+    end
+  end
+
+  describe 'GET /projects/:id/variables/:variable_id' do
+    context 'authorized user with proper permissions' do
+      it 'should return project variable details when ID is used as :variable_id' do
+        get api("/projects/#{project.id}/variables/1", user)
+
+        expect(response.status).to eq(200)
+        expect(json_response['key']).to eq('TEST_VARIABLE_1')
+        expect(json_response['value']).to eq('VALUE_1')
+      end
+
+      it 'should return project variable details when `key` is used as :variable_id' do
+        get api("/projects/#{project.id}/variables/TEST_VARIABLE_1", user)
+
+        expect(response.status).to eq(200)
+        expect(json_response['id']).to eq(1)
+        expect(json_response['value']).to eq('VALUE_1')
+      end
+    end
+
+    context 'authorized user with invalid permissions' do
+      it 'should not return project variable details' do
+        get api("/projects/#{project.id}/variables/1", user2)
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'unauthorized user' do
+      it 'should not return project variable details' do
+        get api("/projects/#{project.id}/variables/1")
+
+        expect(response.status).to eq(401)
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From a692ce1c079703c4f3947e1d0a29547189e94d0f Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 31 Dec 2015 16:25:49 +0100
Subject: Add update feature for variables API

---
 lib/api/variables.rb                | 21 ++++++++++++++-
 spec/requests/api/variables_spec.rb | 52 +++++++++++++++++++++++++++++++------
 2 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index 6517150f6f4..6522ecba70c 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -24,7 +24,7 @@ module API
       #   id (required) - The ID of a project
       #   variable_id (required) - The ID OR `key` of variable to show; if variable_id contains only digits it's treated
       #                            as ID other ways it's treated as `key`
-      # Example Reuest:
+      # Example Request:
       #   GET /projects/:id/variables/:variable_id
       get ':id/variables/:variable_id' do
         variable_id = params[:variable_id]
@@ -38,6 +38,25 @@ module API
 
         present variables.first, with: Entities::Variable
       end
+
+      # Update existing variable of a project
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   variable_id (required) - The ID of a variable
+      #   key (optional) - new value for `key` field of variable
+      #   value (optional) - new value for `value` field of variable
+      # Example Request:
+      #   PUT /projects/:id/variables/:variable_id
+      put ':id/variables/:variable_id' do
+        variable = user_project.variables.where(id: params[:variable_id].to_i).first
+
+        variable.key = params[:key]
+        variable.value = params[:value]
+        variable.save!
+
+        present variable, with: Entities::Variable
+      end
     end
   end
 end
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
index 8f66f5432b6..3f58277c4ae 100644
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -40,25 +40,25 @@ describe API::API, api: true do
   describe 'GET /projects/:id/variables/:variable_id' do
     context 'authorized user with proper permissions' do
       it 'should return project variable details when ID is used as :variable_id' do
-        get api("/projects/#{project.id}/variables/1", user)
+        get api("/projects/#{project.id}/variables/#{variable.id}", user)
 
         expect(response.status).to eq(200)
-        expect(json_response['key']).to eq('TEST_VARIABLE_1')
-        expect(json_response['value']).to eq('VALUE_1')
+        expect(json_response['key']).to eq(variable.key)
+        expect(json_response['value']).to eq(variable.value)
       end
 
       it 'should return project variable details when `key` is used as :variable_id' do
-        get api("/projects/#{project.id}/variables/TEST_VARIABLE_1", user)
+        get api("/projects/#{project.id}/variables/#{variable.key}", user)
 
         expect(response.status).to eq(200)
-        expect(json_response['id']).to eq(1)
-        expect(json_response['value']).to eq('VALUE_1')
+        expect(json_response['id']).to eq(variable.id)
+        expect(json_response['value']).to eq(variable.value)
       end
     end
 
     context 'authorized user with invalid permissions' do
       it 'should not return project variable details' do
-        get api("/projects/#{project.id}/variables/1", user2)
+        get api("/projects/#{project.id}/variables/#{variable.id}", user2)
 
         expect(response.status).to eq(403)
       end
@@ -66,7 +66,43 @@ describe API::API, api: true do
 
     context 'unauthorized user' do
       it 'should not return project variable details' do
-        get api("/projects/#{project.id}/variables/1")
+        get api("/projects/#{project.id}/variables/#{variable.id}")
+
+        expect(response.status).to eq(401)
+      end
+    end
+  end
+
+  describe 'PUT /projects/:id/variables/:variable_id' do
+    context 'authorized user with proper permissions' do
+      it 'should update variable data' do
+        initial_variable = project.variables.first
+        key_before = initial_variable.key
+        value_before = initial_variable.value
+
+        put api("/projects/#{project.id}/variables/#{variable.id}", user), key: 'TEST_VARIABLE_1_UP', value: 'VALUE_1_UP'
+
+        updated_variable = project.variables.first
+
+        expect(response.status).to eq(200)
+        expect(key_before).to eq(variable.key)
+        expect(value_before).to eq(variable.value)
+        expect(updated_variable.key).to eq('TEST_VARIABLE_1_UP')
+        expect(updated_variable.value).to eq('VALUE_1_UP')
+      end
+    end
+
+    context 'authorized user with invalid permissions' do
+      it 'should not update variable' do
+        put api("/projects/#{project.id}/variables/#{variable.id}", user2)
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'unauthorized user' do
+      it 'should not return project variable details' do
+        put api("/projects/#{project.id}/variables/#{variable.id}")
 
         expect(response.status).to eq(401)
       end
-- 
cgit v1.2.1


From 0d014feb1d216e692882976f0d70c3227eaec4ca Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 31 Dec 2015 16:56:03 +0100
Subject: Add delete feature to variables API

---
 lib/api/variables.rb                | 12 ++++++++++++
 spec/requests/api/variables_spec.rb | 29 ++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index 6522ecba70c..c70c7cd9d7b 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -57,6 +57,18 @@ module API
 
         present variable, with: Entities::Variable
       end
+
+      # Delete existing variable of a project
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   variable_id (required) - The ID of a variable
+      # Exanoke Reqyest:
+      #   DELETE /projects/:id/variables/:variable_id
+      delete ':id/variables/:variable_id' do
+        variable = user_project.variables.where(id: params[:variable_id].to_i).first
+        variable.destroy
+      end
     end
   end
 end
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
index 3f58277c4ae..385db2409bd 100644
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -101,11 +101,38 @@ describe API::API, api: true do
     end
 
     context 'unauthorized user' do
-      it 'should not return project variable details' do
+      it 'should not update variable' do
         put api("/projects/#{project.id}/variables/#{variable.id}")
 
         expect(response.status).to eq(401)
       end
     end
   end
+
+  describe 'DELETE /projects/:id/variables/:variable_id' do
+    context 'authorized user with proper permissions' do
+      it 'should delete variable' do
+        expect do
+          delete api("/projects/#{project.id}/variables/#{variable.id}", user)
+        end.to change{project.variables.count}.by(-1)
+        expect(response.status).to eq(200)
+      end
+    end
+
+    context 'authorized user with invalid permissions' do
+      it 'should not delete variable' do
+        delete api("/projects/#{project.id}/variables/#{variable.id}", user2)
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'unauthorized user' do
+      it 'should not delete variable' do
+        delete api("/projects/#{project.id}/variables/#{variable.id}")
+
+        expect(response.status).to eq(401)
+      end
+    end
+  end
 end
-- 
cgit v1.2.1


From c5177dd5e2171b047a695802c979cf779522ba8a Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 31 Dec 2015 17:03:11 +0100
Subject: Add missing 'not_found' checks in variables API

---
 lib/api/variables.rb                |  7 +++++++
 spec/requests/api/variables_spec.rb | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index c70c7cd9d7b..dac2ba679c7 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -36,6 +36,8 @@ module API
             variables.where(key: variable_id)
           end
 
+        return not_found!('Variable') if variables.empty?
+
         present variables.first, with: Entities::Variable
       end
 
@@ -51,6 +53,8 @@ module API
       put ':id/variables/:variable_id' do
         variable = user_project.variables.where(id: params[:variable_id].to_i).first
 
+        return not_found!('Variable') unless variable
+
         variable.key = params[:key]
         variable.value = params[:value]
         variable.save!
@@ -67,6 +71,9 @@ module API
       #   DELETE /projects/:id/variables/:variable_id
       delete ':id/variables/:variable_id' do
         variable = user_project.variables.where(id: params[:variable_id].to_i).first
+
+        return not_found!('Variable') unless variable
+
         variable.destroy
       end
     end
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
index 385db2409bd..b35ee2d32d1 100644
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -54,6 +54,12 @@ describe API::API, api: true do
         expect(json_response['id']).to eq(variable.id)
         expect(json_response['value']).to eq(variable.value)
       end
+
+      it 'should responde with 404 Not Found if requesting non-existing variable' do
+        get api("/projects/#{project.id}/variables/9999", user)
+
+        expect(response.status).to eq(404)
+      end
     end
 
     context 'authorized user with invalid permissions' do
@@ -90,6 +96,12 @@ describe API::API, api: true do
         expect(updated_variable.key).to eq('TEST_VARIABLE_1_UP')
         expect(updated_variable.value).to eq('VALUE_1_UP')
       end
+
+      it 'should responde with 404 Not Found if requesting non-existing variable' do
+        put api("/projects/#{project.id}/variables/9999", user)
+
+        expect(response.status).to eq(404)
+      end
     end
 
     context 'authorized user with invalid permissions' do
@@ -117,6 +129,12 @@ describe API::API, api: true do
         end.to change{project.variables.count}.by(-1)
         expect(response.status).to eq(200)
       end
+
+      it 'should responde with 404 Not Found if requesting non-existing variable' do
+        delete api("/projects/#{project.id}/variables/9999", user)
+
+        expect(response.status).to eq(404)
+      end
     end
 
     context 'authorized user with invalid permissions' do
-- 
cgit v1.2.1


From 937567b767e6d7b34dcaa1d9c83fc75464638683 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 31 Dec 2015 22:30:07 +0100
Subject: Add create feature to variables API

---
 lib/api/variables.rb                | 20 +++++++++++++++++++
 spec/factories/ci/variables.rb      |  2 +-
 spec/requests/api/variables_spec.rb | 38 +++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index dac2ba679c7..fc63ac2f56a 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -41,6 +41,24 @@ module API
         present variables.first, with: Entities::Variable
       end
 
+      # Create a new variable in project
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   key (required) - The key of variable being created
+      #   value (required) - The value of variable being created
+      # Example Request:
+      #   POST /projects/:id/variables
+      post ':id/variables' do
+        required_attributes! [:key, :value]
+
+        variable = user_project.variables.create(key: params[:key], value: params[:value])
+        return render_validation_error!(variable) unless variable.valid?
+        variable.save!
+
+        present variable, with: Entities::Variable
+      end
+
       # Update existing variable of a project
       #
       # Parameters:
@@ -75,6 +93,8 @@ module API
         return not_found!('Variable') unless variable
 
         variable.destroy
+
+        present variable, with: Entities::Variable
       end
     end
   end
diff --git a/spec/factories/ci/variables.rb b/spec/factories/ci/variables.rb
index c3dcb678da7..a19b9fc72f2 100644
--- a/spec/factories/ci/variables.rb
+++ b/spec/factories/ci/variables.rb
@@ -16,7 +16,7 @@
 
 FactoryGirl.define do
   factory :ci_variable, class: Ci::Variable do
-    id 1
+    id 10
     key 'TEST_VARIABLE_1'
     value 'VALUE_1'
 
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
index b35ee2d32d1..bf0dd77473a 100644
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -79,6 +79,44 @@ describe API::API, api: true do
     end
   end
 
+  describe 'POST /projects/:id/variables' do
+    context 'authorized user with proper permissions' do
+      it 'should create variable' do
+        expect do
+          post api("/projects/#{project.id}/variables", user), key: 'TEST_VARIABLE_2', value: 'VALUE_2'
+        end.to change{project.variables.count}.by(1)
+
+        expect(response.status).to eq(201)
+        expect(json_response['key']).to eq('TEST_VARIABLE_2')
+        expect(json_response['value']).to eq('VALUE_2')
+      end
+
+      it 'should not allow to duplicate variable key' do
+        expect do
+          post api("/projects/#{project.id}/variables", user), key: 'TEST_VARIABLE_1', value: 'VALUE_2'
+        end.to change{project.variables.count}.by(0)
+
+        expect(response.status).to eq(400)
+      end
+    end
+
+    context 'authorized user with invalid permissions' do
+      it 'should not create variable' do
+        post api("/projects/#{project.id}/variables", user2)
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context 'unauthorized user' do
+      it 'should not create variable' do
+        post api("/projects/#{project.id}/variables")
+
+        expect(response.status).to eq(401)
+      end
+    end
+  end
+
   describe 'PUT /projects/:id/variables/:variable_id' do
     context 'authorized user with proper permissions' do
       it 'should update variable data' do
-- 
cgit v1.2.1


From 16bd4df083135e2e4a263b2e1bdd71b78a875ef7 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 31 Dec 2015 22:59:06 +0100
Subject: Fix a typo in method description

---
 lib/api/variables.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index fc63ac2f56a..b8bbcb6ce3b 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -18,7 +18,7 @@ module API
         present paginate(variables), with: Entities::Variable
       end
 
-      # Get specifica bariable of a project
+      # Get specifica variable of a project
       #
       # Parameters:
       #   id (required) - The ID of a project
-- 
cgit v1.2.1


From b60c146267dfa8dc1c170426e1817c6b2a168d1a Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 7 Jan 2016 13:49:38 +0100
Subject: Change :variable_id to :key as resource ID in API

---
 app/models/ci/variable.rb           |  6 +++++-
 lib/api/variables.rb                | 41 ++++++++++++++----------------------
 spec/requests/api/variables_spec.rb | 42 +++++++++++++------------------------
 3 files changed, 36 insertions(+), 53 deletions(-)

diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index 0e2712086ca..1d9ee91a31c 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -18,8 +18,12 @@ module Ci
     
     belongs_to :project, class_name: '::Project', foreign_key: :gl_project_id
 
-    validates_presence_of :key
     validates_uniqueness_of :key, scope: :gl_project_id
+    validates :key,
+      presence: true,
+      length: { within: 0..255 },
+      format: { with: /\A[a-zA-Z0-9_]+\z/,
+                message: "can contain only letters, digits and '_'." }
 
     attr_encrypted :value, mode: :per_attribute_iv_and_salt, key: Gitlab::Application.secrets.db_key_base
   end
diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index b8bbcb6ce3b..cc038e5731d 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -22,19 +22,12 @@ module API
       #
       # Parameters:
       #   id (required) - The ID of a project
-      #   variable_id (required) - The ID OR `key` of variable to show; if variable_id contains only digits it's treated
-      #                            as ID other ways it's treated as `key`
+      #   key (required) - The `key` of variable
       # Example Request:
-      #   GET /projects/:id/variables/:variable_id
-      get ':id/variables/:variable_id' do
-        variable_id = params[:variable_id]
-        variables = user_project.variables
-        variables =
-          if variable_id.match(/^\d+$/)
-            variables.where(id: variable_id.to_i)
-          else
-            variables.where(key: variable_id)
-          end
+      #   GET /projects/:id/variables/:key
+      get ':id/variables/:key' do
+        key = params[:key]
+        variables = user_project.variables.where(key: key)
 
         return not_found!('Variable') if variables.empty?
 
@@ -45,8 +38,8 @@ module API
       #
       # Parameters:
       #   id (required) - The ID of a project
-      #   key (required) - The key of variable being created
-      #   value (required) - The value of variable being created
+      #   key (required) - The key of variable
+      #   value (required) - The value of variable
       # Example Request:
       #   POST /projects/:id/variables
       post ':id/variables' do
@@ -63,17 +56,15 @@ module API
       #
       # Parameters:
       #   id (required) - The ID of a project
-      #   variable_id (required) - The ID of a variable
-      #   key (optional) - new value for `key` field of variable
-      #   value (optional) - new value for `value` field of variable
+      #   key (optional) - The `key` of variable
+      #   value (optional) - New value for `value` field of variable
       # Example Request:
-      #   PUT /projects/:id/variables/:variable_id
-      put ':id/variables/:variable_id' do
-        variable = user_project.variables.where(id: params[:variable_id].to_i).first
+      #   PUT /projects/:id/variables/:key
+      put ':id/variables/:key' do
+        variable = user_project.variables.where(key: params[:key]).first
 
         return not_found!('Variable') unless variable
 
-        variable.key = params[:key]
         variable.value = params[:value]
         variable.save!
 
@@ -84,11 +75,11 @@ module API
       #
       # Parameters:
       #   id (required) - The ID of a project
-      #   variable_id (required) - The ID of a variable
+      #   key (required) - The ID of a variable
       # Exanoke Reqyest:
-      #   DELETE /projects/:id/variables/:variable_id
-      delete ':id/variables/:variable_id' do
-        variable = user_project.variables.where(id: params[:variable_id].to_i).first
+      #   DELETE /projects/:id/variables/:key
+      delete ':id/variables/:key' do
+        variable = user_project.variables.where(key: params[:key]).first
 
         return not_found!('Variable') unless variable
 
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
index bf0dd77473a..214d7d5a0cc 100644
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -37,26 +37,17 @@ describe API::API, api: true do
     end
   end
 
-  describe 'GET /projects/:id/variables/:variable_id' do
+  describe 'GET /projects/:id/variables/:key' do
     context 'authorized user with proper permissions' do
-      it 'should return project variable details when ID is used as :variable_id' do
-        get api("/projects/#{project.id}/variables/#{variable.id}", user)
-
-        expect(response.status).to eq(200)
-        expect(json_response['key']).to eq(variable.key)
-        expect(json_response['value']).to eq(variable.value)
-      end
-
-      it 'should return project variable details when `key` is used as :variable_id' do
+      it 'should return project variable details' do
         get api("/projects/#{project.id}/variables/#{variable.key}", user)
 
         expect(response.status).to eq(200)
-        expect(json_response['id']).to eq(variable.id)
         expect(json_response['value']).to eq(variable.value)
       end
 
       it 'should responde with 404 Not Found if requesting non-existing variable' do
-        get api("/projects/#{project.id}/variables/9999", user)
+        get api("/projects/#{project.id}/variables/non_existing_variable", user)
 
         expect(response.status).to eq(404)
       end
@@ -64,7 +55,7 @@ describe API::API, api: true do
 
     context 'authorized user with invalid permissions' do
       it 'should not return project variable details' do
-        get api("/projects/#{project.id}/variables/#{variable.id}", user2)
+        get api("/projects/#{project.id}/variables/#{variable.key}", user2)
 
         expect(response.status).to eq(403)
       end
@@ -72,7 +63,7 @@ describe API::API, api: true do
 
     context 'unauthorized user' do
       it 'should not return project variable details' do
-        get api("/projects/#{project.id}/variables/#{variable.id}")
+        get api("/projects/#{project.id}/variables/#{variable.key}")
 
         expect(response.status).to eq(401)
       end
@@ -117,26 +108,23 @@ describe API::API, api: true do
     end
   end
 
-  describe 'PUT /projects/:id/variables/:variable_id' do
+  describe 'PUT /projects/:id/variables/:key' do
     context 'authorized user with proper permissions' do
       it 'should update variable data' do
         initial_variable = project.variables.first
-        key_before = initial_variable.key
         value_before = initial_variable.value
 
-        put api("/projects/#{project.id}/variables/#{variable.id}", user), key: 'TEST_VARIABLE_1_UP', value: 'VALUE_1_UP'
+        put api("/projects/#{project.id}/variables/#{variable.key}", user), value: 'VALUE_1_UP'
 
         updated_variable = project.variables.first
 
         expect(response.status).to eq(200)
-        expect(key_before).to eq(variable.key)
         expect(value_before).to eq(variable.value)
-        expect(updated_variable.key).to eq('TEST_VARIABLE_1_UP')
         expect(updated_variable.value).to eq('VALUE_1_UP')
       end
 
       it 'should responde with 404 Not Found if requesting non-existing variable' do
-        put api("/projects/#{project.id}/variables/9999", user)
+        put api("/projects/#{project.id}/variables/non_existing_variable", user)
 
         expect(response.status).to eq(404)
       end
@@ -144,7 +132,7 @@ describe API::API, api: true do
 
     context 'authorized user with invalid permissions' do
       it 'should not update variable' do
-        put api("/projects/#{project.id}/variables/#{variable.id}", user2)
+        put api("/projects/#{project.id}/variables/#{variable.key}", user2)
 
         expect(response.status).to eq(403)
       end
@@ -152,24 +140,24 @@ describe API::API, api: true do
 
     context 'unauthorized user' do
       it 'should not update variable' do
-        put api("/projects/#{project.id}/variables/#{variable.id}")
+        put api("/projects/#{project.id}/variables/#{variable.key}")
 
         expect(response.status).to eq(401)
       end
     end
   end
 
-  describe 'DELETE /projects/:id/variables/:variable_id' do
+  describe 'DELETE /projects/:id/variables/:key' do
     context 'authorized user with proper permissions' do
       it 'should delete variable' do
         expect do
-          delete api("/projects/#{project.id}/variables/#{variable.id}", user)
+          delete api("/projects/#{project.id}/variables/#{variable.key}", user)
         end.to change{project.variables.count}.by(-1)
         expect(response.status).to eq(200)
       end
 
       it 'should responde with 404 Not Found if requesting non-existing variable' do
-        delete api("/projects/#{project.id}/variables/9999", user)
+        delete api("/projects/#{project.id}/variables/non_existing_variable", user)
 
         expect(response.status).to eq(404)
       end
@@ -177,7 +165,7 @@ describe API::API, api: true do
 
     context 'authorized user with invalid permissions' do
       it 'should not delete variable' do
-        delete api("/projects/#{project.id}/variables/#{variable.id}", user2)
+        delete api("/projects/#{project.id}/variables/#{variable.key}", user2)
 
         expect(response.status).to eq(403)
       end
@@ -185,7 +173,7 @@ describe API::API, api: true do
 
     context 'unauthorized user' do
       it 'should not delete variable' do
-        delete api("/projects/#{project.id}/variables/#{variable.id}")
+        delete api("/projects/#{project.id}/variables/#{variable.key}")
 
         expect(response.status).to eq(401)
       end
-- 
cgit v1.2.1


From b60445906849e84ff52ac6a5d7d501bb5a21eb60 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 7 Jan 2016 14:10:49 +0100
Subject: Update ./doc/api

---
 doc/api/README.md    |   1 +
 doc/api/variables.md | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/api/entities.rb  |   2 +-
 3 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 doc/api/variables.md

diff --git a/doc/api/README.md b/doc/api/README.md
index 25a31b235cc..198b4ddfee1 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -23,6 +23,7 @@
 - [Namespaces](namespaces.md)
 - [Settings](settings.md)
 - [Keys](keys.md)
+- [Variables](variables.md)
 
 ## Clients
 
diff --git a/doc/api/variables.md b/doc/api/variables.md
new file mode 100644
index 00000000000..cdc9ba42254
--- /dev/null
+++ b/doc/api/variables.md
@@ -0,0 +1,106 @@
+# Variables
+
+## Variables keys
+
+All variable keys must contains only letters, digits and '\_'. They must also be no longer than 255 characters.
+
+## List project variables
+
+Get list of variables of a project.
+
+```
+GET /projects/:id/variables
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+
+```json
+[
+    {
+        "key": "TEST_VARIABLE_1",
+        "value": "TEST_1"
+    },
+    {
+        "key": "TEST_VARIABLE_2",
+        "value": "TEST_2"
+    }
+]
+```
+
+## Show variable details
+
+Get details of specifica variable of a project.
+
+```
+GET /projects/:id/variables/:key
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `key` (required) - The `key` of variable
+
+```json
+{
+    "key": "TEST_VARIABLE_1",
+    "value": "TEST_1"
+}
+```
+
+## Create variable
+
+Create new variable in project.
+
+```
+POST /projects/:id/variables
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `key` (required) - The `key` for variable
+- `value` (required) - The `value` for variable
+
+```json
+{
+    "key": "NEW_VARIABLE",
+    "value": "new value"
+}
+```
+
+## Update variable
+
+Update variable.
+
+```
+PUT /projects/:id/variables/:key
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `key` (required) - The `key` for variable
+- `value` (required) - The `value` for variable
+
+```json
+{
+    "key": "NEW_VARIABLE",
+    "value": "updated value"
+}
+```
+
+## Remove variable
+
+Remove variable.
+
+```
+DELETE /projects/:id/variables/:key
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `key` (required) - The `key` for variable
+
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index f71d072f269..db3164d9d9c 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -367,7 +367,7 @@ module API
     end
 
     class Variable < Grape::Entity
-      expose :id, :key, :value
+      expose :key, :value
     end
   end
 end
-- 
cgit v1.2.1


From efb3395b4fc0425ebbc2437ad03f0cd5fc851863 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Tue, 12 Jan 2016 19:32:44 +0100
Subject: Remove blank line

---
 lib/api/api.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/api/api.rb b/lib/api/api.rb
index a9e1913f0f2..098dd975840 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -54,7 +54,6 @@ module API
     mount Keys
     mount Tags
     mount Triggers
-
     mount Variables
   end
 end
-- 
cgit v1.2.1


From df548285804fdc40ac7c4f36601e87a534792a4a Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 13 Jan 2016 12:47:11 +0100
Subject: Add some fixes after review

---
 lib/api/variables.rb | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index cc038e5731d..0c3fb5c8a77 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -27,11 +27,11 @@ module API
       #   GET /projects/:id/variables/:key
       get ':id/variables/:key' do
         key = params[:key]
-        variables = user_project.variables.where(key: key)
+        variable = user_project.variables.find_by(key: key.to_s)
 
-        return not_found!('Variable') if variables.empty?
+        return not_found!('Variable') unless variable
 
-        present variables.first, with: Entities::Variable
+        present variable, with: Entities::Variable
       end
 
       # Create a new variable in project
@@ -46,10 +46,12 @@ module API
         required_attributes! [:key, :value]
 
         variable = user_project.variables.create(key: params[:key], value: params[:value])
-        return render_validation_error!(variable) unless variable.valid?
-        variable.save!
 
-        present variable, with: Entities::Variable
+        if variable.valid?
+          present variable, with: Entities::Variable
+        else
+          render_validation_error!(variable)
+        end
       end
 
       # Update existing variable of a project
@@ -61,14 +63,16 @@ module API
       # Example Request:
       #   PUT /projects/:id/variables/:key
       put ':id/variables/:key' do
-        variable = user_project.variables.where(key: params[:key]).first
+        variable = user_project.variables.find_by(key: params[:key].to_s)
 
         return not_found!('Variable') unless variable
 
-        variable.value = params[:value]
-        variable.save!
-
-        present variable, with: Entities::Variable
+        attrs = attributes_for_keys [:value]
+        if variable.update(attrs)
+          present variable, with: Entities::Variable
+        else
+          render_validation_error!(variable)
+        end
       end
 
       # Delete existing variable of a project
@@ -79,10 +83,9 @@ module API
       # Exanoke Reqyest:
       #   DELETE /projects/:id/variables/:key
       delete ':id/variables/:key' do
-        variable = user_project.variables.where(key: params[:key]).first
+        variable = user_project.variables.find_by(key: params[:key].to_s)
 
         return not_found!('Variable') unless variable
-
         variable.destroy
 
         present variable, with: Entities::Variable
-- 
cgit v1.2.1


From 99393cde942841e1bee656cebf8e16a25d1300cb Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Wed, 13 Jan 2016 13:49:10 +0100
Subject: Version 8.4.0.rc1

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index ce669730119..408340137f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.4.0.pre
+8.4.0.rc1
\ No newline at end of file
-- 
cgit v1.2.1


From 9e701ccd48ed442124509aeb68fe6788579efdde Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 13 Jan 2016 18:47:39 +0100
Subject: Fix some typos

---
 lib/api/variables.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index 0c3fb5c8a77..d9a055f6c92 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -18,7 +18,7 @@ module API
         present paginate(variables), with: Entities::Variable
       end
 
-      # Get specifica variable of a project
+      # Get specific variable of a project
       #
       # Parameters:
       #   id (required) - The ID of a project
@@ -80,7 +80,7 @@ module API
       # Parameters:
       #   id (required) - The ID of a project
       #   key (required) - The ID of a variable
-      # Exanoke Reqyest:
+      # Example Request:
       #   DELETE /projects/:id/variables/:key
       delete ':id/variables/:key' do
         variable = user_project.variables.find_by(key: params[:key].to_s)
-- 
cgit v1.2.1


From d338087605791e408e696b11974995be9ebff80e Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 13 Jan 2016 18:51:06 +0100
Subject: Add 'Build' prefix to Variables entry name in API docs index

---
 doc/api/README.md          |   2 +-
 doc/api/build_variables.md | 106 +++++++++++++++++++++++++++++++++++++++++++++
 doc/api/variables.md       | 106 ---------------------------------------------
 3 files changed, 107 insertions(+), 107 deletions(-)
 create mode 100644 doc/api/build_variables.md
 delete mode 100644 doc/api/variables.md

diff --git a/doc/api/README.md b/doc/api/README.md
index 198b4ddfee1..c3401bcbc9d 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -23,7 +23,7 @@
 - [Namespaces](namespaces.md)
 - [Settings](settings.md)
 - [Keys](keys.md)
-- [Variables](variables.md)
+- [Build Variables](build_variables.md)
 
 ## Clients
 
diff --git a/doc/api/build_variables.md b/doc/api/build_variables.md
new file mode 100644
index 00000000000..2b804fd9051
--- /dev/null
+++ b/doc/api/build_variables.md
@@ -0,0 +1,106 @@
+# Build Variables
+
+## Variables keys
+
+All variable keys must contains only letters, digits and '\_'. They must also be no longer than 255 characters.
+
+## List project variables
+
+Get list of variables of a project.
+
+```
+GET /projects/:id/variables
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+
+```json
+[
+    {
+        "key": "TEST_VARIABLE_1",
+        "value": "TEST_1"
+    },
+    {
+        "key": "TEST_VARIABLE_2",
+        "value": "TEST_2"
+    }
+]
+```
+
+## Show variable details
+
+Get details of specifica variable of a project.
+
+```
+GET /projects/:id/variables/:key
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `key` (required) - The `key` of variable
+
+```json
+{
+    "key": "TEST_VARIABLE_1",
+    "value": "TEST_1"
+}
+```
+
+## Create variable
+
+Create new variable in project.
+
+```
+POST /projects/:id/variables
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `key` (required) - The `key` for variable
+- `value` (required) - The `value` for variable
+
+```json
+{
+    "key": "NEW_VARIABLE",
+    "value": "new value"
+}
+```
+
+## Update variable
+
+Update variable.
+
+```
+PUT /projects/:id/variables/:key
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `key` (required) - The `key` for variable
+- `value` (required) - The `value` for variable
+
+```json
+{
+    "key": "NEW_VARIABLE",
+    "value": "updated value"
+}
+```
+
+## Remove variable
+
+Remove variable.
+
+```
+DELETE /projects/:id/variables/:key
+```
+
+Parameters:
+
+- `id` (required) - The ID of a project
+- `key` (required) - The `key` for variable
+
diff --git a/doc/api/variables.md b/doc/api/variables.md
deleted file mode 100644
index cdc9ba42254..00000000000
--- a/doc/api/variables.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Variables
-
-## Variables keys
-
-All variable keys must contains only letters, digits and '\_'. They must also be no longer than 255 characters.
-
-## List project variables
-
-Get list of variables of a project.
-
-```
-GET /projects/:id/variables
-```
-
-Parameters:
-
-- `id` (required) - The ID of a project
-
-```json
-[
-    {
-        "key": "TEST_VARIABLE_1",
-        "value": "TEST_1"
-    },
-    {
-        "key": "TEST_VARIABLE_2",
-        "value": "TEST_2"
-    }
-]
-```
-
-## Show variable details
-
-Get details of specifica variable of a project.
-
-```
-GET /projects/:id/variables/:key
-```
-
-Parameters:
-
-- `id` (required) - The ID of a project
-- `key` (required) - The `key` of variable
-
-```json
-{
-    "key": "TEST_VARIABLE_1",
-    "value": "TEST_1"
-}
-```
-
-## Create variable
-
-Create new variable in project.
-
-```
-POST /projects/:id/variables
-```
-
-Parameters:
-
-- `id` (required) - The ID of a project
-- `key` (required) - The `key` for variable
-- `value` (required) - The `value` for variable
-
-```json
-{
-    "key": "NEW_VARIABLE",
-    "value": "new value"
-}
-```
-
-## Update variable
-
-Update variable.
-
-```
-PUT /projects/:id/variables/:key
-```
-
-Parameters:
-
-- `id` (required) - The ID of a project
-- `key` (required) - The `key` for variable
-- `value` (required) - The `value` for variable
-
-```json
-{
-    "key": "NEW_VARIABLE",
-    "value": "updated value"
-}
-```
-
-## Remove variable
-
-Remove variable.
-
-```
-DELETE /projects/:id/variables/:key
-```
-
-Parameters:
-
-- `id` (required) - The ID of a project
-- `key` (required) - The `key` for variable
-
-- 
cgit v1.2.1


From 3b7f34281e4d1c4ca626578ddc9a1b9eda7e7538 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 13 Jan 2016 19:57:23 +0100
Subject: Modify :ci_variable factory

---
 spec/factories/ci/variables.rb      | 7 ++-----
 spec/requests/api/variables_spec.rb | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/factories/ci/variables.rb b/spec/factories/ci/variables.rb
index a19b9fc72f2..8f62d64411b 100644
--- a/spec/factories/ci/variables.rb
+++ b/spec/factories/ci/variables.rb
@@ -16,10 +16,7 @@
 
 FactoryGirl.define do
   factory :ci_variable, class: Ci::Variable do
-    id 10
-    key 'TEST_VARIABLE_1'
-    value 'VALUE_1'
-
-    project factory: :empty_project
+    sequence(:key) { |n| "VARIABLE_#{n}" }
+    value 'VARIABLE_VALUE'
   end
 end
diff --git a/spec/requests/api/variables_spec.rb b/spec/requests/api/variables_spec.rb
index 214d7d5a0cc..9744729ba0c 100644
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
@@ -46,7 +46,7 @@ describe API::API, api: true do
         expect(json_response['value']).to eq(variable.value)
       end
 
-      it 'should responde with 404 Not Found if requesting non-existing variable' do
+      it 'should respond with 404 Not Found if requesting non-existing variable' do
         get api("/projects/#{project.id}/variables/non_existing_variable", user)
 
         expect(response.status).to eq(404)
@@ -84,7 +84,7 @@ describe API::API, api: true do
 
       it 'should not allow to duplicate variable key' do
         expect do
-          post api("/projects/#{project.id}/variables", user), key: 'TEST_VARIABLE_1', value: 'VALUE_2'
+          post api("/projects/#{project.id}/variables", user), key: variable.key, value: 'VALUE_2'
         end.to change{project.variables.count}.by(0)
 
         expect(response.status).to eq(400)
-- 
cgit v1.2.1


From 2b81248ad5329a717d2f10f8c19453b989d202ac Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 13 Jan 2016 20:23:48 +0100
Subject: Modify builds API documentation style [ci skip]

---
 doc/api/build_variables.md | 84 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 64 insertions(+), 20 deletions(-)

diff --git a/doc/api/build_variables.md b/doc/api/build_variables.md
index 2b804fd9051..5da5fb8f4a6 100644
--- a/doc/api/build_variables.md
+++ b/doc/api/build_variables.md
@@ -1,9 +1,5 @@
 # Build Variables
 
-## Variables keys
-
-All variable keys must contains only letters, digits and '\_'. They must also be no longer than 255 characters.
-
 ## List project variables
 
 Get list of variables of a project.
@@ -12,9 +8,19 @@ Get list of variables of a project.
 GET /projects/:id/variables
 ```
 
-Parameters:
+### Parameters
+
+| Attribute | Type    | required | Description         |
+|-----------|---------|----------|---------------------|
+| id        | integer | yes      | The ID of a project |
+
+### Example of request
+
+```
+curl -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables"
+```
 
-- `id` (required) - The ID of a project
+### Example of response
 
 ```json
 [
@@ -37,10 +43,20 @@ Get details of specifica variable of a project.
 GET /projects/:id/variables/:key
 ```
 
-Parameters:
+### Parameters
 
-- `id` (required) - The ID of a project
-- `key` (required) - The `key` of variable
+| Attribute | Type    | required | Description           |
+|-----------|---------|----------|-----------------------|
+| id        | integer | yes      | The ID of a project   |
+| key       | string  | yes      | The `key` of variable |
+
+### Example of request
+
+```
+curl -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables/TEST_VARIABLE_1"
+```
+
+### Example of response
 
 ```json
 {
@@ -57,11 +73,21 @@ Create new variable in project.
 POST /projects/:id/variables
 ```
 
-Parameters:
+### Parameters
+
+| Attribute | Type    | required | Description           |
+|-----------|---------|----------|-----------------------|
+| id        | integer | yes      | The ID of a project   |
+| key       | string  | yes      | The `key` of variable; must have no more than 255 characters; only `A-Z`, `a-z`, `0-9`, and `_` are allowed |
+| value     | string  | yes      | The `value` of variable |
 
-- `id` (required) - The ID of a project
-- `key` (required) - The `key` for variable
-- `value` (required) - The `value` for variable
+### Example of request
+
+```
+curl -X POST -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables" -F "key=NEW_VARIABLE" -F "value=new value"
+```
+
+### Example of response
 
 ```json
 {
@@ -78,11 +104,21 @@ Update variable.
 PUT /projects/:id/variables/:key
 ```
 
-Parameters:
+### Parameters
 
-- `id` (required) - The ID of a project
-- `key` (required) - The `key` for variable
-- `value` (required) - The `value` for variable
+| Attribute | Type    | required | Description             |
+|-----------|---------|----------|-------------------------|
+| id        | integer | yes      | The ID of a project     |
+| key       | string  | yes      | The `key` of variable   |
+| value     | string  | yes      | The `value` of variable |
+
+### Example of request
+
+```
+curl -X PUT -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables/NEW_VARIABLE" -F "value=updated value"
+```
+
+### Example of response
 
 ```json
 {
@@ -99,8 +135,16 @@ Remove variable.
 DELETE /projects/:id/variables/:key
 ```
 
-Parameters:
+### Parameters
+
+| Attribute | Type    | required | Description             |
+|-----------|---------|----------|-------------------------|
+| id        | integer | yes      | The ID of a project     |
+| key       | string  | yes      | The `key` of variable   |
 
-- `id` (required) - The ID of a project
-- `key` (required) - The `key` for variable
+### Example of request
+
+```
+curl -X DELETE -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables/VARIABLE_1"
+```
 
-- 
cgit v1.2.1


From f11ba743a58ce769cdf6ea7427392836355c067d Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 13 Jan 2016 22:44:11 +0100
Subject: Add some cosmetic changes to variables API documentation [ci skip]

---
 doc/api/build_variables.md | 66 ++++++++++++++++------------------------------
 1 file changed, 22 insertions(+), 44 deletions(-)

diff --git a/doc/api/build_variables.md b/doc/api/build_variables.md
index 5da5fb8f4a6..b96f1bdac8a 100644
--- a/doc/api/build_variables.md
+++ b/doc/api/build_variables.md
@@ -2,26 +2,20 @@
 
 ## List project variables
 
-Get list of variables of a project.
+Get list of a project's build variables.
 
 ```
 GET /projects/:id/variables
 ```
 
-### Parameters
-
 | Attribute | Type    | required | Description         |
 |-----------|---------|----------|---------------------|
-| id        | integer | yes      | The ID of a project |
-
-### Example of request
+| `id`      | integer | yes      | The ID of a project |
 
 ```
 curl -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables"
 ```
 
-### Example of response
-
 ```json
 [
     {
@@ -37,27 +31,21 @@ curl -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3
 
 ## Show variable details
 
-Get details of specifica variable of a project.
+Get the details of a project's specific build variable.
 
 ```
 GET /projects/:id/variables/:key
 ```
 
-### Parameters
-
 | Attribute | Type    | required | Description           |
 |-----------|---------|----------|-----------------------|
-| id        | integer | yes      | The ID of a project   |
-| key       | string  | yes      | The `key` of variable |
-
-### Example of request
+| `id`      | integer | yes      | The ID of a project   |
+| `key`     | string  | yes      | The `key` of a variable |
 
 ```
 curl -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables/TEST_VARIABLE_1"
 ```
 
-### Example of response
-
 ```json
 {
     "key": "TEST_VARIABLE_1",
@@ -67,28 +55,22 @@ curl -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3
 
 ## Create variable
 
-Create new variable in project.
+Create a new build variable.
 
 ```
 POST /projects/:id/variables
 ```
 
-### Parameters
-
 | Attribute | Type    | required | Description           |
 |-----------|---------|----------|-----------------------|
-| id        | integer | yes      | The ID of a project   |
-| key       | string  | yes      | The `key` of variable; must have no more than 255 characters; only `A-Z`, `a-z`, `0-9`, and `_` are allowed |
-| value     | string  | yes      | The `value` of variable |
-
-### Example of request
+| `id`      | integer | yes      | The ID of a project   |
+| `key`     | string  | yes      | The `key` of a variable; must have no more than 255 characters; only `A-Z`, `a-z`, `0-9`, and `_` are allowed |
+| `value`   | string  | yes      | The `value` of a variable |
 
 ```
 curl -X POST -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables" -F "key=NEW_VARIABLE" -F "value=new value"
 ```
 
-### Example of response
-
 ```json
 {
     "key": "NEW_VARIABLE",
@@ -98,28 +80,22 @@ curl -X POST -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.co
 
 ## Update variable
 
-Update variable.
+Update a project's build variable.
 
 ```
 PUT /projects/:id/variables/:key
 ```
 
-### Parameters
-
 | Attribute | Type    | required | Description             |
 |-----------|---------|----------|-------------------------|
-| id        | integer | yes      | The ID of a project     |
-| key       | string  | yes      | The `key` of variable   |
-| value     | string  | yes      | The `value` of variable |
-
-### Example of request
+| `id`      | integer | yes      | The ID of a project     |
+| `key`     | string  | yes      | The `key` of a variable   |
+| `value`   | string  | yes      | The `value` of a variable |
 
 ```
 curl -X PUT -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables/NEW_VARIABLE" -F "value=updated value"
 ```
 
-### Example of response
-
 ```json
 {
     "key": "NEW_VARIABLE",
@@ -129,22 +105,24 @@ curl -X PUT -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com
 
 ## Remove variable
 
-Remove variable.
+Remove a project's build variable.
 
 ```
 DELETE /projects/:id/variables/:key
 ```
 
-### Parameters
-
 | Attribute | Type    | required | Description             |
 |-----------|---------|----------|-------------------------|
-| id        | integer | yes      | The ID of a project     |
-| key       | string  | yes      | The `key` of variable   |
-
-### Example of request
+| `id`      | integer | yes      | The ID of a project     |
+| `key`     | string  | yes      | The `key` of a variable |
 
 ```
 curl -X DELETE -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/variables/VARIABLE_1"
 ```
 
+```json
+{
+    "key": "VARIABLE_1",
+    "value": "VALUE_1"
+}
+```
-- 
cgit v1.2.1


From eee16ca9ccd34ff950b685f4db57518207055a36 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 13 Jan 2016 23:59:44 +0100
Subject: Update CHANGELOG [ci skip]

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index b430d4981a9..40e3ea31969 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.4.0 (unreleased)
   - API: Add support for deleting a tag via the API (Robert Schilling)
   - Allow subsequent validations in CI Linter
   - Fix Encoding::CompatibilityError bug when markdown content has some complex URL (Jason Lee)
+  - Add API support for managing build variables of project
 
 v 8.3.4
   - Use gitlab-workhorse 0.5.4 (fixes API routing bug)
-- 
cgit v1.2.1


From 4435a3a8c380002356bfb3d76acd8609e4c3fb25 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 14 Jan 2016 12:05:47 +0100
Subject: Fix version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 408340137f0..ce669730119 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.4.0.rc1
\ No newline at end of file
+8.4.0.pre
-- 
cgit v1.2.1