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:
Diffstat (limited to 'app/models/wiki.rb')
-rw-r--r--app/models/wiki.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/wiki.rb b/app/models/wiki.rb
index c9cb3b0b796..d28a73b644f 100644
--- a/app/models/wiki.rb
+++ b/app/models/wiki.rb
@@ -146,8 +146,8 @@ class Wiki
repository.create_if_not_exists(default_branch)
raise CouldNotCreateWikiError unless repository_exists?
- rescue StandardError => err
- Gitlab::ErrorTracking.track_exception(err, wiki: {
+ rescue StandardError => e
+ Gitlab::ErrorTracking.track_exception(e, wiki: {
container_type: container.class.name,
container_id: container.id,
full_path: full_path,
@@ -335,7 +335,7 @@ class Wiki
end
def wiki_base_path
- web_url(only_path: true).sub(%r{/#{Wiki::HOMEPAGE}\z}, '')
+ web_url(only_path: true).sub(%r{/#{Wiki::HOMEPAGE}\z}o, '')
end
# Callbacks for synchronous processing after wiki changes.
@@ -364,9 +364,9 @@ class Wiki
Gitlab::Git::CommitError,
Gitlab::Git::PreReceiveError,
Gitlab::Git::CommandError,
- ArgumentError => error
+ ArgumentError => e
- Gitlab::ErrorTracking.log_exception(error, action: action, wiki_id: id)
+ Gitlab::ErrorTracking.log_exception(e, action: action, wiki_id: id)
false
end