diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js index a1214f824e7..ab711b56a17 100644 --- a/app/assets/javascripts/discourse/app/controllers/topic.js +++ b/app/assets/javascripts/discourse/app/controllers/topic.js @@ -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) { const { post, refresh } = event; diff --git a/lib/presence_channel.rb b/lib/presence_channel.rb index a8994ae00bf..be07ddca376 100644 --- a/lib/presence_channel.rb +++ b/lib/presence_channel.rb @@ -115,7 +115,7 @@ class PresenceChannel end # 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) return false if user_id.nil? can_view?(user_id: user_id, group_ids: group_ids) diff --git a/script/import_scripts/phpbb3/settings.yml b/script/import_scripts/phpbb3/settings.yml index 8727e67f594..cae487e991c 100644 --- a/script/import_scripts/phpbb3/settings.yml +++ b/script/import_scripts/phpbb3/settings.yml @@ -98,7 +98,7 @@ import: original: oldsite.example.com/forums # without http(s):// 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: 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 diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index 348d3503403..8c33b553b8e 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -6631,7 +6631,7 @@ RSpec.describe UsersController do expect(response.status).to eq(403) 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) topic.update(user_id: another_user.id) put "/u/#{another_user.username}/clear-featured-topic.json"