summaryrefslogtreecommitdiff
path: root/app/presenters
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-02 06:10:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-02 06:10:49 +0000
commit347c7a75172d5f1e14728950fd6ce7819dfc62ab (patch)
treeb71bc953d0e087d3481992e066f492eeed577887 /app/presenters
parentfd1c75caebf0eae26d2298c68aaeac3c940f84d9 (diff)
downloadgitlab-ce-347c7a75172d5f1e14728950fd6ce7819dfc62ab.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/analytics/cycle_analytics/stage_presenter.rb2
-rw-r--r--app/presenters/project_presenter.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/presenters/analytics/cycle_analytics/stage_presenter.rb b/app/presenters/analytics/cycle_analytics/stage_presenter.rb
index 7b295b814bc..d023b0c5d55 100644
--- a/app/presenters/analytics/cycle_analytics/stage_presenter.rb
+++ b/app/presenters/analytics/cycle_analytics/stage_presenter.rb
@@ -28,7 +28,7 @@ module Analytics
description: _('Time before an issue gets scheduled')
},
plan: {
- title: s_('CycleAnalyticsStage|Plan'),
+ title: s_('CycleAnalyticsStage|Plan'),
description: _('Time before an issue starts implementation')
},
code: {
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 84aec19cba0..209f016dc6b 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -437,9 +437,9 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
project_new_blob_path(
project,
default_branch_or_main,
- file_name: file_name,
+ file_name: file_name,
commit_message: commit_message,
- branch_name: branch_name,
+ branch_name: branch_name,
**additional_params
)
end