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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
5630e49b
Commit
5630e49b
authored
Jan 05, 2020
by
Alper Akgun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename plan name for upgrading purposes
parent
19cf1313
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ee/app/controllers/groups/billings_controller.rb
ee/app/controllers/groups/billings_controller.rb
+1
-1
ee/app/controllers/profiles/billings_controller.rb
ee/app/controllers/profiles/billings_controller.rb
+1
-1
ee/app/models/ee/namespace.rb
ee/app/models/ee/namespace.rb
+1
-1
No files found.
ee/app/controllers/groups/billings_controller.rb
View file @
5630e49b
...
@@ -8,7 +8,7 @@ class Groups::BillingsController < Groups::ApplicationController
...
@@ -8,7 +8,7 @@ class Groups::BillingsController < Groups::ApplicationController
def
index
def
index
@top_most_group
=
@group
.
root_ancestor
if
@group
.
has_parent?
@top_most_group
=
@group
.
root_ancestor
if
@group
.
has_parent?
current_plan
=
(
@top_most_group
||
@group
).
actual_plan_name_for_subscription
current_plan
=
(
@top_most_group
||
@group
).
plan_name_for_upgrading
@plans_data
=
FetchSubscriptionPlansService
.
new
(
plan:
current_plan
).
execute
@plans_data
=
FetchSubscriptionPlansService
.
new
(
plan:
current_plan
).
execute
end
end
end
end
ee/app/controllers/profiles/billings_controller.rb
View file @
5630e49b
...
@@ -5,7 +5,7 @@ class Profiles::BillingsController < Profiles::ApplicationController
...
@@ -5,7 +5,7 @@ class Profiles::BillingsController < Profiles::ApplicationController
def
index
def
index
@plans_data
=
FetchSubscriptionPlansService
@plans_data
=
FetchSubscriptionPlansService
.
new
(
plan:
current_user
.
namespace
.
actual_plan_name_for_subscription
)
.
new
(
plan:
current_user
.
namespace
.
plan_name_for_upgrading
)
.
execute
.
execute
end
end
end
end
ee/app/models/ee/namespace.rb
View file @
5630e49b
...
@@ -170,7 +170,7 @@ module EE
...
@@ -170,7 +170,7 @@ module EE
actual_plan
&
.
name
||
Plan
::
FREE
actual_plan
&
.
name
||
Plan
::
FREE
end
end
def
actual_plan_name_for_subscription
def
plan_name_for_upgrading
return
Plan
::
FREE
if
trial_active?
return
Plan
::
FREE
if
trial_active?
actual_plan_name
actual_plan_name
...
...
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