diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-01 16:49:49 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-08-01 16:49:49 +0300 |
commit | 1814fef814d2b21d0a4aaa3482233ed8777875ab (patch) | |
tree | a7ac8bccb9022a87f7952e1eff438b02389a4fbc | |
parent | 3f230455f17549346efe0866ebac5bb6fbf3a518 (diff) | |
parent | 0c5fbaa72b8e4f032cf58758f8aa75925d57b06f (diff) |
Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into 'master'
Fix "API specs and linting failing on master"
Closes #35825
See merge request !13227
-rw-r--r-- | lib/api/group_variables.rb | 1 | ||||
-rw-r--r-- | lib/api/helpers.rb | 4 |
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 |