diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-02 16:11:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-02 16:11:12 +0000 |
| commit | ee59a64b2035622b02760d5ab928ea59a35cd45f (patch) | |
| tree | 424ab9c12a49d4a38c4b86d1bd3f552fbe4658c0 | |
| parent | 36a9c28760d38ccccc286d3d0ac58053859aaf58 (diff) | |
| parent | 124c99032292c11a2f69197233683db9bee4d463 (diff) | |
| download | gitlab-ce-ee59a64b2035622b02760d5ab928ea59a35cd45f.tar.gz | |
Merge branch 'fix-depr-warn' into 'master'
resolve deprecation warnings
Closes #27423
See merge request !8855
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-depr-warn.yml | 4 | ||||
| -rw-r--r-- | spec/models/members/project_member_spec.rb | 2 | ||||
| -rw-r--r-- | spec/workers/project_destroy_worker_spec.rb | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index f81237db991..264b14713fb 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -84,7 +84,7 @@ class GroupsController < Groups::ApplicationController if Groups::UpdateService.new(@group, current_user, group_params).execute redirect_to edit_group_path(@group), notice: "Group '#{@group.name}' was successfully updated." else - @group.reset_path! + @group.restore_path! render action: "edit" end diff --git a/changelogs/unreleased/fix-depr-warn.yml b/changelogs/unreleased/fix-depr-warn.yml new file mode 100644 index 00000000000..61817027720 --- /dev/null +++ b/changelogs/unreleased/fix-depr-warn.yml @@ -0,0 +1,4 @@ +--- +title: resolve deprecation warnings +merge_request: 8855 +author: Adam Pahlevi diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb index 90d14c2c0b9..e4be0aba7a6 100644 --- a/spec/models/members/project_member_spec.rb +++ b/spec/models/members/project_member_spec.rb @@ -117,7 +117,7 @@ describe ProjectMember, models: true do users = create_list(:user, 2) described_class.add_users_to_projects( - [projects.first.id, projects.second], + [projects.first.id, projects.second.id], [users.first.id, users.second], described_class::MASTER) diff --git a/spec/workers/project_destroy_worker_spec.rb b/spec/workers/project_destroy_worker_spec.rb index 1b910d9b91e..1f4c39eb64a 100644 --- a/spec/workers/project_destroy_worker_spec.rb +++ b/spec/workers/project_destroy_worker_spec.rb @@ -8,14 +8,14 @@ describe ProjectDestroyWorker do describe "#perform" do it "deletes the project" do - subject.perform(project.id, project.owner, {}) + subject.perform(project.id, project.owner.id, {}) expect(Project.all).not_to include(project) expect(Dir.exist?(path)).to be_falsey end it "deletes the project but skips repo deletion" do - subject.perform(project.id, project.owner, { "skip_repo" => true }) + subject.perform(project.id, project.owner.id, { "skip_repo" => true }) expect(Project.all).not_to include(project) expect(Dir.exist?(path)).to be_truthy |