summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-08-01 21:17:46 +0900
committerShinya Maeda <shinya@gitlab.com>2017-08-01 21:17:46 +0900
commit0c5fbaa72b8e4f032cf58758f8aa75925d57b06f (patch)
treee827a1811449a56312f1e39eb622e241648f4347
parent0bbf006454e47cb0411a0d035e45cda39739ca6f (diff)
downloadgitlab-ce-fix/sm/35825-api-specs-and-linting-failing-on-master.tar.gz
-rw-r--r--lib/api/group_variables.rb1
-rw-r--r--lib/api/helpers.rb4
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/api/group_variables.rb b/lib/api/group_variables.rb
index 0dd418887e0..f64da4ab77b 100644
--- a/lib/api/group_variables.rb
+++ b/lib/api/group_variables.rb
@@ -88,6 +88,7 @@ module API
variable = user_group.variables.find_by(key: params[:key])
not_found!('GroupVariable') unless variable
+ status 204
variable.destroy
end
end
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index de58e9779a9..234825480f2 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -33,10 +33,6 @@ module API
@project ||= find_project!(params[:id])
end
- def user_group
- @group ||= find_group!(params[:id])
- end
-
def available_labels
@available_labels ||= LabelsFinder.new(current_user, project_id: user_project.id).execute
end