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
ac0b29c6
Commit
ac0b29c6
authored
Jun 24, 2021
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typo with credit card
"credit credit" -> "credit card" Changelog: fixed EE: true
parent
6eb3e5a4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/services/ee/projects/update_service.rb
ee/app/services/ee/projects/update_service.rb
+1
-1
ee/spec/controllers/projects/runners_controller_spec.rb
ee/spec/controllers/projects/runners_controller_spec.rb
+1
-1
ee/spec/services/projects/update_service_spec.rb
ee/spec/services/projects/update_service_spec.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
ee/app/services/ee/projects/update_service.rb
View file @
ac0b29c6
...
@@ -64,7 +64,7 @@ module EE
...
@@ -64,7 +64,7 @@ module EE
return
if
project
.
shared_runners_enabled
return
if
project
.
shared_runners_enabled
unless
current_user
.
has_required_credit_card_to_enable_shared_runners?
(
project
)
unless
current_user
.
has_required_credit_card_to_enable_shared_runners?
(
project
)
project
.
errors
.
add
(
:shared_runners_enabled
,
_
(
'cannot be enabled until a valid credit c
redit
is on file'
))
project
.
errors
.
add
(
:shared_runners_enabled
,
_
(
'cannot be enabled until a valid credit c
ard
is on file'
))
end
end
end
end
...
...
ee/spec/controllers/projects/runners_controller_spec.rb
View file @
ac0b29c6
...
@@ -60,7 +60,7 @@ RSpec.describe Projects::RunnersController do
...
@@ -60,7 +60,7 @@ RSpec.describe Projects::RunnersController do
project
.
reload
project
.
reload
expect
(
response
).
to
have_gitlab_http_status
(
:unauthorized
)
expect
(
response
).
to
have_gitlab_http_status
(
:unauthorized
)
expect
(
json_response
[
'error'
]).
to
eq
(
'Shared runners enabled cannot be enabled until a valid credit c
redit
is on file'
)
expect
(
json_response
[
'error'
]).
to
eq
(
'Shared runners enabled cannot be enabled until a valid credit c
ard
is on file'
)
expect
(
project
.
shared_runners_enabled
).
to
eq
(
false
)
expect
(
project
.
shared_runners_enabled
).
to
eq
(
false
)
end
end
end
end
...
...
ee/spec/services/projects/update_service_spec.rb
View file @
ac0b29c6
...
@@ -70,7 +70,7 @@ RSpec.describe Projects::UpdateService, '#execute' do
...
@@ -70,7 +70,7 @@ RSpec.describe Projects::UpdateService, '#execute' do
project
.
reload
project
.
reload
expect
(
result
).
to
eq
(
status: :error
,
message:
'Shared runners enabled cannot be enabled until a valid credit c
redit
is on file'
)
expect
(
result
).
to
eq
(
status: :error
,
message:
'Shared runners enabled cannot be enabled until a valid credit c
ard
is on file'
)
expect
(
project
.
shared_runners_enabled
).
to
eq
(
false
)
expect
(
project
.
shared_runners_enabled
).
to
eq
(
false
)
end
end
end
end
...
...
locale/gitlab.pot
View file @
ac0b29c6
...
@@ -37934,7 +37934,7 @@ msgstr ""
...
@@ -37934,7 +37934,7 @@ msgstr ""
msgid "cannot be enabled unless all domains have TLS certificates"
msgid "cannot be enabled unless all domains have TLS certificates"
msgstr ""
msgstr ""
msgid "cannot be enabled until a valid credit c
redit
is on file"
msgid "cannot be enabled until a valid credit c
ard
is on file"
msgstr ""
msgstr ""
msgid "cannot be modified"
msgid "cannot be modified"
...
...
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