Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-10-04 21:11:36 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-10-04 21:11:36 +0300
commitd2cecf8839262a058100ef8153a233a2e08979eb (patch)
treeacdcd6664003e1b04a9f87572192fc4f97dff6c6 /app/models
parent0a12a556b52d7ff4a2da738f0852c78488cec9e5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r--app/models/analytics/cycle_analytics/value_stream.rb1
-rw-r--r--app/models/wiki_page.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/analytics/cycle_analytics/value_stream.rb b/app/models/analytics/cycle_analytics/value_stream.rb
index 16446a5b463..7f8c6eef704 100644
--- a/app/models/analytics/cycle_analytics/value_stream.rb
+++ b/app/models/analytics/cycle_analytics/value_stream.rb
@@ -51,3 +51,4 @@ module Analytics
end
end
end
+Analytics::CycleAnalytics::ValueStream.prepend_mod_with('Analytics::CycleAnalytics::ValueStream')
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index a7e2be0eae5..2eed693ca76 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -205,7 +205,7 @@ class WikiPage
update_attributes(attrs)
save do
- wiki.create_page(title, content, format, attrs[:message])
+ wiki.create_page(title, raw_content, format, attrs[:message])
end
end