diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 15:40:28 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 15:40:28 +0000 |
| commit | 8b33e654c09aaa20545e7c246585fa2d3217cecb (patch) | |
| tree | 9cd6fc560ea034f41ae7607e77a10561e67a9213 /app/controllers/concerns | |
| parent | 9fc63aa7f65ef74eb40ebc884de8fc8e031969db (diff) | |
| parent | 1dab640357fa1ba8992757499e4167fcd4ce6276 (diff) | |
| download | gitlab-ce-8b33e654c09aaa20545e7c246585fa2d3217cecb.tar.gz | |
Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/membership_actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb index 47d9ae350ae..c6b1e443de6 100644 --- a/app/controllers/concerns/membership_actions.rb +++ b/app/controllers/concerns/membership_actions.rb @@ -70,7 +70,7 @@ module MembershipActions def members_page_url if membershipable.is_a?(Project) - project_settings_members_path(membershipable) + project_project_members_path(membershipable) else polymorphic_url([membershipable, :members]) end |