diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 21:08:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 21:08:44 +0000 |
| commit | 0e9eea40b62fcae67b2bd885dbedd7525fbca3c7 (patch) | |
| tree | 099467fd4c16441f60a879239056b235c7fdabdc /app | |
| parent | 1ca9950d5f890cd8f185e1eda158b969a7244fe2 (diff) | |
| download | gitlab-ce-0e9eea40b62fcae67b2bd885dbedd7525fbca3c7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js | 2 | ||||
| -rw-r--r-- | app/finders/concerns/finder_with_cross_project_access.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js index c76869d90d5..1d9366f26df 100644 --- a/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js +++ b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js @@ -59,7 +59,7 @@ export default { }, requestRefreshPipelineGraph() { // 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 .refreshPipeline() .catch(() => flash(__('An error occurred while making the request.'))); diff --git a/app/finders/concerns/finder_with_cross_project_access.rb b/app/finders/concerns/finder_with_cross_project_access.rb index 06ebb286086..a55fb58a1bc 100644 --- a/app/finders/concerns/finder_with_cross_project_access.rb +++ b/app/finders/concerns/finder_with_cross_project_access.rb @@ -1,6 +1,6 @@ # 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 # # This module depends on the finder implementing the following methods: |