github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 19:33:44 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

DEV: remove repetitive words (#26439)

Browse Source
This commit is contained in:
carehabit 2024-04-01 06:23:21 +08:00 committed by GitHub
parent 800258b84b
commit 11877f3b9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/controllers/topic.js
View File

@ -515,7 +515,7 @@ export default Controller.extend(bufferedProperty("model"), {
} }
}, },
// Called the the bottommost visible post on the page changes. // Called the bottommost visible post on the page changes.
bottomVisibleChanged(event) { bottomVisibleChanged(event) {
const { post, refresh } = event; const { post, refresh } = event;

2
lib/presence_channel.rb
View File

@ -115,7 +115,7 @@ class PresenceChannel
end end
# Is a user allowed to enter this channel? # Is a user allowed to enter this channel?
# Currently equal to the the can_view? permission # Currently equal to the can_view? permission
def can_enter?(user_id: nil, group_ids: nil) def can_enter?(user_id: nil, group_ids: nil)
return false if user_id.nil? return false if user_id.nil?
can_view?(user_id: user_id, group_ids: group_ids) can_view?(user_id: user_id, group_ids: group_ids)

2
script/import_scripts/phpbb3/settings.yml
View File

@ -98,7 +98,7 @@ import:
original: oldsite.example.com/forums # without http(s):// original: oldsite.example.com/forums # without http(s)://
new: http://discourse.example.com # with http:// or https:// new: http://discourse.example.com # with http:// or https://
# Enable this, if you want to redirect old forum links to the the new locations. # Enable this, if you want to redirect old forum links to the new locations.
permalinks: permalinks:
categories: true # redirects /viewforum.php?f=1 to /c/category-name categories: true # redirects /viewforum.php?f=1 to /c/category-name
topics: true # redirects /viewtopic.php?f=6&t=43 to /t/topic-name/81 topics: true # redirects /viewtopic.php?f=6&t=43 to /t/topic-name/81

2
spec/requests/users_controller_spec.rb
View File

@ -6631,7 +6631,7 @@ RSpec.describe UsersController do
expect(response.status).to eq(403) expect(response.status).to eq(403)
end end
it "returns an error if the the current user does not have access" do it "returns an error if the current user does not have access" do
sign_in(user1) sign_in(user1)
topic.update(user_id: another_user.id) topic.update(user_id: another_user.id)
put "/u/#{another_user.username}/clear-featured-topic.json" put "/u/#{another_user.username}/clear-featured-topic.json"