Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
ee59a64b
Commit
ee59a64b
authored
Feb 02, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-depr-warn' into 'master'
resolve deprecation warnings Closes #27423 See merge request !8855
parents
36a9c287
124c9903
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
changelogs/unreleased/fix-depr-warn.yml
changelogs/unreleased/fix-depr-warn.yml
+4
-0
spec/models/members/project_member_spec.rb
spec/models/members/project_member_spec.rb
+1
-1
spec/workers/project_destroy_worker_spec.rb
spec/workers/project_destroy_worker_spec.rb
+2
-2
No files found.
app/controllers/groups_controller.rb
View file @
ee59a64b
...
@@ -84,7 +84,7 @@ class GroupsController < Groups::ApplicationController
...
@@ -84,7 +84,7 @@ class GroupsController < Groups::ApplicationController
if
Groups
::
UpdateService
.
new
(
@group
,
current_user
,
group_params
).
execute
if
Groups
::
UpdateService
.
new
(
@group
,
current_user
,
group_params
).
execute
redirect_to
edit_group_path
(
@group
),
notice:
"Group '
#{
@group
.
name
}
' was successfully updated."
redirect_to
edit_group_path
(
@group
),
notice:
"Group '
#{
@group
.
name
}
' was successfully updated."
else
else
@group
.
res
et
_path!
@group
.
res
tore
_path!
render
action:
"edit"
render
action:
"edit"
end
end
...
...
changelogs/unreleased/fix-depr-warn.yml
0 → 100644
View file @
ee59a64b
---
title
:
resolve deprecation warnings
merge_request
:
8855
author
:
Adam Pahlevi
spec/models/members/project_member_spec.rb
View file @
ee59a64b
...
@@ -117,7 +117,7 @@ describe ProjectMember, models: true do
...
@@ -117,7 +117,7 @@ describe ProjectMember, models: true do
users
=
create_list
(
:user
,
2
)
users
=
create_list
(
:user
,
2
)
described_class
.
add_users_to_projects
(
described_class
.
add_users_to_projects
(
[
projects
.
first
.
id
,
projects
.
second
],
[
projects
.
first
.
id
,
projects
.
second
.
id
],
[
users
.
first
.
id
,
users
.
second
],
[
users
.
first
.
id
,
users
.
second
],
described_class
::
MASTER
)
described_class
::
MASTER
)
...
...
spec/workers/project_destroy_worker_spec.rb
View file @
ee59a64b
...
@@ -8,14 +8,14 @@ describe ProjectDestroyWorker do
...
@@ -8,14 +8,14 @@ describe ProjectDestroyWorker do
describe
"#perform"
do
describe
"#perform"
do
it
"deletes the project"
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
(
Project
.
all
).
not_to
include
(
project
)
expect
(
Dir
.
exist?
(
path
)).
to
be_falsey
expect
(
Dir
.
exist?
(
path
)).
to
be_falsey
end
end
it
"deletes the project but skips repo deletion"
do
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
(
Project
.
all
).
not_to
include
(
project
)
expect
(
Dir
.
exist?
(
path
)).
to
be_truthy
expect
(
Dir
.
exist?
(
path
)).
to
be_truthy
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment