diff --git a/app/assets/javascripts/discourse/tests/fixtures/discovery-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/discovery-fixtures.js index b89bcfca39f..c981d7e3642 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/discovery-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/discovery-fixtures.js @@ -1,4 +1,3 @@ -/*jshint maxlen:10000000 */ export default { "/latest.json": { users: [ diff --git a/app/assets/javascripts/discourse/tests/fixtures/notification-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/notification-fixtures.js index 0dbc392ab2e..49ed5f10ea0 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/notification-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/notification-fixtures.js @@ -1,4 +1,3 @@ -/*jshint maxlen:10000000 */ import { NOTIFICATION_TYPES } from "./concerns/notification-types"; export default { diff --git a/app/assets/javascripts/discourse/tests/fixtures/private-messages-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/private-messages-fixtures.js index a781a546fdd..d3a3b5c88c2 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/private-messages-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/private-messages-fixtures.js @@ -1,4 +1,3 @@ -/*jshint maxlen:10000000 */ export default { "/topics/private-messages/eviltrout.json": { users: [ diff --git a/app/assets/javascripts/discourse/tests/fixtures/static-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/static-fixtures.js index 29cdaf4fa62..93462a08c76 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/static-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/static-fixtures.js @@ -1,4 +1,3 @@ -/*jshint maxlen:10000000 */ export default { "faq.html": '\u003Cul class="nav-pills"\u003E\n \u003Cli\u003E\u003Ca class="active" href="/faq"\u003EFAQ\u003C/a\u003E\u003C/li\u003E\n \u003Cli\u003E\u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E\u003C/li\u003E\n \u003Cli\u003E\u003Ca href="/privacy"\u003EPrivacy\u003C/a\u003E\u003C/li\u003E\n\u003C/ul\u003E\n\n\n\n\u003Cdiv id="civilized"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#civilized"\u003EThis is a Civilized Place for Public Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource \u0026mdash; a place to share skills, knowledge and interests through ongoing conversation.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n \u003Cp\u003E\n These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.\n \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="improve"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#improve"\u003EImprove the Discussion\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n \u003Cp\u003E\n The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.\n \u003C/p\u003E\n \u003Cp\u003E\n One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests.\n \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="agreeable"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#agreeable"\u003EBe Agreeable, Even When You Disagree\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n You may wish to respond to something by disagreeing with it. That’s fine. But, remember to \u003Cem\u003Ecriticize ideas, not people\u003C/em\u003E.\n Please avoid:\n \u003Cul\u003E\n \u003Cli\u003EName-calling.\u003C/li\u003E\n \u003Cli\u003EAd hominem attacks.\u003C/li\u003E\n \u003Cli\u003EResponding to a post’s tone instead of its actual content.\u003C/li\u003E\n \u003Cli\u003EKnee-jerk contradiction.\u003C/li\u003E\n \u003C/ul\u003E\n\u003Cdiv class="more"\u003E\n \u003Cp\u003E\n Instead, provide reasoned counter-arguments that improve the conversation.\n \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="participate"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#participate"\u003EYour Participation Counts\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be \u0026mdash; and avoiding those that do not.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n \u003Cp\u003E\n Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.\n \u003C/p\u003E\n \u003Cp\u003E\n Let’s try to leave our park better than we found it.\n \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="flag-problems"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#flag-problems"\u003EIf You See a Problem, Flag It\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n \u003Cp\u003E\n When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. \u003Ci\u003EJust flag it\u003C/i\u003E. If enough flags accrue, action will be taken, either automatically or by moderator intervention.\n \u003C/p\u003E\n \u003Cp\u003E\n In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community.\n \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="be-civil"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#be-civil"\u003EAlways Be Civil\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n Nothing sabotages a healthy conversation like rudeness:\n \u003Cul\u003E\n \u003Cli\u003EBe civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.\u003C/li\u003E\n \u003Cli\u003EKeep it clean. Don’t post anything obscene or sexually explicit.\u003C/li\u003E\n \u003Cli\u003ERespect each other. Don’t harass or grief anyone,\n impersonate people, or expose their private information.\u003C/li\u003E\n \u003Cli\u003ERespect our forum. Don’t post spam or otherwise vandalize the forum.\u003C/li\u003E\n \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n \u003Cp\u003E\n These are not concrete terms with precise definitions \u0026mdash; avoid\n even the \u003Ci\u003Eappearance\u003C/i\u003E of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times.\n \u003C/p\u003E\n \u003Cp\u003E\n This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="keep-tidy"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#keep-tidy"\u003EKeep It Tidy\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:\n \u003Cul\u003E\n \u003Cli\u003EDon’t start a topic in the wrong category.\u003C/li\u003E\n \u003Cli\u003EDon’t cross-post the same thing in multiple topics.\u003C/li\u003E\n \u003Cli\u003EDon’t post no-content replies.\u003C/li\u003E\n \u003Cli\u003EDon’t divert a topic by changing it midstream.\u003C/li\u003E\n \u003Cli\u003EDon’t sign your posts \u0026mdash; every post has your profile information attached to it.\u003C/li\u003E\n \u003C/ul\u003E\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n \u003Cp\u003E\n Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.\n \u003C/p\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="stealing"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#stealing"\u003EPost Only Your Own Stuff\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n\u003Cdiv id="tos"\u003E\u003C/div\u003E\n\u003Ch2\u003E\u003Ca href="#tos"\u003ETerms of Service\u003C/a\u003E\u003C/h2\u003E\n\u003Cp\u003E\n Yes, legalese is boring, but we must protect ourselves \u0026ndash; and by extension, you and your data \u0026ndash; against unfriendly folks. We have a \u003Ca href="/tos"\u003ETerms of Service\u003C/a\u003E describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our \u003Ca href="/tos"\u003ETOS\u003C/a\u003E.\n\u003C/p\u003E\n\u003Cdiv class="more"\u003E\n\u003C/div\u003E\n\n', diff --git a/app/assets/javascripts/discourse/tests/fixtures/top-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/top-fixtures.js index b9602d14c9d..69eafa17d99 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/top-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/top-fixtures.js @@ -1,4 +1,3 @@ -/*jshint maxlen:10000000 */ export default { "/top.json": { users: [ diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js index 096b7f20597..a4db6fe4977 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/topic.js +++ b/app/assets/javascripts/discourse/tests/fixtures/topic.js @@ -1,5 +1,3 @@ -import I18n from "I18n"; -/*jshint maxlen:10000000 */ export default { "/t/130.json": { post_stream: { diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js index 1ff14845c8f..43cde04348b 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js @@ -1,4 +1,3 @@ -/*jshint maxlen:10000000 */ export default { "/u/eviltrout.json": { user_badges: [ diff --git a/app/assets/javascripts/discourse/tests/helpers/site.js b/app/assets/javascripts/discourse/tests/helpers/site.js index ae23c0f02b2..1b537518c21 100644 --- a/app/assets/javascripts/discourse/tests/helpers/site.js +++ b/app/assets/javascripts/discourse/tests/helpers/site.js @@ -1,6 +1,5 @@ import PreloadStore from "discourse/lib/preload-store"; -/*jshint maxlen:10000000 */ PreloadStore.store("site", { default_archetype: "regular", notification_types: { diff --git a/lib/tasks/integration.rake b/lib/tasks/integration.rake index 3b01602bcb4..9f46772c2ea 100644 --- a/lib/tasks/integration.rake +++ b/lib/tasks/integration.rake @@ -19,7 +19,7 @@ task 'integration:create_fixtures' => :environment do filename = "#{Rails.root}/test/javascripts/fixtures/#{type}_fixtures.js" - content = "/*jshint maxlen:10000000 */\nexport default {\n" + content = "export default {\n" urls.each do |url| http_result = fake_xhr("http://localhost:3000#{url}")