Commit 96850c5c authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'kerrizor-fix-wether/whether-typo' into 'master'

Fix typo 'wether' -> 'whether'

See merge request gitlab-org/gitlab!24841
parents 2581cc43 40e612b7
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
}, },
requestRefreshPipelineGraph() { requestRefreshPipelineGraph() {
// When an action is clicked // When an action is clicked
// (wether in the dropdown or in the main nodes, we refresh the big graph) // (whether in the dropdown or in the main nodes, we refresh the big graph)
this.mediator this.mediator
.refreshPipeline() .refreshPipeline()
.catch(() => flash(__('An error occurred while making the request.'))); .catch(() => flash(__('An error occurred while making the request.')));
......
# frozen_string_literal: true # frozen_string_literal: true
# Module to prepend into finders to specify wether or not the finder requires # Module to prepend into finders to specify whether or not the finder requires
# cross project access # cross project access
# #
# This module depends on the finder implementing the following methods: # This module depends on the finder implementing the following methods:
......
...@@ -40,7 +40,7 @@ module EE ...@@ -40,7 +40,7 @@ module EE
optional :max_seats_used, type: Integer, default: 0, desc: 'The max number of active users detected in the last month' optional :max_seats_used, type: Integer, default: 0, desc: 'The max number of active users detected in the last month'
optional :plan_code, type: String, desc: 'The code of the purchased plan' optional :plan_code, type: String, desc: 'The code of the purchased plan'
optional :end_date, type: Date, desc: 'The date when subscription expires' optional :end_date, type: Date, desc: 'The date when subscription expires'
optional :trial, type: Grape::API::Boolean, desc: 'Wether the subscription is trial' optional :trial, type: Grape::API::Boolean, desc: 'Whether the subscription is trial'
optional :trial_ends_on, type: Date, desc: 'The date when the trial expires' optional :trial_ends_on, type: Date, desc: 'The date when the trial expires'
optional :trial_starts_on, type: Date, desc: 'The date when the trial starts' optional :trial_starts_on, type: Date, desc: 'The date when the trial starts'
end end
......
...@@ -128,7 +128,7 @@ module Gitlab ...@@ -128,7 +128,7 @@ module Gitlab
def load_all_data!(repository) def load_all_data!(repository)
return if @data == '' # don't mess with submodule blobs return if @data == '' # don't mess with submodule blobs
# Even if we return early, recalculate wether this blob is binary in # Even if we return early, recalculate whether this blob is binary in
# case a blob was initialized as text but the full data isn't # case a blob was initialized as text but the full data isn't
@binary = nil @binary = nil
......
...@@ -340,7 +340,7 @@ start_gitlab() { ...@@ -340,7 +340,7 @@ start_gitlab() {
# Wait for the pids to be planted # Wait for the pids to be planted
wait_for_pids wait_for_pids
# Finally check the status to tell wether or not GitLab is running # Finally check the status to tell whether or not GitLab is running
print_status print_status
} }
......
...@@ -194,7 +194,7 @@ describe ProjectsHelper do ...@@ -194,7 +194,7 @@ describe ProjectsHelper do
expect(helper.project_list_cache_key(project).last).to start_with('v') expect(helper.project_list_cache_key(project).last).to start_with('v')
end end
it 'includes wether or not the user can read cross project' do it 'includes whether or not the user can read cross project' do
expect(helper.project_list_cache_key(project)).to include('cross-project:true') expect(helper.project_list_cache_key(project)).to include('cross-project:true')
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment