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
3262d481
Commit
3262d481
authored
Nov 14, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos in specs and js
parent
b88bc834
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
14 additions
and
14 deletions
+14
-14
ee/app/assets/javascripts/protected_environments/protected_environment_create.js
...ts/protected_environments/protected_environment_create.js
+1
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.vue
..._request_widget/components/approvals/approvals_footer.vue
+1
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/mr_widget_approvals.vue
...quest_widget/components/approvals/mr_widget_approvals.vue
+1
-1
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
.../admin/application_settings/_elasticsearch_form.html.haml
+1
-1
ee/app/workers/repository_update_mirror_worker.rb
ee/app/workers/repository_update_mirror_worker.rb
+1
-1
ee/lib/gitlab/geo/jwt_request_decoder.rb
ee/lib/gitlab/geo/jwt_request_decoder.rb
+1
-1
ee/lib/omni_auth/strategies/group_saml.rb
ee/lib/omni_auth/strategies/group_saml.rb
+1
-1
ee/spec/controllers/operations_controller_spec.rb
ee/spec/controllers/operations_controller_spec.rb
+1
-1
ee/spec/helpers/ee/namespaces_helper_spec.rb
ee/spec/helpers/ee/namespaces_helper_spec.rb
+1
-1
ee/spec/lib/gitlab/ci/parsers/security/sast_spec.rb
ee/spec/lib/gitlab/ci/parsers/security/sast_spec.rb
+1
-1
ee/spec/lib/gitlab/geo/oauth/logout_state_spec.rb
ee/spec/lib/gitlab/geo/oauth/logout_state_spec.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
ee/app/assets/javascripts/protected_environments/protected_environment_create.js
View file @
3262d481
...
...
@@ -66,7 +66,7 @@ export default class ProtectedEnvironmentCreate {
callback
(
results
);
})
.
catch
(()
=>
{
Flash
(
'
An error occured while fetching environments.
'
);
Flash
(
'
An error occur
r
ed while fetching environments.
'
);
callback
([]);
});
}
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.vue
View file @
3262d481
...
...
@@ -73,7 +73,7 @@ export default {
})
.
catch
(()
=>
{
this
.
unapproving
=
false
;
Flash
(
s__
(
'
mrWidget|An error occured while removing your approval.
'
));
Flash
(
s__
(
'
mrWidget|An error occur
r
ed while removing your approval.
'
));
});
},
},
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/mr_widget_approvals.vue
View file @
3262d481
...
...
@@ -45,7 +45,7 @@ export default {
},
created
()
{
const
flashErrorMessage
=
s__
(
'
mrWidget|An error occured while retrieving approval data for this merge request.
'
,
'
mrWidget|An error occur
r
ed while retrieving approval data for this merge request.
'
,
);
this
.
service
...
...
ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
View file @
3262d481
...
...
@@ -7,7 +7,7 @@
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
expanded
?
'Collapse'
:
'Expand'
%p
=
_
(
'Elasticsearch inte
r
gration. Elasticsearch AWS IAM.'
)
=
_
(
'Elasticsearch integration. Elasticsearch AWS IAM.'
)
.settings-content
=
form_for
@application_setting
,
url:
admin_application_settings_path
(
anchor:
'js-elasticsearch-settings'
),
html:
{
class:
'fieldset-form'
}
do
|
f
|
...
...
ee/app/workers/repository_update_mirror_worker.rb
View file @
3262d481
...
...
@@ -8,7 +8,7 @@ class RepositoryUpdateMirrorWorker
LEASE_KEY
=
'repository_update_mirror_worker_start_scheduler'
.
freeze
LEASE_TIMEOUT
=
2
.
seconds
# Retry not nec
c
essary. It will try again at the next update interval.
# Retry not necessary. It will try again at the next update interval.
sidekiq_options
retry:
false
,
status_expiration:
StuckImportJobsWorker
::
IMPORT_JOBS_EXPIRATION
attr_accessor
:project
,
:repository
,
:current_user
...
...
ee/lib/gitlab/geo/jwt_request_decoder.rb
View file @
3262d481
...
...
@@ -80,7 +80,7 @@ module Gitlab
return
unless
tokens
.
count
==
2
return
unless
tokens
[
0
]
==
Gitlab
::
Geo
::
BaseRequest
::
GITLAB_GEO_AUTH_TOKEN_TYPE
# Split at the first occurence of a colon
# Split at the first occur
r
ence of a colon
geo_tokens
=
tokens
[
1
].
split
(
':'
,
2
)
return
unless
geo_tokens
.
count
==
2
...
...
ee/lib/omni_auth/strategies/group_saml.rb
View file @
3262d481
...
...
@@ -17,7 +17,7 @@ module OmniAuth
end
# Prevent access to SLO and metadata endpoints
# These will need addtional work to securely support
# These will need add
i
tional work to securely support
def
other_phase
call_app!
end
...
...
ee/spec/controllers/operations_controller_spec.rb
View file @
3262d481
...
...
@@ -239,7 +239,7 @@ describe OperationsController do
user
.
ops_dashboard_projects
<<
project
end
it
'removes a project succesfully'
do
it
'removes a project succes
s
fully'
do
delete
:destroy
,
project_id:
project
.
id
expect
(
response
).
to
have_gitlab_http_status
(
200
)
...
...
ee/spec/helpers/ee/namespaces_helper_spec.rb
View file @
3262d481
...
...
@@ -62,7 +62,7 @@ describe EE::NamespacesHelper, :postgresql do
end
context
'when DEVELOPER_MAINTAINER_PROJECT_ACCESS is set globally'
do
it
'return groups where default is not overriden'
do
it
'return groups where default is not overrid
d
en'
do
allow
(
helper
).
to
receive
(
:current_user
).
and_return
(
user
)
stub_application_setting
(
default_project_creation:
::
EE
::
Gitlab
::
Access
::
DEVELOPER_MAINTAINER_PROJECT_ACCESS
)
admin_group
.
add_user
(
user
,
GroupMember
::
DEVELOPER
)
...
...
ee/spec/lib/gitlab/ci/parsers/security/sast_spec.rb
View file @
3262d481
...
...
@@ -16,7 +16,7 @@ describe Gitlab::Ci::Parsers::Security::Sast do
end
end
it
"parses all identifiers and occurences"
do
it
"parses all identifiers and occur
r
ences"
do
expect
(
report
.
occurrences
.
length
).
to
eq
(
3
)
expect
(
report
.
identifiers
.
length
).
to
eq
(
4
)
expect
(
report
.
scanners
.
length
).
to
eq
(
3
)
...
...
ee/spec/lib/gitlab/geo/oauth/logout_state_spec.rb
View file @
3262d481
...
...
@@ -80,7 +80,7 @@ describe Gitlab::Geo::Oauth::LogoutState do
expect
(
subject
.
return_to
).
to
be_nil
end
it
'returns an em
tp
y string when return_to is empty'
do
it
'returns an em
pt
y string when return_to is empty'
do
subject
=
described_class
.
new
(
salt:
salt
,
token:
access_token
,
return_to:
''
)
expect
(
subject
.
return_to
).
to
eq
(
''
)
...
...
locale/gitlab.pot
View file @
3262d481
...
...
@@ -2953,7 +2953,7 @@ msgstr ""
msgid "Elasticsearch"
msgstr ""
msgid "Elasticsearch inte
r
gration. Elasticsearch AWS IAM."
msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr ""
msgid "Email"
...
...
@@ -9677,10 +9677,10 @@ msgstr ""
msgid "mrWidget|Allows commits from members who can merge to the target branch"
msgstr ""
msgid "mrWidget|An error occured while removing your approval."
msgid "mrWidget|An error occur
r
ed while removing your approval."
msgstr ""
msgid "mrWidget|An error occured while retrieving approval data for this merge request."
msgid "mrWidget|An error occur
r
ed while retrieving approval data for this merge request."
msgstr ""
msgid "mrWidget|An error occurred while submitting your approval."
...
...
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